Merge tag 'master-2014-10-02' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
pull request: wireless-next 2014-10-03

Please pull tihs batch of updates intended for the 3.18 stream!

For the iwlwifi bits, Emmanuel says:

"I have here a few things that depend on the latest mac80211's changes:
RRM, TPC, Quiet Period etc...  Eyal keeps improving our rate control
and we have a new device ID. This last patch should probably have
gone to wireless.git, but at that stage, I preferred to send it to
-next and CC stable."

For (most of) the Atheros bits, Kalle says:

"The only new feature is testmode support from me. Ben added a new method
to crash the firmware with an assert for debug purposes. As usual, we
have lots of smaller fixes from Michal. Matteo fixed a Kconfig
dependency with debugfs. I fixed some warnings recently added to
checkpatch."

For the NFC bits, Samuel says:

"We've had major updates for TI and ST Microelectronics drivers, and a
few NCI related changes.

For TI's trf7970a driver:

- Target mode support for trf7970a
- Suspend/resume support for trf7970a
- DT properties additions to handle different quirks
- A bunch of fixes for smartphone IOP related issues

For ST Microelectronics' ST21NFCA and ST21NFCB drivers:

- ISO15693 support for st21nfcb
- checkpatch and sparse related warning fixes
- Code cleanups and a few minor fixes

Finally, Marvell added ISO15693 support to the NCI stack, together with a
couple of NCI fixes."

For the Bluetooth bits, Johan says:

"This 3.18 pull request replaces the one I did on Monday ("bluetooth-next
2014-09-22", which hasn't been pulled yet). The additions since the last
request are:

 - SCO connection fix for devices not supporting eSCO
 - Cleanups regarding the SCO establishment logic
 - Remove unnecessary return value from logging functions
 - Header compression fix for 6lowpan
 - Cleanups to the ieee802154/mrf24j40 driver

Here's a copy from previous request that this one replaces:

'
Here are some more patches for 3.18. They include various fixes to the
btusb HCI driver, a fix for LE SMP, as well as adding Jukka to the
MAINTAINERS file for generic 6LoWPAN (as requested by Alexander Aring).

I've held on to this pull request a bit since we were waiting for a SCO
related fix to get sorted out first. However, since the merge window is
getting closer I decided not to wait for it. If we do get the fix sorted
out there'll probably be a second small pull request later this week.
'"

And,

"Unless 3.17 gets delayed this will probably be our last -next pull request for
3.18. We've got:

  - New Marvell hardware supportr
  - Multicast support for 6lowpan
  - Several of 6lowpan fixes & cleanups
  - Fix for a (false-positive) lockdep warning in L2CAP
  - Minor btusb cleanup"

On top of all that comes the usual sort of updates to ath5k, ath9k,
ath10k, brcmfmac, mwifiex, and wil6210.  This time around there are
also a number of rtlwifi updates to enable some new hardware and
to reconcile the in-kernel drivers with some newer releases of the
Realtek vendor drivers.  Also of note is some device tree work for
the bcma bus.

Please let me know if there are problems!
====================

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

325 files changed, 63942 insertions, 17025 deletions

diff --git a/Documentation/devicetree/bindings/bus/bcma.txt b/Documentation/devicetree/bindings/bus/bcma.txt
new file mode 100644
index 000000000000..62a48348ac15
--- /dev/null
+++ b/Documentation/devicetree/bindings/bus/bcma.txt
@@ -0,0 +1,32 @@
+Driver for ARM AXI Bus with Broadcom Plugins (bcma)
+
+Required properties:
+
+- compatible : brcm,bus-axi
+
+- reg : iomem address range of chipcommon core
+
+The cores on the AXI bus are automatically detected by bcma with the
+memory ranges they are using and they get registered afterwards.
+
+The top-level axi bus may contain children representing attached cores
+(devices). This is needed since some hardware details can't be auto
+detected (e.g. IRQ numbers). Also some of the cores may be responsible
+for extra things, e.g. ChipCommon providing access to the GPIO chip.
+
+Example:
+
+        axi@18000000 {
+                compatible = "brcm,bus-axi";
+                reg = <0x18000000 0x1000>;
+                ranges = <0x00000000 0x18000000 0x00100000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                chipcommon {
+                        reg = <0x00000000 0x1000>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt b/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
index 3b58ae480344..9005608cbbd1 100644
--- a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
+++ b/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
@@ -26,7 +26,7 @@ Example (for ARM-based BeagleBoard xM with ST21NFCB on I2C2):
                 clock-frequency = <400000>;
 
                 interrupt-parent = <&gpio5>;
-                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
 
                 reset-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;
         };
diff --git a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt
index 1e436133685f..7c89ca290ced 100644
--- a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt
+++ b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt
@@ -13,6 +13,11 @@ Optional SoC Specific Properties:
 - pinctrl-names: Contains only one value - "default".
 - pintctrl-0: Specifies the pin control groups used for this controller.
 - autosuspend-delay: Specify autosuspend delay in milliseconds.
+- vin-voltage-override: Specify voltage of VIN pin in microvolts.
+- irq-status-read-quirk: Specify that the trf7970a being used has the
+  "IRQ Status Read" erratum.
+- en2-rf-quirk: Specify that the trf7970a being used has the "EN2 RF"
+  erratum.
 
 Example (for ARM-based BeagleBone with TRF7970A on SPI1):
 
@@ -30,7 +35,10 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1):
                 ti,enable-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>,
                                   <&gpio2 5 GPIO_ACTIVE_LOW>;
                 vin-supply = <&ldo3_reg>;
+                vin-voltage-override = <5000000>;
                 autosuspend-delay = <30000>;
+                irq-status-read-quirk;
+                en2-rf-quirk;
                 status = "okay";
         };
 };
diff --git a/MAINTAINERS b/MAINTAINERS
index 78b9f3b77a87..907de3dcf2b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -152,6 +152,7 @@ F:	drivers/scsi/53c700*
 
 6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 M:      Alexander Aring <alex.aring@gmail.com>
+M:      Jukka Rissanen <jukka.rissanen@linux.intel.com>
 L:      linux-bluetooth@vger.kernel.org
 L:      linux-wpan@vger.kernel.org
 S:      Maintained
@@ -1616,6 +1617,7 @@ L:	wil6210@qca.qualcomm.com
 S:      Supported
 W:      http://wireless.kernel.org/en/users/Drivers/wil6210
 F:      drivers/net/wireless/ath/wil6210/
+F:      include/uapi/linux/wil6210_uapi.h
 
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 M:      Christian Lamparter <chunkeey@googlemail.com>
@@ -7494,13 +7496,12 @@ F:	drivers/video/fbdev/aty/aty128fb.c
 
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:      rt2x00 project
-M:      Ivo van Doorn <IvDoorn@gmail.com>
+M:      Stanislaw Gruszka <sgruszka@redhat.com>
 M:      Helmut Schaa <helmut.schaa@googlemail.com>
 L:      linux-wireless@vger.kernel.org
 L:      users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:      http://rt2x00.serialmonkey.com/
 S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
 F:      drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index b40be43c6f31..b6412b2d748d 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -88,6 +88,20 @@ extern int __init bcma_host_pci_init(void);
 extern void __exit bcma_host_pci_exit(void);
 #endif /* CONFIG_BCMA_HOST_PCI */
 
+/* host_soc.c */
+#if defined(CONFIG_BCMA_HOST_SOC) && defined(CONFIG_OF)
+extern int __init bcma_host_soc_register_driver(void);
+extern void __exit bcma_host_soc_unregister_driver(void);
+#else
+static inline int __init bcma_host_soc_register_driver(void)
+{
+        return 0;
+}
+static inline void __exit bcma_host_soc_unregister_driver(void)
+{
+}
+#endif /* CONFIG_BCMA_HOST_SOC && CONFIG_OF */
+
 /* driver_pci.c */
 u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
 
diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c
index aec9f850b4a8..57ce5fe65364 100644
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@ -76,7 +76,7 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio)
         bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
 }
 
-#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
+#if IS_BUILTIN(CONFIG_BCM47XX)
 static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
 {
         struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
@@ -215,9 +215,13 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
         chip->set               = bcma_gpio_set_value;
         chip->direction_input   = bcma_gpio_direction_input;
         chip->direction_output  = bcma_gpio_direction_output;
-#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
+#if IS_BUILTIN(CONFIG_BCM47XX)
         chip->to_irq            = bcma_gpio_to_irq;
 #endif
+#if IS_BUILTIN(CONFIG_OF)
+        if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
+                chip->of_node   = cc->core->dev.of_node;
+#endif
         switch (cc->core->bus->chipinfo.id) {
         case BCMA_CHIP_ID_BCM5357:
         case BCMA_CHIP_ID_BCM53572:
diff --git a/drivers/bcma/host_soc.c b/drivers/bcma/host_soc.c
index 718e054dd727..335cbcfd945b 100644
--- a/drivers/bcma/host_soc.c
+++ b/drivers/bcma/host_soc.c
@@ -7,6 +7,9 @@
 
 #include "bcma_private.h"
 #include "scan.h"
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
 #include <linux/bcma/bcma.h>
 #include <linux/bcma/bcma_soc.h>
 
@@ -176,6 +179,7 @@ int __init bcma_host_soc_register(struct bcma_soc *soc)
         /* Host specific */
         bus->hosttype = BCMA_HOSTTYPE_SOC;
         bus->ops = &bcma_host_soc_ops;
+        bus->host_pdev = NULL;
 
         /* Initialize struct, detect chip */
         bcma_init_bus(bus);
@@ -195,3 +199,80 @@ int __init bcma_host_soc_init(struct bcma_soc *soc)
 
         return err;
 }
+
+#ifdef CONFIG_OF
+static int bcma_host_soc_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct device_node *np = dev->of_node;
+        struct bcma_bus *bus;
+        int err;
+
+        /* Alloc */
+        bus = devm_kzalloc(dev, sizeof(*bus), GFP_KERNEL);
+        if (!bus)
+                return -ENOMEM;
+
+        /* Map MMIO */
+        bus->mmio = of_iomap(np, 0);
+        if (!bus->mmio)
+                return -ENOMEM;
+
+        /* Host specific */
+        bus->hosttype = BCMA_HOSTTYPE_SOC;
+        bus->ops = &bcma_host_soc_ops;
+        bus->host_pdev = pdev;
+
+        /* Initialize struct, detect chip */
+        bcma_init_bus(bus);
+
+        /* Register */
+        err = bcma_bus_register(bus);
+        if (err)
+                goto err_unmap_mmio;
+
+        platform_set_drvdata(pdev, bus);
+
+        return err;
+
+err_unmap_mmio:
+        iounmap(bus->mmio);
+        return err;
+}
+
+static int bcma_host_soc_remove(struct platform_device *pdev)
+{
+        struct bcma_bus *bus = platform_get_drvdata(pdev);
+
+        bcma_bus_unregister(bus);
+        iounmap(bus->mmio);
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static const struct of_device_id bcma_host_soc_of_match[] = {
+        { .compatible = "brcm,bus-axi", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, bcma_host_soc_of_match);
+
+static struct platform_driver bcma_host_soc_driver = {
+        .driver = {
+                .name = "bcma-host-soc",
+                .of_match_table = bcma_host_soc_of_match,
+        },
+        .probe          = bcma_host_soc_probe,
+        .remove         = bcma_host_soc_remove,
+};
+
+int __init bcma_host_soc_register_driver(void)
+{
+        return platform_driver_register(&bcma_host_soc_driver);
+}
+
+void __exit bcma_host_soc_unregister_driver(void)
+{
+        platform_driver_unregister(&bcma_host_soc_driver);
+}
+#endif /* CONFIG_OF */
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index c421403cab43..d1656c2f70af 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -10,6 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/bcma/bcma.h>
 #include <linux/slab.h>
+#include <linux/of_address.h>
 
 MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
 MODULE_LICENSE("GPL");
@@ -131,6 +132,43 @@ static bool bcma_is_core_needed_early(u16 core_id)
         return false;
 }
 
+#ifdef CONFIG_OF
+static struct device_node *bcma_of_find_child_device(struct platform_device *parent,
+                                                     struct bcma_device *core)
+{
+        struct device_node *node;
+        u64 size;
+        const __be32 *reg;
+
+        if (!parent || !parent->dev.of_node)
+                return NULL;
+
+        for_each_child_of_node(parent->dev.of_node, node) {
+                reg = of_get_address(node, 0, &size, NULL);
+                if (!reg)
+                        continue;
+                if (of_translate_address(node, reg) == core->addr)
+                        return node;
+        }
+        return NULL;
+}
+
+static void bcma_of_fill_device(struct platform_device *parent,
+                                struct bcma_device *core)
+{
+        struct device_node *node;
+
+        node = bcma_of_find_child_device(parent, core);
+        if (node)
+                core->dev.of_node = node;
+}
+#else
+static void bcma_of_fill_device(struct platform_device *parent,
+                                struct bcma_device *core)
+{
+}
+#endif /* CONFIG_OF */
+
 static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
 {
         int err;
@@ -147,7 +185,13 @@ static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
                 break;
         case BCMA_HOSTTYPE_SOC:
                 core->dev.dma_mask = &core->dev.coherent_dma_mask;
-                core->dma_dev = &core->dev;
+                if (bus->host_pdev) {
+                        core->dma_dev = &bus->host_pdev->dev;
+                        core->dev.parent = &bus->host_pdev->dev;
+                        bcma_of_fill_device(bus->host_pdev, core);
+                } else {
+                        core->dma_dev = &core->dev;
+                }
                 break;
         case BCMA_HOSTTYPE_SDIO:
                 break;
@@ -528,6 +572,11 @@ static int __init bcma_modinit(void)
         if (err)
                 return err;
 
+        err = bcma_host_soc_register_driver();
+        if (err) {
+                pr_err("SoC host initialization failed\n");
+                err = 0;
+        }
 #ifdef CONFIG_BCMA_HOST_PCI
         err = bcma_host_pci_init();
         if (err) {
@@ -545,6 +594,7 @@ static void __exit bcma_modexit(void)
 #ifdef CONFIG_BCMA_HOST_PCI
         bcma_host_pci_exit();
 #endif
+        bcma_host_soc_unregister_driver();
         bus_unregister(&bcma_bus_type);
 }
 module_exit(bcma_modexit)
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index b3a403c136fb..14b56561a36f 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -439,6 +439,7 @@ void bcma_init_bus(struct bcma_bus *bus)
 {
         s32 tmp;
         struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
+        char chip_id[8];
 
         INIT_LIST_HEAD(&bus->cores);
         bus->nr_cores = 0;
@@ -449,8 +450,11 @@ void bcma_init_bus(struct bcma_bus *bus)
         chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
         chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
         chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
-        bcma_info(bus, "Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
-                  chipinfo->id, chipinfo->rev, chipinfo->pkg);
+
+        snprintf(chip_id, ARRAY_SIZE(chip_id),
+                 (chipinfo->id > 0x9999) ? "%d" : "0x%04X", chipinfo->id);
+        bcma_info(bus, "Found chip with id %s, rev 0x%02X and package 0x%02X\n",
+                  chip_id, chipinfo->rev, chipinfo->pkg);
 }
 
 int bcma_bus_scan(struct bcma_bus *bus)
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index fa7fd62ddffa..4547dc238fc7 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -201,7 +201,7 @@ config BT_MRVL
           The core driver to support Marvell Bluetooth devices.
 
           This driver is required if you want to support
-          Marvell Bluetooth devices, such as 8688/8787/8797/8897.
+          Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897.
 
           Say Y here to compile Marvell Bluetooth driver
           into the kernel or say M to compile it as module.
@@ -214,7 +214,7 @@ config BT_MRVL_SDIO
           The driver for Marvell Bluetooth chipsets with SDIO interface.
 
           This driver is required if you want to use Marvell Bluetooth
-          devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8897
+          devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897
           chipsets are supported.
 
           Say Y here to compile support for Marvell BT-over-SDIO driver
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 3e683b153259..550bce089fa6 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -84,7 +84,27 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
         .int_read_to_clear = false,
 };
 
-static const struct btmrvl_sdio_card_reg btmrvl_reg_88xx = {
+static const struct btmrvl_sdio_card_reg btmrvl_reg_8887 = {
+        .cfg = 0x00,
+        .host_int_mask = 0x08,
+        .host_intstatus = 0x0C,
+        .card_status = 0x5C,
+        .sq_read_base_addr_a0 = 0x6C,
+        .sq_read_base_addr_a1 = 0x6D,
+        .card_revision = 0xC8,
+        .card_fw_status0 = 0x88,
+        .card_fw_status1 = 0x89,
+        .card_rx_len = 0x8A,
+        .card_rx_unit = 0x8B,
+        .io_port_0 = 0xE4,
+        .io_port_1 = 0xE5,
+        .io_port_2 = 0xE6,
+        .int_read_to_clear = true,
+        .host_int_rsr = 0x04,
+        .card_misc_cfg = 0xD8,
+};
+
+static const struct btmrvl_sdio_card_reg btmrvl_reg_8897 = {
         .cfg = 0x00,
         .host_int_mask = 0x02,
         .host_intstatus = 0x03,
@@ -128,10 +148,18 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = {
         .sd_blksz_fw_dl = 256,
 };
 
+static const struct btmrvl_sdio_device btmrvl_sdio_sd8887 = {
+        .helper         = NULL,
+        .firmware       = "mrvl/sd8887_uapsta.bin",
+        .reg            = &btmrvl_reg_8887,
+        .support_pscan_win_report = true,
+        .sd_blksz_fw_dl = 256,
+};
+
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {
         .helper         = NULL,
         .firmware       = "mrvl/sd8897_uapsta.bin",
-        .reg            = &btmrvl_reg_88xx,
+        .reg            = &btmrvl_reg_8897,
         .support_pscan_win_report = true,
         .sd_blksz_fw_dl = 256,
 };
@@ -149,6 +177,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = {
         /* Marvell SD8797 Bluetooth device */
         { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),
                         .driver_data = (unsigned long) &btmrvl_sdio_sd8797 },
+        /* Marvell SD8887 Bluetooth device */
+        { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9136),
+                        .driver_data = (unsigned long)&btmrvl_sdio_sd8887 },
         /* Marvell SD8897 Bluetooth device */
         { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),
                         .driver_data = (unsigned long) &btmrvl_sdio_sd8897 },
@@ -1280,4 +1311,5 @@ MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
 MODULE_FIRMWARE("mrvl/sd8688.bin");
 MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
 MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
+MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin");
 MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index a79d657c0845..edfc17bfcd44 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -268,20 +268,24 @@ struct btusb_data {
         struct usb_interface *intf;
         struct usb_interface *isoc;
 
-        spinlock_t lock;
-
         unsigned long flags;
 
         struct work_struct work;
         struct work_struct waker;
 
+        struct usb_anchor deferred;
         struct usb_anchor tx_anchor;
+        int tx_in_flight;
+        spinlock_t txlock;
+
         struct usb_anchor intr_anchor;
         struct usb_anchor bulk_anchor;
         struct usb_anchor isoc_anchor;
-        struct usb_anchor deferred;
-        int tx_in_flight;
-        spinlock_t txlock;
+        spinlock_t rxlock;
+
+        struct sk_buff *evt_skb;
+        struct sk_buff *acl_skb;
+        struct sk_buff *sco_skb;
 
         struct usb_endpoint_descriptor *intr_ep;
         struct usb_endpoint_descriptor *bulk_tx_ep;
@@ -296,18 +300,189 @@ struct btusb_data {
         int suspend_count;
 };
 
-static int inc_tx(struct btusb_data *data)
+static inline void btusb_free_frags(struct btusb_data *data)
 {
         unsigned long flags;
-        int rv;
 
-        spin_lock_irqsave(&data->txlock, flags);
-        rv = test_bit(BTUSB_SUSPENDING, &data->flags);
-        if (!rv)
-                data->tx_in_flight++;
-        spin_unlock_irqrestore(&data->txlock, flags);
+        spin_lock_irqsave(&data->rxlock, flags);
+
+        kfree_skb(data->evt_skb);
+        data->evt_skb = NULL;
+
+        kfree_skb(data->acl_skb);
+        data->acl_skb = NULL;
+
+        kfree_skb(data->sco_skb);
+        data->sco_skb = NULL;
+
+        spin_unlock_irqrestore(&data->rxlock, flags);
+}
+
+static int btusb_recv_intr(struct btusb_data *data, void *buffer, int count)
+{
+        struct sk_buff *skb;
+        int err = 0;
+
+        spin_lock(&data->rxlock);
+        skb = data->evt_skb;
+
+        while (count) {
+                int len;
+
+                if (!skb) {
+                        skb = bt_skb_alloc(HCI_MAX_EVENT_SIZE, GFP_ATOMIC);
+                        if (!skb) {
+                                err = -ENOMEM;
+                                break;
+                        }
+
+                        bt_cb(skb)->pkt_type = HCI_EVENT_PKT;
+                        bt_cb(skb)->expect = HCI_EVENT_HDR_SIZE;
+                }
+
+                len = min_t(uint, bt_cb(skb)->expect, count);
+                memcpy(skb_put(skb, len), buffer, len);
+
+                count -= len;
+                buffer += len;
+                bt_cb(skb)->expect -= len;
+
+                if (skb->len == HCI_EVENT_HDR_SIZE) {
+                        /* Complete event header */
+                        bt_cb(skb)->expect = hci_event_hdr(skb)->plen;
+
+                        if (skb_tailroom(skb) < bt_cb(skb)->expect) {
+                                kfree_skb(skb);
+                                skb = NULL;
+
+                                err = -EILSEQ;
+                                break;
+                        }
+                }
+
+                if (bt_cb(skb)->expect == 0) {
+                        /* Complete frame */
+                        hci_recv_frame(data->hdev, skb);
+                        skb = NULL;
+                }
+        }
+
+        data->evt_skb = skb;
+        spin_unlock(&data->rxlock);
+
+        return err;
+}
+
+static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count)
+{
+        struct sk_buff *skb;
+        int err = 0;
+
+        spin_lock(&data->rxlock);
+        skb = data->acl_skb;
+
+        while (count) {
+                int len;
 
-        return rv;
+                if (!skb) {
+                        skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);
+                        if (!skb) {
+                                err = -ENOMEM;
+                                break;
+                        }
+
+                        bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
+                        bt_cb(skb)->expect = HCI_ACL_HDR_SIZE;
+                }
+
+                len = min_t(uint, bt_cb(skb)->expect, count);
+                memcpy(skb_put(skb, len), buffer, len);
+
+                count -= len;
+                buffer += len;
+                bt_cb(skb)->expect -= len;
+
+                if (skb->len == HCI_ACL_HDR_SIZE) {
+                        __le16 dlen = hci_acl_hdr(skb)->dlen;
+
+                        /* Complete ACL header */
+                        bt_cb(skb)->expect = __le16_to_cpu(dlen);
+
+                        if (skb_tailroom(skb) < bt_cb(skb)->expect) {
+                                kfree_skb(skb);
+                                skb = NULL;
+
+                                err = -EILSEQ;
+                                break;
+                        }
+                }
+
+                if (bt_cb(skb)->expect == 0) {
+                        /* Complete frame */
+                        hci_recv_frame(data->hdev, skb);
+                        skb = NULL;
+                }
+        }
+
+        data->acl_skb = skb;
+        spin_unlock(&data->rxlock);
+
+        return err;
+}
+
+static int btusb_recv_isoc(struct btusb_data *data, void *buffer, int count)
+{
+        struct sk_buff *skb;
+        int err = 0;
+
+        spin_lock(&data->rxlock);
+        skb = data->sco_skb;
+
+        while (count) {
+                int len;
+
+                if (!skb) {
+                        skb = bt_skb_alloc(HCI_MAX_SCO_SIZE, GFP_ATOMIC);
+                        if (!skb) {
+                                err = -ENOMEM;
+                                break;
+                        }
+
+                        bt_cb(skb)->pkt_type = HCI_SCODATA_PKT;
+                        bt_cb(skb)->expect = HCI_SCO_HDR_SIZE;
+                }
+
+                len = min_t(uint, bt_cb(skb)->expect, count);
+                memcpy(skb_put(skb, len), buffer, len);
+
+                count -= len;
+                buffer += len;
+                bt_cb(skb)->expect -= len;
+
+                if (skb->len == HCI_SCO_HDR_SIZE) {
+                        /* Complete SCO header */
+                        bt_cb(skb)->expect = hci_sco_hdr(skb)->dlen;
+
+                        if (skb_tailroom(skb) < bt_cb(skb)->expect) {
+                                kfree_skb(skb);
+                                skb = NULL;
+
+                                err = -EILSEQ;
+                                break;
+                        }
+                }
+
+                if (bt_cb(skb)->expect == 0) {
+                        /* Complete frame */
+                        hci_recv_frame(data->hdev, skb);
+                        skb = NULL;
+                }
+        }
+
+        data->sco_skb = skb;
+        spin_unlock(&data->rxlock);
+
+        return err;
 }
 
 static void btusb_intr_complete(struct urb *urb)
@@ -316,8 +491,8 @@ static void btusb_intr_complete(struct urb *urb)
         struct btusb_data *data = hci_get_drvdata(hdev);
         int err;
 
-        BT_DBG("%s urb %p status %d count %d", hdev->name,
-                                        urb, urb->status, urb->actual_length);
+        BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,
+               urb->actual_length);
 
         if (!test_bit(HCI_RUNNING, &hdev->flags))
                 return;
@@ -325,9 +500,8 @@ static void btusb_intr_complete(struct urb *urb)
         if (urb->status == 0) {
                 hdev->stat.byte_rx += urb->actual_length;
 
-                if (hci_recv_fragment(hdev, HCI_EVENT_PKT,
-                                                urb->transfer_buffer,
-                                                urb->actual_length) < 0) {
+                if (btusb_recv_intr(data, urb->transfer_buffer,
+                                    urb->actual_length) < 0) {
                         BT_ERR("%s corrupted event packet", hdev->name);
                         hdev->stat.err_rx++;
                 }
@@ -348,7 +522,7 @@ static void btusb_intr_complete(struct urb *urb)
                  * -ENODEV: device got disconnected */
                 if (err != -EPERM && err != -ENODEV)
                         BT_ERR("%s urb %p failed to resubmit (%d)",
-                                                hdev->name, urb, -err);
+                               hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
 }
@@ -381,8 +555,7 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)
         pipe = usb_rcvintpipe(data->udev, data->intr_ep->bEndpointAddress);
 
         usb_fill_int_urb(urb, data->udev, pipe, buf, size,
-                                                btusb_intr_complete, hdev,
-                                                data->intr_ep->bInterval);
+                         btusb_intr_complete, hdev, data->intr_ep->bInterval);
 
         urb->transfer_flags |= URB_FREE_BUFFER;
 
@@ -392,7 +565,7 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)
         if (err < 0) {
                 if (err != -EPERM && err != -ENODEV)
                         BT_ERR("%s urb %p submission failed (%d)",
-                                                hdev->name, urb, -err);
+                               hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
 
@@ -407,8 +580,8 @@ static void btusb_bulk_complete(struct urb *urb)
         struct btusb_data *data = hci_get_drvdata(hdev);
         int err;
 
-        BT_DBG("%s urb %p status %d count %d", hdev->name,
-                                        urb, urb->status, urb->actual_length);
+        BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,
+               urb->actual_length);
 
         if (!test_bit(HCI_RUNNING, &hdev->flags))
                 return;
@@ -416,9 +589,8 @@ static void btusb_bulk_complete(struct urb *urb)
         if (urb->status == 0) {
                 hdev->stat.byte_rx += urb->actual_length;
 
-                if (hci_recv_fragment(hdev, HCI_ACLDATA_PKT,
-                                                urb->transfer_buffer,
-                                                urb->actual_length) < 0) {
+                if (btusb_recv_bulk(data, urb->transfer_buffer,
+                                    urb->actual_length) < 0) {
                         BT_ERR("%s corrupted ACL packet", hdev->name);
                         hdev->stat.err_rx++;
                 }
@@ -439,7 +611,7 @@ static void btusb_bulk_complete(struct urb *urb)
                  * -ENODEV: device got disconnected */
                 if (err != -EPERM && err != -ENODEV)
                         BT_ERR("%s urb %p failed to resubmit (%d)",
-                                                hdev->name, urb, -err);
+                               hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
 }
@@ -469,8 +641,8 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
 
         pipe = usb_rcvbulkpipe(data->udev, data->bulk_rx_ep->bEndpointAddress);
 
-        usb_fill_bulk_urb(urb, data->udev, pipe,
-                                        buf, size, btusb_bulk_complete, hdev);
+        usb_fill_bulk_urb(urb, data->udev, pipe, buf, size,
+                          btusb_bulk_complete, hdev);
 
         urb->transfer_flags |= URB_FREE_BUFFER;
 
@@ -481,7 +653,7 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
         if (err < 0) {
                 if (err != -EPERM && err != -ENODEV)
                         BT_ERR("%s urb %p submission failed (%d)",
-                                                hdev->name, urb, -err);
+                               hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
 
@@ -496,8 +668,8 @@ static void btusb_isoc_complete(struct urb *urb)
         struct btusb_data *data = hci_get_drvdata(hdev);
         int i, err;
 
-        BT_DBG("%s urb %p status %d count %d", hdev->name,
-                                        urb, urb->status, urb->actual_length);
+        BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,
+               urb->actual_length);
 
         if (!test_bit(HCI_RUNNING, &hdev->flags))
                 return;
@@ -512,9 +684,8 @@ static void btusb_isoc_complete(struct urb *urb)
 
                         hdev->stat.byte_rx += length;
 
-                        if (hci_recv_fragment(hdev, HCI_SCODATA_PKT,
-                                                urb->transfer_buffer + offset,
-                                                                length) < 0) {
+                        if (btusb_recv_isoc(data, urb->transfer_buffer + offset,
+                                            length) < 0) {
                                 BT_ERR("%s corrupted SCO packet", hdev->name);
                                 hdev->stat.err_rx++;
                         }
@@ -535,7 +706,7 @@ static void btusb_isoc_complete(struct urb *urb)
                  * -ENODEV: device got disconnected */
                 if (err != -EPERM && err != -ENODEV)
                         BT_ERR("%s urb %p failed to resubmit (%d)",
-                                                hdev->name, urb, -err);
+                               hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
 }
@@ -590,12 +761,12 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
         pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress);
 
         usb_fill_int_urb(urb, data->udev, pipe, buf, size, btusb_isoc_complete,
-                                hdev, data->isoc_rx_ep->bInterval);
+                         hdev, data->isoc_rx_ep->bInterval);
 
-        urb->transfer_flags  = URB_FREE_BUFFER | URB_ISO_ASAP;
+        urb->transfer_flags = URB_FREE_BUFFER | URB_ISO_ASAP;
 
         __fill_isoc_descriptor(urb, size,
-                        le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize));
+                               le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize));
 
         usb_anchor_urb(urb, &data->isoc_anchor);
 
@@ -603,7 +774,7 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
         if (err < 0) {
                 if (err != -EPERM && err != -ENODEV)
                         BT_ERR("%s urb %p submission failed (%d)",
-                                                hdev->name, urb, -err);
+                               hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
 
@@ -615,11 +786,11 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
 static void btusb_tx_complete(struct urb *urb)
 {
         struct sk_buff *skb = urb->context;
-        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
+        struct hci_dev *hdev = (struct hci_dev *)skb->dev;
         struct btusb_data *data = hci_get_drvdata(hdev);
 
-        BT_DBG("%s urb %p status %d count %d", hdev->name,
-                                        urb, urb->status, urb->actual_length);
+        BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,
+               urb->actual_length);
 
         if (!test_bit(HCI_RUNNING, &hdev->flags))
                 goto done;
@@ -642,10 +813,10 @@ done:
 static void btusb_isoc_tx_complete(struct urb *urb)
 {
         struct sk_buff *skb = urb->context;
-        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
+        struct hci_dev *hdev = (struct hci_dev *)skb->dev;
 
-        BT_DBG("%s urb %p status %d count %d", hdev->name,
-                                        urb, urb->status, urb->actual_length);
+        BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,
+               urb->actual_length);
 
         if (!test_bit(HCI_RUNNING, &hdev->flags))
                 goto done;
@@ -729,6 +900,8 @@ static int btusb_close(struct hci_dev *hdev)
         clear_bit(BTUSB_INTR_RUNNING, &data->flags);
 
         btusb_stop_traffic(data);
+        btusb_free_frags(data);
+
         err = usb_autopm_get_interface(data->intf);
         if (err < 0)
                 goto failed;
@@ -748,122 +921,181 @@ static int btusb_flush(struct hci_dev *hdev)
         BT_DBG("%s", hdev->name);
 
         usb_kill_anchored_urbs(&data->tx_anchor);
+        btusb_free_frags(data);
 
         return 0;
 }
 
-static int btusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
+static struct urb *alloc_ctrl_urb(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct btusb_data *data = hci_get_drvdata(hdev);
         struct usb_ctrlrequest *dr;
         struct urb *urb;
         unsigned int pipe;
-        int err;
 
-        BT_DBG("%s", hdev->name);
+        urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!urb)
+                return ERR_PTR(-ENOMEM);
 
-        if (!test_bit(HCI_RUNNING, &hdev->flags))
-                return -EBUSY;
+        dr = kmalloc(sizeof(*dr), GFP_KERNEL);
+        if (!dr) {
+                usb_free_urb(urb);
+                return ERR_PTR(-ENOMEM);
+        }
 
-        skb->dev = (void *) hdev;
+        dr->bRequestType = data->cmdreq_type;
+        dr->bRequest     = 0;
+        dr->wIndex       = 0;
+        dr->wValue       = 0;
+        dr->wLength      = __cpu_to_le16(skb->len);
 
-        switch (bt_cb(skb)->pkt_type) {
-        case HCI_COMMAND_PKT:
-                urb = usb_alloc_urb(0, GFP_ATOMIC);
-                if (!urb)
-                        return -ENOMEM;
-
-                dr = kmalloc(sizeof(*dr), GFP_ATOMIC);
-                if (!dr) {
-                        usb_free_urb(urb);
-                        return -ENOMEM;
-                }
+        pipe = usb_sndctrlpipe(data->udev, 0x00);
 
-                dr->bRequestType = data->cmdreq_type;
-                dr->bRequest     = 0;
-                dr->wIndex       = 0;
-                dr->wValue       = 0;
-                dr->wLength      = __cpu_to_le16(skb->len);
+        usb_fill_control_urb(urb, data->udev, pipe, (void *)dr,
+                             skb->data, skb->len, btusb_tx_complete, skb);
 
-                pipe = usb_sndctrlpipe(data->udev, 0x00);
+        skb->dev = (void *)hdev;
 
-                usb_fill_control_urb(urb, data->udev, pipe, (void *) dr,
-                                skb->data, skb->len, btusb_tx_complete, skb);
+        return urb;
+}
 
-                hdev->stat.cmd_tx++;
-                break;
+static struct urb *alloc_bulk_urb(struct hci_dev *hdev, struct sk_buff *skb)
+{
+        struct btusb_data *data = hci_get_drvdata(hdev);
+        struct urb *urb;
+        unsigned int pipe;
 
-        case HCI_ACLDATA_PKT:
-                if (!data->bulk_tx_ep)
-                        return -ENODEV;
+        if (!data->bulk_tx_ep)
+                return ERR_PTR(-ENODEV);
 
-                urb = usb_alloc_urb(0, GFP_ATOMIC);
-                if (!urb)
-                        return -ENOMEM;
+        urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!urb)
+                return ERR_PTR(-ENOMEM);
 
-                pipe = usb_sndbulkpipe(data->udev,
-                                        data->bulk_tx_ep->bEndpointAddress);
+        pipe = usb_sndbulkpipe(data->udev, data->bulk_tx_ep->bEndpointAddress);
 
-                usb_fill_bulk_urb(urb, data->udev, pipe,
-                                skb->data, skb->len, btusb_tx_complete, skb);
+        usb_fill_bulk_urb(urb, data->udev, pipe,
+                          skb->data, skb->len, btusb_tx_complete, skb);
 
-                hdev->stat.acl_tx++;
-                break;
+        skb->dev = (void *)hdev;
 
-        case HCI_SCODATA_PKT:
-                if (!data->isoc_tx_ep || hci_conn_num(hdev, SCO_LINK) < 1)
-                        return -ENODEV;
+        return urb;
+}
 
-                urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_ATOMIC);
-                if (!urb)
-                        return -ENOMEM;
+static struct urb *alloc_isoc_urb(struct hci_dev *hdev, struct sk_buff *skb)
+{
+        struct btusb_data *data = hci_get_drvdata(hdev);
+        struct urb *urb;
+        unsigned int pipe;
 
-                pipe = usb_sndisocpipe(data->udev,
-                                        data->isoc_tx_ep->bEndpointAddress);
+        if (!data->isoc_tx_ep)
+                return ERR_PTR(-ENODEV);
 
-                usb_fill_int_urb(urb, data->udev, pipe,
-                                skb->data, skb->len, btusb_isoc_tx_complete,
-                                skb, data->isoc_tx_ep->bInterval);
+        urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_KERNEL);
+        if (!urb)
+                return ERR_PTR(-ENOMEM);
 
-                urb->transfer_flags  = URB_ISO_ASAP;
+        pipe = usb_sndisocpipe(data->udev, data->isoc_tx_ep->bEndpointAddress);
 
-                __fill_isoc_descriptor(urb, skb->len,
-                                le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize));
+        usb_fill_int_urb(urb, data->udev, pipe,
+                         skb->data, skb->len, btusb_isoc_tx_complete,
+                         skb, data->isoc_tx_ep->bInterval);
 
-                hdev->stat.sco_tx++;
-                goto skip_waking;
+        urb->transfer_flags  = URB_ISO_ASAP;
 
-        default:
-                return -EILSEQ;
-        }
+        __fill_isoc_descriptor(urb, skb->len,
+                               le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize));
 
-        err = inc_tx(data);
-        if (err) {
-                usb_anchor_urb(urb, &data->deferred);
-                schedule_work(&data->waker);
-                err = 0;
-                goto done;
-        }
+        skb->dev = (void *)hdev;
+
+        return urb;
+}
+
+static int submit_tx_urb(struct hci_dev *hdev, struct urb *urb)
+{
+        struct btusb_data *data = hci_get_drvdata(hdev);
+        int err;
 
-skip_waking:
         usb_anchor_urb(urb, &data->tx_anchor);
 
-        err = usb_submit_urb(urb, GFP_ATOMIC);
+        err = usb_submit_urb(urb, GFP_KERNEL);
         if (err < 0) {
                 if (err != -EPERM && err != -ENODEV)
                         BT_ERR("%s urb %p submission failed (%d)",
-                                                hdev->name, urb, -err);
+                               hdev->name, urb, -err);
                 kfree(urb->setup_packet);
                 usb_unanchor_urb(urb);
         } else {
                 usb_mark_last_busy(data->udev);
         }
 
-done:
         usb_free_urb(urb);
         return err;
 }
 
+static int submit_or_queue_tx_urb(struct hci_dev *hdev, struct urb *urb)
+{
+        struct btusb_data *data = hci_get_drvdata(hdev);
+        unsigned long flags;
+        bool suspending;
+
+        spin_lock_irqsave(&data->txlock, flags);
+        suspending = test_bit(BTUSB_SUSPENDING, &data->flags);
+        if (!suspending)
+                data->tx_in_flight++;
+        spin_unlock_irqrestore(&data->txlock, flags);
+
+        if (!suspending)
+                return submit_tx_urb(hdev, urb);
+
+        usb_anchor_urb(urb, &data->deferred);
+        schedule_work(&data->waker);
+
+        usb_free_urb(urb);
+        return 0;
+}
+
+static int btusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
+{
+        struct urb *urb;
+
+        BT_DBG("%s", hdev->name);
+
+        if (!test_bit(HCI_RUNNING, &hdev->flags))
+                return -EBUSY;
+
+        switch (bt_cb(skb)->pkt_type) {
+        case HCI_COMMAND_PKT:
+                urb = alloc_ctrl_urb(hdev, skb);
+                if (IS_ERR(urb))
+                        return PTR_ERR(urb);
+
+                hdev->stat.cmd_tx++;
+                return submit_or_queue_tx_urb(hdev, urb);
+
+        case HCI_ACLDATA_PKT:
+                urb = alloc_bulk_urb(hdev, skb);
+                if (IS_ERR(urb))
+                        return PTR_ERR(urb);
+
+                hdev->stat.acl_tx++;
+                return submit_or_queue_tx_urb(hdev, urb);
+
+        case HCI_SCODATA_PKT:
+                if (hci_conn_num(hdev, SCO_LINK) < 1)
+                        return -ENODEV;
+
+                urb = alloc_isoc_urb(hdev, skb);
+                if (IS_ERR(urb))
+                        return PTR_ERR(urb);
+
+                hdev->stat.sco_tx++;
+                return submit_tx_urb(hdev, urb);
+        }
+
+        return -EILSEQ;
+}
+
 static void btusb_notify(struct hci_dev *hdev, unsigned int evt)
 {
         struct btusb_data *data = hci_get_drvdata(hdev);
@@ -940,6 +1172,7 @@ static void btusb_work(struct work_struct *work)
 
                 if (hdev->voice_setting & 0x0020) {
                         static const int alts[3] = { 2, 4, 5 };
+
                         new_alts = alts[data->sco_num - 1];
                 } else {
                         new_alts = data->sco_num;
@@ -1012,7 +1245,7 @@ static int btusb_setup_csr(struct hci_dev *hdev)
                 return -PTR_ERR(skb);
         }
 
-        rp = (struct hci_rp_read_local_version *) skb->data;
+        rp = (struct hci_rp_read_local_version *)skb->data;
 
         if (!rp->status) {
                 if (le16_to_cpu(rp->manufacturer) != 10) {
@@ -1050,7 +1283,7 @@ struct intel_version {
 } __packed;
 
 static const struct firmware *btusb_setup_intel_get_fw(struct hci_dev *hdev,
-                                                struct intel_version *ver)
+                                                       struct intel_version *ver)
 {
         const struct firmware *fw;
         char fwname[64];
@@ -1226,7 +1459,7 @@ static int btusb_check_bdaddr_intel(struct hci_dev *hdev)
                 return -EIO;
         }
 
-        rp = (struct hci_rp_read_bd_addr *) skb->data;
+        rp = (struct hci_rp_read_bd_addr *)skb->data;
         if (rp->status) {
                 BT_ERR("%s Intel device address result failed (%02x)",
                        hdev->name, rp->status);
@@ -1356,6 +1589,7 @@ static int btusb_setup_intel(struct hci_dev *hdev)
 
         if (skb->data[0]) {
                 u8 evt_status = skb->data[0];
+
                 BT_ERR("%s enable Intel manufacturer mode event failed (%02x)",
                        hdev->name, evt_status);
                 kfree_skb(skb);
@@ -1465,7 +1699,7 @@ static int btusb_set_bdaddr_intel(struct hci_dev *hdev, const bdaddr_t *bdaddr)
         if (IS_ERR(skb)) {
                 ret = PTR_ERR(skb);
                 BT_ERR("%s: changing Intel device address failed (%ld)",
-                        hdev->name, ret);
+                       hdev->name, ret);
                 return ret;
         }
         kfree_skb(skb);
@@ -1540,19 +1774,19 @@ static int btusb_setup_bcm_patchram(struct hci_dev *hdev)
         if (IS_ERR(skb)) {
                 ret = PTR_ERR(skb);
                 BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION failed (%ld)",
-                        hdev->name, ret);
+                       hdev->name, ret);
                 goto done;
         }
 
         if (skb->len != sizeof(*ver)) {
                 BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION event length mismatch",
-                        hdev->name);
+                       hdev->name);
                 kfree_skb(skb);
                 ret = -EIO;
                 goto done;
         }
 
-        ver = (struct hci_rp_read_local_version *) skb->data;
+        ver = (struct hci_rp_read_local_version *)skb->data;
         BT_INFO("%s: BCM: patching hci_ver=%02x hci_rev=%04x lmp_ver=%02x "
                 "lmp_subver=%04x", hdev->name, ver->hci_ver, ver->hci_rev,
                 ver->lmp_ver, ver->lmp_subver);
@@ -1563,7 +1797,7 @@ static int btusb_setup_bcm_patchram(struct hci_dev *hdev)
         if (IS_ERR(skb)) {
                 ret = PTR_ERR(skb);
                 BT_ERR("%s: BCM: Download Minidrv command failed (%ld)",
-                        hdev->name, ret);
+                       hdev->name, ret);
                 goto reset_fw;
         }
         kfree_skb(skb);
@@ -1575,13 +1809,13 @@ static int btusb_setup_bcm_patchram(struct hci_dev *hdev)
         fw_size = fw->size;
 
         while (fw_size >= sizeof(*cmd)) {
-                cmd = (struct hci_command_hdr *) fw_ptr;
+                cmd = (struct hci_command_hdr *)fw_ptr;
                 fw_ptr += sizeof(*cmd);
                 fw_size -= sizeof(*cmd);
 
                 if (fw_size < cmd->plen) {
                         BT_ERR("%s: BCM: patch %s is corrupted",
-                                hdev->name, fw_name);
+                               hdev->name, fw_name);
                         ret = -EINVAL;
                         goto reset_fw;
                 }
@@ -1597,7 +1831,7 @@ static int btusb_setup_bcm_patchram(struct hci_dev *hdev)
                 if (IS_ERR(skb)) {
                         ret = PTR_ERR(skb);
                         BT_ERR("%s: BCM: patch command %04x failed (%ld)",
-                                hdev->name, opcode, ret);
+                               hdev->name, opcode, ret);
                         goto reset_fw;
                 }
                 kfree_skb(skb);
@@ -1622,19 +1856,19 @@ reset_fw:
         if (IS_ERR(skb)) {
                 ret = PTR_ERR(skb);
                 BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION failed (%ld)",
-                        hdev->name, ret);
+                       hdev->name, ret);
                 goto done;
         }
 
         if (skb->len != sizeof(*ver)) {
                 BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION event length mismatch",
-                        hdev->name);
+                       hdev->name);
                 kfree_skb(skb);
                 ret = -EIO;
                 goto done;
         }
 
-        ver = (struct hci_rp_read_local_version *) skb->data;
+        ver = (struct hci_rp_read_local_version *)skb->data;
         BT_INFO("%s: BCM: firmware hci_ver=%02x hci_rev=%04x lmp_ver=%02x "
                 "lmp_subver=%04x", hdev->name, ver->hci_ver, ver->hci_rev,
                 ver->lmp_ver, ver->lmp_subver);
@@ -1646,19 +1880,19 @@ reset_fw:
         if (IS_ERR(skb)) {
                 ret = PTR_ERR(skb);
                 BT_ERR("%s: HCI_OP_READ_BD_ADDR failed (%ld)",
-                        hdev->name, ret);
+                       hdev->name, ret);
                 goto done;
         }
 
         if (skb->len != sizeof(*bda)) {
                 BT_ERR("%s: HCI_OP_READ_BD_ADDR event length mismatch",
-                        hdev->name);
+                       hdev->name);
                 kfree_skb(skb);
                 ret = -EIO;
                 goto done;
         }
 
-        bda = (struct hci_rp_read_bd_addr *) skb->data;
+        bda = (struct hci_rp_read_bd_addr *)skb->data;
         if (bda->status) {
                 BT_ERR("%s: HCI_OP_READ_BD_ADDR error status (%02x)",
                        hdev->name, bda->status);
@@ -1693,7 +1927,7 @@ static int btusb_set_bdaddr_bcm(struct hci_dev *hdev, const bdaddr_t *bdaddr)
         if (IS_ERR(skb)) {
                 ret = PTR_ERR(skb);
                 BT_ERR("%s: BCM: Change address command failed (%ld)",
-                        hdev->name, ret);
+                       hdev->name, ret);
                 return ret;
         }
         kfree_skb(skb);
@@ -1702,7 +1936,7 @@ static int btusb_set_bdaddr_bcm(struct hci_dev *hdev, const bdaddr_t *bdaddr)
 }
 
 static int btusb_probe(struct usb_interface *intf,
-                                const struct usb_device_id *id)
+                       const struct usb_device_id *id)
 {
         struct usb_endpoint_descriptor *ep_desc;
         struct btusb_data *data;
@@ -1717,6 +1951,7 @@ static int btusb_probe(struct usb_interface *intf,
 
         if (!id->driver_info) {
                 const struct usb_device_id *match;
+
                 match = usb_match_id(intf, blacklist_table);
                 if (match)
                         id = match;
@@ -1765,17 +2000,16 @@ static int btusb_probe(struct usb_interface *intf,
         data->udev = interface_to_usbdev(intf);
         data->intf = intf;
 
-        spin_lock_init(&data->lock);
-
         INIT_WORK(&data->work, btusb_work);
         INIT_WORK(&data->waker, btusb_waker);
+        init_usb_anchor(&data->deferred);
+        init_usb_anchor(&data->tx_anchor);
         spin_lock_init(&data->txlock);
 
-        init_usb_anchor(&data->tx_anchor);
         init_usb_anchor(&data->intr_anchor);
         init_usb_anchor(&data->bulk_anchor);
         init_usb_anchor(&data->isoc_anchor);
-        init_usb_anchor(&data->deferred);
+        spin_lock_init(&data->rxlock);
 
         hdev = hci_alloc_dev();
         if (!hdev)
@@ -1867,7 +2101,7 @@ static int btusb_probe(struct usb_interface *intf,
 
         if (data->isoc) {
                 err = usb_driver_claim_interface(&btusb_driver,
-                                                        data->isoc, data);
+                                                 data->isoc, data);
                 if (err < 0) {
                         hci_free_dev(hdev);
                         return err;
@@ -1908,6 +2142,7 @@ static void btusb_disconnect(struct usb_interface *intf)
         else if (data->isoc)
                 usb_driver_release_interface(&btusb_driver, data->isoc);
 
+        btusb_free_frags(data);
         hci_free_dev(hdev);
 }
 
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 9e6a124b13f2..07e0b887c350 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -323,8 +323,8 @@ static int mrf24j40_read_rx_buf(struct mrf24j40 *devrec,
 #ifdef DEBUG
         print_hex_dump(KERN_DEBUG, "mrf24j40 rx: ",
                 DUMP_PREFIX_OFFSET, 16, 1, data, *len, 0);
-        printk(KERN_DEBUG "mrf24j40 rx: lqi: %02hhx rssi: %02hhx\n",
-                lqi_rssi[0], lqi_rssi[1]);
+        pr_debug("mrf24j40 rx: lqi: %02hhx rssi: %02hhx\n",
+                 lqi_rssi[0], lqi_rssi[1]);
 #endif
 
 out:
@@ -385,7 +385,7 @@ err:
 static int mrf24j40_ed(struct ieee802154_dev *dev, u8 *level)
 {
         /* TODO: */
-        printk(KERN_WARNING "mrf24j40: ed not implemented\n");
+        pr_warn("mrf24j40: ed not implemented\n");
         *level = 0;
         return 0;
 }
@@ -412,6 +412,7 @@ static void mrf24j40_stop(struct ieee802154_dev *dev)
         struct mrf24j40 *devrec = dev->priv;
         u8 val;
         int ret;
+
         dev_dbg(printdev(devrec), "stop\n");
 
         ret = read_short_reg(devrec, REG_INTCON, &val);
@@ -419,8 +420,6 @@ static void mrf24j40_stop(struct ieee802154_dev *dev)
                 return;
         val |= 0x1|0x8; /* Set TXNIE and RXIE. Disable Interrupts */
         write_short_reg(devrec, REG_INTCON, val);
-
-        return;
 }
 
 static int mrf24j40_set_channel(struct ieee802154_dev *dev,
@@ -465,6 +464,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
         if (changed & IEEE802515_AFILT_SADDR_CHANGED) {
                 /* Short Addr */
                 u8 addrh, addrl;
+
                 addrh = le16_to_cpu(filt->short_addr) >> 8 & 0xff;
                 addrl = le16_to_cpu(filt->short_addr) & 0xff;
 
@@ -483,16 +483,17 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
                         write_short_reg(devrec, REG_EADR0 + i, addr[i]);
 
 #ifdef DEBUG
-                printk(KERN_DEBUG "Set long addr to: ");
+                pr_debug("Set long addr to: ");
                 for (i = 0; i < 8; i++)
-                        printk("%02hhx ", addr[7 - i]);
-                printk(KERN_DEBUG "\n");
+                        pr_debug("%02hhx ", addr[7 - i]);
+                pr_debug("\n");
 #endif
         }
 
         if (changed & IEEE802515_AFILT_PANID_CHANGED) {
                 /* PAN ID */
                 u8 panidl, panidh;
+
                 panidh = le16_to_cpu(filt->pan_id) >> 8 & 0xff;
                 panidl = le16_to_cpu(filt->pan_id) & 0xff;
                 write_short_reg(devrec, REG_PANIDH, panidh);
@@ -701,7 +702,7 @@ static int mrf24j40_probe(struct spi_device *spi)
         int ret = -ENOMEM;
         struct mrf24j40 *devrec;
 
-        printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq);
+        dev_info(&spi->dev, "probe(). IRQ: %d\n", spi->irq);
 
         devrec = devm_kzalloc(&spi->dev, sizeof(struct mrf24j40), GFP_KERNEL);
         if (!devrec)
diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index c63d1159db5c..ce7826009eeb 100644
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -25,6 +25,14 @@ config ATH_DEBUG
           Say Y, if you want to debug atheros wireless drivers.
           Right now only ath9k makes use of this.
 
+config ATH_TRACEPOINTS
+       bool "Atheros wireless tracing"
+       depends on ATH_DEBUG
+       depends on EVENT_TRACING
+       ---help---
+         This option enables tracepoints for atheros wireless drivers.
+         Currently, ath9k makes use of this facility.
+
 config ATH_REG_DYNAMIC_USER_REG_HINTS
         bool "Atheros dynamic user regulatory hints"
         depends on CFG80211_CERTIFICATION_ONUS
diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile
index 7d023b0f13b4..89f8d5979402 100644
--- a/drivers/net/wireless/ath/Makefile
+++ b/drivers/net/wireless/ath/Makefile
@@ -17,4 +17,8 @@ ath-objs :=	main.o \
                 dfs_pri_detector.o
 
 ath-$(CONFIG_ATH_DEBUG) += debug.o
+ath-$(CONFIG_ATH_TRACEPOINTS) += trace.o
+
 ccflags-y += -D__CHECK_ENDIAN__
+
+CFLAGS_trace.o := -I$(src)
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index a3b6e27d9121..e5ba6faf3281 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -268,6 +268,7 @@ enum ATH_DEBUG {
 };
 
 #define ATH_DBG_DEFAULT (ATH_DBG_FATAL)
+#define ATH_DBG_MAX_LEN 512
 
 #ifdef CONFIG_ATH_DEBUG
 
diff --git a/drivers/net/wireless/ath/ath10k/Kconfig b/drivers/net/wireless/ath/ath10k/Kconfig
index 1053bb5f2cdc..72acb822bb11 100644
--- a/drivers/net/wireless/ath/ath10k/Kconfig
+++ b/drivers/net/wireless/ath/ath10k/Kconfig
@@ -24,7 +24,7 @@ config ATH10K_DEBUG
 
 config ATH10K_DEBUGFS
         bool "Atheros ath10k debugfs support"
-        depends on ATH10K
+        depends on ATH10K && DEBUG_FS
         select RELAY
         ---help---
           Enabled debugfs support
diff --git a/drivers/net/wireless/ath/ath10k/Makefile b/drivers/net/wireless/ath/ath10k/Makefile
index 2cfb63ca9327..8b1b1adb477a 100644
--- a/drivers/net/wireless/ath/ath10k/Makefile
+++ b/drivers/net/wireless/ath/ath10k/Makefile
@@ -11,6 +11,7 @@ ath10k_core-y += mac.o \
                  bmi.o
 
 ath10k_core-$(CONFIG_ATH10K_DEBUGFS) += spectral.o
+ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o
 ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o
 
 obj-$(CONFIG_ATH10K_PCI) += ath10k_pci.o
diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h
index 111ab701465c..31a990635490 100644
--- a/drivers/net/wireless/ath/ath10k/bmi.h
+++ b/drivers/net/wireless/ath/ath10k/bmi.h
@@ -177,7 +177,6 @@ struct bmi_target_info {
         u32 type;
 };
 
-
 /* in msec */
 #define BMI_COMMUNICATION_TIMEOUT_HZ (1*HZ)
 
diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index 71eef233bd01..101cadb6e4ba 100644
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -260,7 +260,6 @@ static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar,
         ath10k_pci_write32(ar, ce_ctrl_addr + HOST_IS_ADDRESS, mask);
 }
 
-
 /*
  * Guts of ath10k_ce_send, used by both ath10k_ce_send and
  * ath10k_ce_sendlist_send.
@@ -385,7 +384,6 @@ int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe)
         return delta;
 }
 
-
 int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe)
 {
         struct ath10k *ar = pipe->ar;
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h
index 82d1f23546b9..329b7340fa72 100644
--- a/drivers/net/wireless/ath/ath10k/ce.h
+++ b/drivers/net/wireless/ath/ath10k/ce.h
@@ -20,7 +20,6 @@
 
 #include "hif.h"
 
-
 /* Maximum number of Copy Engine's supported */
 #define CE_COUNT_MAX 8
 #define CE_HTT_H2T_MSG_SRC_NENTRIES 4096
@@ -37,7 +36,6 @@
 
 struct ath10k_ce_pipe;
 
-
 #define CE_DESC_FLAGS_GATHER         (1 << 0)
 #define CE_DESC_FLAGS_BYTE_SWAP      (1 << 1)
 #define CE_DESC_FLAGS_META_DATA_MASK 0xFFFC
@@ -189,10 +187,10 @@ int ath10k_ce_completed_recv_next(struct ath10k_ce_pipe *ce_state,
  * Pops 1 completed send buffer from Source ring.
  */
 int ath10k_ce_completed_send_next(struct ath10k_ce_pipe *ce_state,
-                           void **per_transfer_contextp,
-                           u32 *bufferp,
-                           unsigned int *nbytesp,
-                           unsigned int *transfer_idp);
+                                  void **per_transfer_contextp,
+                                  u32 *bufferp,
+                                  unsigned int *nbytesp,
+                                  unsigned int *transfer_idp);
 
 /*==================CE Engine Initialization=======================*/
 
@@ -202,7 +200,7 @@ int ath10k_ce_init_pipe(struct ath10k *ar, unsigned int ce_id,
                         void (*recv_cb)(struct ath10k_ce_pipe *));
 void ath10k_ce_deinit_pipe(struct ath10k *ar, unsigned int ce_id);
 int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id,
-                          const struct ce_attr *attr);
+                         const struct ce_attr *attr);
 void ath10k_ce_free_pipe(struct ath10k *ar, int ce_id);
 
 /*==================CE Engine Shutdown=======================*/
@@ -383,7 +381,6 @@ struct ce_attr {
 #define DST_WATERMARK_HIGH_RESET                0
 #define DST_WATERMARK_ADDRESS                   0x0050
 
-
 static inline u32 ath10k_ce_base_address(unsigned int ce_id)
 {
         return CE0_BASE_ADDRESS + (CE1_BASE_ADDRESS - CE0_BASE_ADDRESS) * ce_id;
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 651a6da8adf5..cee18c89d7f2 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -26,6 +26,7 @@
 #include "bmi.h"
 #include "debug.h"
 #include "htt.h"
+#include "testmode.h"
 
 unsigned int ath10k_debug_mask;
 static bool uart_print;
@@ -257,21 +258,42 @@ static int ath10k_download_and_run_otp(struct ath10k *ar)
         return 0;
 }
 
-static int ath10k_download_fw(struct ath10k *ar)
+static int ath10k_download_fw(struct ath10k *ar, enum ath10k_firmware_mode mode)
 {
-        u32 address;
+        u32 address, data_len;
+        const char *mode_name;
+        const void *data;
         int ret;
 
         address = ar->hw_params.patch_load_addr;
 
-        ret = ath10k_bmi_fast_download(ar, address, ar->firmware_data,
-                                       ar->firmware_len);
+        switch (mode) {
+        case ATH10K_FIRMWARE_MODE_NORMAL:
+                data = ar->firmware_data;
+                data_len = ar->firmware_len;
+                mode_name = "normal";
+                break;
+        case ATH10K_FIRMWARE_MODE_UTF:
+                data = ar->testmode.utf->data;
+                data_len = ar->testmode.utf->size;
+                mode_name = "utf";
+                break;
+        default:
+                ath10k_err(ar, "unknown firmware mode: %d\n", mode);
+                return -EINVAL;
+        }
+
+        ath10k_dbg(ar, ATH10K_DBG_BOOT,
+                   "boot uploading firmware image %p len %d mode %s\n",
+                   data, data_len, mode_name);
+
+        ret = ath10k_bmi_fast_download(ar, address, data, data_len);
         if (ret) {
-                ath10k_err(ar, "could not write fw (%d)\n", ret);
-                goto exit;
+                ath10k_err(ar, "failed to download %s firmware: %d\n",
+                           mode_name, ret);
+                return ret;
         }
 
-exit:
         return ret;
 }
 
@@ -567,7 +589,8 @@ success:
         return 0;
 }
 
-static int ath10k_init_download_firmware(struct ath10k *ar)
+static int ath10k_init_download_firmware(struct ath10k *ar,
+                                         enum ath10k_firmware_mode mode)
 {
         int ret;
 
@@ -583,7 +606,7 @@ static int ath10k_init_download_firmware(struct ath10k *ar)
                 return ret;
         }
 
-        ret = ath10k_download_fw(ar);
+        ret = ath10k_download_fw(ar, mode);
         if (ret) {
                 ath10k_err(ar, "failed to download firmware: %d\n", ret);
                 return ret;
@@ -685,12 +708,15 @@ static void ath10k_core_restart(struct work_struct *work)
         case ATH10K_STATE_WEDGED:
                 ath10k_warn(ar, "device is wedged, will not restart\n");
                 break;
+        case ATH10K_STATE_UTF:
+                ath10k_warn(ar, "firmware restart in UTF mode not supported\n");
+                break;
         }
 
         mutex_unlock(&ar->conf_mutex);
 }
 
-int ath10k_core_start(struct ath10k *ar)
+int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)
 {
         int status;
 
@@ -703,7 +729,7 @@ int ath10k_core_start(struct ath10k *ar)
                 goto err;
         }
 
-        status = ath10k_init_download_firmware(ar);
+        status = ath10k_init_download_firmware(ar, mode);
         if (status)
                 goto err;
 
@@ -760,10 +786,12 @@ int ath10k_core_start(struct ath10k *ar)
                 goto err_hif_stop;
         }
 
-        status = ath10k_htt_connect(&ar->htt);
-        if (status) {
-                ath10k_err(ar, "failed to connect htt (%d)\n", status);
-                goto err_hif_stop;
+        if (mode == ATH10K_FIRMWARE_MODE_NORMAL) {
+                status = ath10k_htt_connect(&ar->htt);
+                if (status) {
+                        ath10k_err(ar, "failed to connect htt (%d)\n", status);
+                        goto err_hif_stop;
+                }
         }
 
         status = ath10k_wmi_connect(ar);
@@ -778,11 +806,13 @@ int ath10k_core_start(struct ath10k *ar)
                 goto err_hif_stop;
         }
 
-        status = ath10k_wmi_wait_for_service_ready(ar);
-        if (status <= 0) {
-                ath10k_warn(ar, "wmi service ready event not received");
-                status = -ETIMEDOUT;
-                goto err_hif_stop;
+        if (mode == ATH10K_FIRMWARE_MODE_NORMAL) {
+                status = ath10k_wmi_wait_for_service_ready(ar);
+                if (status <= 0) {
+                        ath10k_warn(ar, "wmi service ready event not received");
+                        status = -ETIMEDOUT;
+                        goto err_hif_stop;
+                }
         }
 
         ath10k_dbg(ar, ATH10K_DBG_BOOT, "firmware %s booted\n",
@@ -802,10 +832,13 @@ int ath10k_core_start(struct ath10k *ar)
                 goto err_hif_stop;
         }
 
-        status = ath10k_htt_setup(&ar->htt);
-        if (status) {
-                ath10k_err(ar, "failed to setup htt: %d\n", status);
-                goto err_hif_stop;
+        /* we don't care about HTT in UTF mode */
+        if (mode == ATH10K_FIRMWARE_MODE_NORMAL) {
+                status = ath10k_htt_setup(&ar->htt);
+                if (status) {
+                        ath10k_err(ar, "failed to setup htt: %d\n", status);
+                        goto err_hif_stop;
+                }
         }
 
         status = ath10k_debug_start(ar);
@@ -861,7 +894,8 @@ void ath10k_core_stop(struct ath10k *ar)
         lockdep_assert_held(&ar->conf_mutex);
 
         /* try to suspend target */
-        if (ar->state != ATH10K_STATE_RESTARTING)
+        if (ar->state != ATH10K_STATE_RESTARTING &&
+            ar->state != ATH10K_STATE_UTF)
                 ath10k_wait_for_suspend(ar, WMI_PDEV_SUSPEND_AND_DISABLE_INTR);
 
         ath10k_debug_stop(ar);
@@ -914,7 +948,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
 
         mutex_lock(&ar->conf_mutex);
 
-        ret = ath10k_core_start(ar);
+        ret = ath10k_core_start(ar, ATH10K_FIRMWARE_MODE_NORMAL);
         if (ret) {
                 ath10k_err(ar, "could not init core (%d)\n", ret);
                 ath10k_core_free_firmware_files(ar);
@@ -977,7 +1011,7 @@ static void ath10k_core_register_work(struct work_struct *work)
                 goto err_release_fw;
         }
 
-        status = ath10k_debug_create(ar);
+        status = ath10k_debug_register(ar);
         if (status) {
                 ath10k_err(ar, "unable to initialize debugfs\n");
                 goto err_unregister_mac;
@@ -1041,9 +1075,11 @@ void ath10k_core_unregister(struct ath10k *ar)
          * unhappy about callback failures. */
         ath10k_mac_unregister(ar);
 
+        ath10k_testmode_destroy(ar);
+
         ath10k_core_free_firmware_files(ar);
 
-        ath10k_debug_destroy(ar);
+        ath10k_debug_unregister(ar);
 }
 EXPORT_SYMBOL(ath10k_core_unregister);
 
@@ -1051,6 +1087,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
                                   const struct ath10k_hif_ops *hif_ops)
 {
         struct ath10k *ar;
+        int ret;
 
         ar = ath10k_mac_create(priv_size);
         if (!ar)
@@ -1076,7 +1113,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
 
         ar->workqueue = create_singlethread_workqueue("ath10k_wq");
         if (!ar->workqueue)
-                goto err_wq;
+                goto err_free_mac;
 
         mutex_init(&ar->conf_mutex);
         spin_lock_init(&ar->data_lock);
@@ -1094,10 +1131,18 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
         INIT_WORK(&ar->register_work, ath10k_core_register_work);
         INIT_WORK(&ar->restart_work, ath10k_core_restart);
 
+        ret = ath10k_debug_create(ar);
+        if (ret)
+                goto err_free_wq;
+
         return ar;
 
-err_wq:
+err_free_wq:
+        destroy_workqueue(ar->workqueue);
+
+err_free_mac:
         ath10k_mac_destroy(ar);
+
         return NULL;
 }
 EXPORT_SYMBOL(ath10k_core_create);
@@ -1107,6 +1152,7 @@ void ath10k_core_destroy(struct ath10k *ar)
         flush_workqueue(ar->workqueue);
         destroy_workqueue(ar->workqueue);
 
+        ath10k_debug_destroy(ar);
         ath10k_mac_destroy(ar);
 }
 EXPORT_SYMBOL(ath10k_core_destroy);
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 4ef476099225..fe531ea6926c 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -293,7 +293,7 @@ struct ath10k_debug {
         struct dentry *debugfs_phy;
 
         struct ath10k_target_stats target_stats;
-        DECLARE_BITMAP(wmi_service_bitmap, WMI_SERVICE_BM_SIZE);
+        DECLARE_BITMAP(wmi_service_bitmap, WMI_SERVICE_MAX);
 
         struct completion event_stats_compl;
 
@@ -330,6 +330,17 @@ enum ath10k_state {
          * prevents completion timeouts and makes the driver more responsive to
          * userspace commands. This is also prevents recursive recovery. */
         ATH10K_STATE_WEDGED,
+
+        /* factory tests */
+        ATH10K_STATE_UTF,
+};
+
+enum ath10k_firmware_mode {
+        /* the default mode, standard 802.11 functionality */
+        ATH10K_FIRMWARE_MODE_NORMAL,
+
+        /* factory tests etc */
+        ATH10K_FIRMWARE_MODE_UTF,
 };
 
 enum ath10k_fw_features {
@@ -472,7 +483,6 @@ struct ath10k {
         struct cfg80211_chan_def chandef;
 
         int free_vdev_map;
-        bool promisc;
         bool monitor;
         int monitor_vdev_id;
         bool monitor_started;
@@ -544,6 +554,15 @@ struct ath10k {
                 struct ath10k_spec_scan config;
         } spectral;
 
+        struct {
+                /* protected by conf_mutex */
+                const struct firmware *utf;
+                DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT);
+
+                /* protected by data_lock */
+                bool utf_monitor;
+        } testmode;
+
         /* must be last */
         u8 drv_priv[0] __aligned(sizeof(void *));
 };
@@ -552,7 +571,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
                                   const struct ath10k_hif_ops *hif_ops);
 void ath10k_core_destroy(struct ath10k *ar);
 
-int ath10k_core_start(struct ath10k *ar);
+int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode);
 int ath10k_wait_for_suspend(struct ath10k *ar, u32 suspend_opt);
 void ath10k_core_stop(struct ath10k *ar);
 int ath10k_core_register(struct ath10k *ar, u32 chip_id);
diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index f3f0a80f8bab..3756feba3223 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -117,7 +117,7 @@ int ath10k_info(struct ath10k *ar, const char *fmt, ...)
         va_start(args, fmt);
         vaf.va = &args;
         ret = dev_info(ar->dev, "%pV", &vaf);
-        trace_ath10k_log_info(&vaf);
+        trace_ath10k_log_info(ar, &vaf);
         va_end(args);
 
         return ret;
@@ -134,11 +134,12 @@ void ath10k_print_driver_info(struct ath10k *ar)
                     ar->fw_api,
                     ar->htt.target_version_major,
                     ar->htt.target_version_minor);
-        ath10k_info(ar, "debug %d debugfs %d tracing %d dfs %d\n",
+        ath10k_info(ar, "debug %d debugfs %d tracing %d dfs %d testmode %d\n",
                     config_enabled(CONFIG_ATH10K_DEBUG),
                     config_enabled(CONFIG_ATH10K_DEBUGFS),
                     config_enabled(CONFIG_ATH10K_TRACING),
-                    config_enabled(CONFIG_ATH10K_DFS_CERTIFIED));
+                    config_enabled(CONFIG_ATH10K_DFS_CERTIFIED),
+                    config_enabled(CONFIG_NL80211_TESTMODE));
 }
 EXPORT_SYMBOL(ath10k_print_driver_info);
 
@@ -153,7 +154,7 @@ int ath10k_err(struct ath10k *ar, const char *fmt, ...)
         va_start(args, fmt);
         vaf.va = &args;
         ret = dev_err(ar->dev, "%pV", &vaf);
-        trace_ath10k_log_err(&vaf);
+        trace_ath10k_log_err(ar, &vaf);
         va_end(args);
 
         return ret;
@@ -170,7 +171,7 @@ int ath10k_warn(struct ath10k *ar, const char *fmt, ...)
         va_start(args, fmt);
         vaf.va = &args;
         dev_warn_ratelimited(ar->dev, "%pV", &vaf);
-        trace_ath10k_log_warn(&vaf);
+        trace_ath10k_log_warn(ar, &vaf);
 
         va_end(args);
 
@@ -208,7 +209,7 @@ static ssize_t ath10k_read_wmi_services(struct file *file,
         if (len > buf_len)
                 len = buf_len;
 
-        for (i = 0; i < WMI_MAX_SERVICE; i++) {
+        for (i = 0; i < WMI_SERVICE_MAX; i++) {
                 enabled = test_bit(i, ar->debug.wmi_service_bitmap);
                 name = wmi_service_name(i);
 
@@ -564,16 +565,35 @@ static const struct file_operations fops_fw_stats = {
         .llseek = default_llseek,
 };
 
+/* This is a clean assert crash in firmware. */
+static int ath10k_debug_fw_assert(struct ath10k *ar)
+{
+        struct wmi_vdev_install_key_cmd *cmd;
+        struct sk_buff *skb;
+
+        skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd) + 16);
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_vdev_install_key_cmd *)skb->data;
+        memset(cmd, 0, sizeof(*cmd));
+
+        /* big enough number so that firmware asserts */
+        cmd->vdev_id = __cpu_to_le32(0x7ffe);
+
+        return ath10k_wmi_cmd_send(ar, skb,
+                                   ar->wmi.cmd->vdev_install_key_cmdid);
+}
+
 static ssize_t ath10k_read_simulate_fw_crash(struct file *file,
                                              char __user *user_buf,
                                              size_t count, loff_t *ppos)
 {
-        const char buf[] = "To simulate firmware crash write one of the"
-                           " keywords to this file:\n `soft` - this will send"
-                           " WMI_FORCE_FW_HANG_ASSERT to firmware if FW"
-                           " supports that command.\n `hard` - this will send"
-                           " to firmware command with illegal parameters"
-                           " causing firmware crash.\n";
+        const char buf[] =
+                "To simulate firmware crash write one of the keywords to this file:\n"
+                "`soft` - this will send WMI_FORCE_FW_HANG_ASSERT to firmware if FW supports that command.\n"
+                "`hard` - this will send to firmware command with illegal parameters causing firmware crash.\n"
+                "`assert` - this will send special illegal parameter to firmware to cause assert failure and crash.\n";
 
         return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
 }
@@ -621,7 +641,11 @@ static ssize_t ath10k_write_simulate_fw_crash(struct file *file,
                  * firmware variants in order to force a firmware crash.
                  */
                 ret = ath10k_wmi_vdev_set_param(ar, 0x7fff,
-                                        ar->wmi.vdev_param->rts_threshold, 0);
+                                                ar->wmi.vdev_param->rts_threshold,
+                                                0);
+        } else if (!strcmp(buf, "assert")) {
+                ath10k_info(ar, "simulating firmware assert crash\n");
+                ret = ath10k_debug_fw_assert(ar);
         } else {
                 ret = -EINVAL;
                 goto exit;
@@ -840,8 +864,8 @@ static void ath10k_debug_htt_stats_dwork(struct work_struct *work)
 }
 
 static ssize_t ath10k_read_htt_stats_mask(struct file *file,
-                                            char __user *user_buf,
-                                            size_t count, loff_t *ppos)
+                                          char __user *user_buf,
+                                          size_t count, loff_t *ppos)
 {
         struct ath10k *ar = file->private_data;
         char buf[32];
@@ -853,8 +877,8 @@ static ssize_t ath10k_read_htt_stats_mask(struct file *file,
 }
 
 static ssize_t ath10k_write_htt_stats_mask(struct file *file,
-                                             const char __user *user_buf,
-                                             size_t count, loff_t *ppos)
+                                           const char __user *user_buf,
+                                           size_t count, loff_t *ppos)
 {
         struct ath10k *ar = file->private_data;
         unsigned long mask;
@@ -959,8 +983,8 @@ static const struct file_operations fops_htt_max_amsdu_ampdu = {
 };
 
 static ssize_t ath10k_read_fw_dbglog(struct file *file,
-                                            char __user *user_buf,
-                                            size_t count, loff_t *ppos)
+                                     char __user *user_buf,
+                                     size_t count, loff_t *ppos)
 {
         struct ath10k *ar = file->private_data;
         unsigned int len;
@@ -1132,19 +1156,28 @@ static const struct file_operations fops_dfs_stats = {
 
 int ath10k_debug_create(struct ath10k *ar)
 {
-        int ret;
-
         ar->debug.fw_crash_data = vzalloc(sizeof(*ar->debug.fw_crash_data));
-        if (!ar->debug.fw_crash_data) {
-                ret = -ENOMEM;
-                goto err;
-        }
+        if (!ar->debug.fw_crash_data)
+                return -ENOMEM;
 
+        return 0;
+}
+
+void ath10k_debug_destroy(struct ath10k *ar)
+{
+        vfree(ar->debug.fw_crash_data);
+        ar->debug.fw_crash_data = NULL;
+}
+
+int ath10k_debug_register(struct ath10k *ar)
+{
         ar->debug.debugfs_phy = debugfs_create_dir("ath10k",
                                                    ar->hw->wiphy->debugfsdir);
-        if (!ar->debug.debugfs_phy) {
-                ret = -ENOMEM;
-                goto err_free_fw_crash_data;
+        if (IS_ERR_OR_NULL(ar->debug.debugfs_phy)) {
+                if (IS_ERR(ar->debug.debugfs_phy))
+                        return PTR_ERR(ar->debug.debugfs_phy);
+
+                return -ENOMEM;
         }
 
         INIT_DELAYED_WORK(&ar->debug.htt_stats_dwork,
@@ -1192,17 +1225,10 @@ int ath10k_debug_create(struct ath10k *ar)
         }
 
         return 0;
-
-err_free_fw_crash_data:
-        vfree(ar->debug.fw_crash_data);
-
-err:
-        return ret;
 }
 
-void ath10k_debug_destroy(struct ath10k *ar)
+void ath10k_debug_unregister(struct ath10k *ar)
 {
-        vfree(ar->debug.fw_crash_data);
         cancel_delayed_work_sync(&ar->debug.htt_stats_dwork);
 }
 
@@ -1223,7 +1249,7 @@ void ath10k_dbg(struct ath10k *ar, enum ath10k_debug_mask mask,
         if (ath10k_debug_mask & mask)
                 dev_printk(KERN_DEBUG, ar->dev, "%pV", &vaf);
 
-        trace_ath10k_log_dbg(mask, &vaf);
+        trace_ath10k_log_dbg(ar, mask, &vaf);
 
         va_end(args);
 }
@@ -1242,7 +1268,7 @@ void ath10k_dbg_dump(struct ath10k *ar,
         }
 
         /* tracing code doesn't like null strings :/ */
-        trace_ath10k_log_dbg_dump(msg ? msg : "", prefix ? prefix : "",
+        trace_ath10k_log_dbg_dump(ar, msg ? msg : "", prefix ? prefix : "",
                                   buf, len);
 }
 EXPORT_SYMBOL(ath10k_dbg_dump);
diff --git a/drivers/net/wireless/ath/ath10k/debug.h b/drivers/net/wireless/ath/ath10k/debug.h
index 56746539bea2..b3774f7f492c 100644
--- a/drivers/net/wireless/ath/ath10k/debug.h
+++ b/drivers/net/wireless/ath/ath10k/debug.h
@@ -34,6 +34,7 @@ enum ath10k_debug_mask {
         ATH10K_DBG_DATA         = 0x00000200,
         ATH10K_DBG_BMI          = 0x00000400,
         ATH10K_DBG_REGULATORY   = 0x00000800,
+        ATH10K_DBG_TESTMODE     = 0x00001000,
         ATH10K_DBG_ANY          = 0xffffffff,
 };
 
@@ -49,6 +50,8 @@ int ath10k_debug_start(struct ath10k *ar);
 void ath10k_debug_stop(struct ath10k *ar);
 int ath10k_debug_create(struct ath10k *ar);
 void ath10k_debug_destroy(struct ath10k *ar);
+int ath10k_debug_register(struct ath10k *ar);
+void ath10k_debug_unregister(struct ath10k *ar);
 void ath10k_debug_read_service_map(struct ath10k *ar,
                                    void *service_map,
                                    size_t map_size);
@@ -80,6 +83,15 @@ static inline void ath10k_debug_destroy(struct ath10k *ar)
 {
 }
 
+static inline int ath10k_debug_register(struct ath10k *ar)
+{
+        return 0;
+}
+
+static inline void ath10k_debug_unregister(struct ath10k *ar)
+{
+}
+
 static inline void ath10k_debug_read_service_map(struct ath10k *ar,
                                                  void *service_map,
                                                  size_t map_size)
diff --git a/drivers/net/wireless/ath/ath10k/hif.h b/drivers/net/wireless/ath/ath10k/hif.h
index 2ac7beacddca..62323fea27e1 100644
--- a/drivers/net/wireless/ath/ath10k/hif.h
+++ b/drivers/net/wireless/ath/ath10k/hif.h
@@ -91,7 +91,6 @@ struct ath10k_hif_ops {
         int (*resume)(struct ath10k *ar);
 };
 
-
 static inline int ath10k_hif_tx_sg(struct ath10k *ar, u8 pipe_id,
                                    struct ath10k_hif_sg_item *items,
                                    int n_items)
diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
index fd9a251f0659..676bd4ed969b 100644
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
@@ -45,10 +45,8 @@ static struct sk_buff *ath10k_htc_build_tx_ctrl_skb(void *ar)
         struct ath10k_skb_cb *skb_cb;
 
         skb = dev_alloc_skb(ATH10K_HTC_CONTROL_BUFFER_SIZE);
-        if (!skb) {
-                ath10k_warn(ar, "Unable to allocate ctrl skb\n");
+        if (!skb)
                 return NULL;
-        }
 
         skb_reserve(skb, 20); /* FIXME: why 20 bytes? */
         WARN_ONCE((unsigned long)skb->data & 3, "unaligned skb");
@@ -569,7 +567,7 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc)
                         ath10k_hif_send_complete_check(htc->ar, i, 1);
 
                 status = wait_for_completion_timeout(&htc->ctl_resp,
-                                        ATH10K_HTC_WAIT_TIMEOUT_HZ);
+                                                     ATH10K_HTC_WAIT_TIMEOUT_HZ);
 
                 if (status == 0)
                         status = -ETIMEDOUT;
@@ -806,10 +804,8 @@ struct sk_buff *ath10k_htc_alloc_skb(struct ath10k *ar, int size)
         struct sk_buff *skb;
 
         skb = dev_alloc_skb(size + sizeof(struct ath10k_htc_hdr));
-        if (!skb) {
-                ath10k_warn(ar, "could not allocate HTC tx skb\n");
+        if (!skb)
                 return NULL;
-        }
 
         skb_reserve(skb, sizeof(struct ath10k_htc_hdr));
 
diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
index bf532f671189..527179c0edce 100644
--- a/drivers/net/wireless/ath/ath10k/htc.h
+++ b/drivers/net/wireless/ath/ath10k/htc.h
@@ -214,7 +214,6 @@ struct ath10k_htc_frame {
         struct ath10k_htc_record trailer[0];
 } __packed __aligned(4);
 
-
 /*******************/
 /* Host-side stuff */
 /*******************/
diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
index 87daae11f116..56cb4aceb383 100644
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -101,7 +101,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt)
                 return status;
 
         status = wait_for_completion_timeout(&htt->target_version_received,
-                                                HTT_TARGET_VERSION_TIMEOUT_HZ);
+                                             HTT_TARGET_VERSION_TIMEOUT_HZ);
         if (status <= 0) {
                 ath10k_warn(ar, "htt version request timed out\n");
                 return -ETIMEDOUT;
diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 6c93f3885ee5..3b44217a6c19 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -265,7 +265,6 @@ enum htt_mgmt_tx_status {
 
 /*=== target -> host messages ===============================================*/
 
-
 enum htt_t2h_msg_type {
         HTT_T2H_MSG_TYPE_VERSION_CONF           = 0x0,
         HTT_T2H_MSG_TYPE_RX_IND                 = 0x1,
@@ -1032,6 +1031,7 @@ static inline struct htt_stats_conf_item *htt_stats_conf_next_item(
 {
         return (void *)item + sizeof(*item) + roundup(item->length, 4);
 }
+
 /*
  * host -> target FRAG DESCRIPTOR/MSDU_EXT DESC bank
  *
@@ -1148,7 +1148,6 @@ struct htt_resp {
         };
 } __packed;
 
-
 /*** host side structures follow ***/
 
 struct htt_tx_done {
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 30927b1d7109..60d40a04508b 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -42,7 +42,6 @@
 /* when under memory pressure rx ring refill may fail and needs a retry */
 #define HTT_RX_RING_REFILL_RETRY_MS 50
 
-
 static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb);
 static void ath10k_htt_txrx_compl_task(unsigned long ptr);
 
@@ -133,7 +132,7 @@ static int __ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num)
         dma_addr_t paddr;
         int ret = 0, idx;
 
-        idx = __le32_to_cpu(*(htt->rx_ring.alloc_idx.vaddr));
+        idx = __le32_to_cpu(*htt->rx_ring.alloc_idx.vaddr);
         while (num > 0) {
                 skb = dev_alloc_skb(HTT_RX_BUF_SIZE + HTT_RX_DESC_ALIGN);
                 if (!skb) {
@@ -171,7 +170,7 @@ static int __ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num)
         }
 
 fail:
-        *(htt->rx_ring.alloc_idx.vaddr) = __cpu_to_le32(idx);
+        *htt->rx_ring.alloc_idx.vaddr = __cpu_to_le32(idx);
         return ret;
 }
 
@@ -223,6 +222,7 @@ static void ath10k_htt_rx_msdu_buff_replenish(struct ath10k_htt *htt)
 static void ath10k_htt_rx_ring_refill_retry(unsigned long arg)
 {
         struct ath10k_htt *htt = (struct ath10k_htt *)arg;
+
         ath10k_htt_rx_msdu_buff_replenish(htt);
 }
 
@@ -314,7 +314,7 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
 {
         struct ath10k *ar = htt->ar;
         int msdu_len, msdu_chaining = 0;
-        struct sk_buff *msdu;
+        struct sk_buff *msdu, *next;
         struct htt_rx_desc *rx_desc;
 
         lockdep_assert_held(&htt->rx_ring.lock);
@@ -450,11 +450,11 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
                 if (last_msdu) {
                         msdu->next = NULL;
                         break;
-                } else {
-                        struct sk_buff *next = ath10k_htt_rx_netbuf_pop(htt);
-                        msdu->next = next;
-                        msdu = next;
                 }
+
+                next = ath10k_htt_rx_netbuf_pop(htt);
+                msdu->next = next;
+                msdu = next;
         }
         *tail_msdu = msdu;
 
@@ -480,6 +480,7 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
 static void ath10k_htt_rx_replenish_task(unsigned long ptr)
 {
         struct ath10k_htt *htt = (struct ath10k_htt *)ptr;
+
         ath10k_htt_rx_msdu_buff_replenish(htt);
 }
 
@@ -488,6 +489,7 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
         struct ath10k *ar = htt->ar;
         dma_addr_t paddr;
         void *vaddr;
+        size_t size;
         struct timer_list *timer = &htt->rx_ring.refill_retry_timer;
 
         htt->rx_ring.size = ath10k_htt_rx_ring_size(htt);
@@ -515,9 +517,9 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
         if (!htt->rx_ring.netbufs_ring)
                 goto err_netbuf;
 
-        vaddr = dma_alloc_coherent(htt->ar->dev,
-                   (htt->rx_ring.size * sizeof(htt->rx_ring.paddrs_ring)),
-                   &paddr, GFP_DMA);
+        size = htt->rx_ring.size * sizeof(htt->rx_ring.paddrs_ring);
+
+        vaddr = dma_alloc_coherent(htt->ar->dev, size, &paddr, GFP_DMA);
         if (!vaddr)
                 goto err_dma_ring;
 
@@ -625,19 +627,21 @@ static struct ieee80211_hdr *ath10k_htt_rx_skb_get_hdr(struct sk_buff *skb)
 
         rxd = (void *)skb->data - sizeof(*rxd);
         fmt = MS(__le32_to_cpu(rxd->msdu_start.info1),
-                        RX_MSDU_START_INFO1_DECAP_FORMAT);
+                 RX_MSDU_START_INFO1_DECAP_FORMAT);
 
         if (fmt == RX_MSDU_DECAP_RAW)
                 return (void *)skb->data;
-        else
-                return (void *)skb->data - RX_HTT_HDR_STATUS_LEN;
+
+        return (void *)skb->data - RX_HTT_HDR_STATUS_LEN;
 }
 
 /* This function only applies for first msdu in an msdu chain */
 static bool ath10k_htt_rx_hdr_is_amsdu(struct ieee80211_hdr *hdr)
 {
+        u8 *qc;
+
         if (ieee80211_is_data_qos(hdr->frame_control)) {
-                u8 *qc = ieee80211_get_qos_ctl(hdr);
+                qc = ieee80211_get_qos_ctl(hdr);
                 if (qc[0] & 0x80)
                         return true;
         }
@@ -914,7 +918,7 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
 
         rxd = (void *)skb->data - sizeof(*rxd);
         enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0),
-                        RX_MPDU_START_INFO0_ENCRYPT_TYPE);
+                     RX_MPDU_START_INFO0_ENCRYPT_TYPE);
 
         hdr = (struct ieee80211_hdr *)rxd->rx_hdr_status;
         hdr_len = ieee80211_hdrlen(hdr->frame_control);
@@ -950,8 +954,8 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
                         /* pull decapped header and copy SA & DA */
                         hdr = (struct ieee80211_hdr *)skb->data;
                         hdr_len = ath10k_htt_rx_nwifi_hdrlen(hdr);
-                        memcpy(da, ieee80211_get_DA(hdr), ETH_ALEN);
-                        memcpy(sa, ieee80211_get_SA(hdr), ETH_ALEN);
+                        ether_addr_copy(da, ieee80211_get_DA(hdr));
+                        ether_addr_copy(sa, ieee80211_get_SA(hdr));
                         skb_pull(skb, hdr_len);
 
                         /* push original 802.11 header */
@@ -968,8 +972,8 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
                         /* original 802.11 header has a different DA and in
                          * case of 4addr it may also have different SA
                          */
-                        memcpy(ieee80211_get_DA(hdr), da, ETH_ALEN);
-                        memcpy(ieee80211_get_SA(hdr), sa, ETH_ALEN);
+                        ether_addr_copy(ieee80211_get_DA(hdr), da);
+                        ether_addr_copy(ieee80211_get_SA(hdr), sa);
                         break;
                 case RX_MSDU_DECAP_ETHERNET2_DIX:
                         /* strip ethernet header and insert decapped 802.11
@@ -1029,9 +1033,9 @@ static void ath10k_htt_rx_msdu(struct ath10k_htt *htt,
 
         rxd = (void *)skb->data - sizeof(*rxd);
         fmt = MS(__le32_to_cpu(rxd->msdu_start.info1),
-                        RX_MSDU_START_INFO1_DECAP_FORMAT);
+                 RX_MSDU_START_INFO1_DECAP_FORMAT);
         enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0),
-                        RX_MPDU_START_INFO0_ENCRYPT_TYPE);
+                     RX_MPDU_START_INFO0_ENCRYPT_TYPE);
         hdr = (struct ieee80211_hdr *)rxd->rx_hdr_status;
         hdr_len = ieee80211_hdrlen(hdr->frame_control);
 
@@ -1332,7 +1336,7 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
 }
 
 static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt,
-                                struct htt_rx_fragment_indication *frag)
+                                       struct htt_rx_fragment_indication *frag)
 {
         struct ath10k *ar = htt->ar;
         struct sk_buff *msdu_head, *msdu_tail;
@@ -1378,7 +1382,7 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt,
         tkip_mic_err = !!(attention & RX_ATTENTION_FLAGS_TKIP_MIC_ERR);
         decrypt_err = !!(attention & RX_ATTENTION_FLAGS_DECRYPT_ERR);
         fmt = MS(__le32_to_cpu(rxd->msdu_start.info1),
-                        RX_MSDU_START_INFO1_DECAP_FORMAT);
+                 RX_MSDU_START_INFO1_DECAP_FORMAT);
 
         if (fmt != RX_MSDU_DECAP_RAW) {
                 ath10k_warn(ar, "we dont support non-raw fragmented rx yet\n");
@@ -1654,7 +1658,7 @@ void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
                 /* FIX THIS */
                 break;
         case HTT_T2H_MSG_TYPE_STATS_CONF:
-                trace_ath10k_htt_stats(skb->data, skb->len);
+                trace_ath10k_htt_stats(ar, skb->data, skb->len);
                 break;
         case HTT_T2H_MSG_TYPE_TX_INSPECT_IND:
                 /* Firmware can return tx frames if it's unable to fully
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index eaa73aa99c20..bd87a35201d8 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -154,7 +154,6 @@ void ath10k_htt_tx_free(struct ath10k_htt *htt)
         kfree(htt->pending_tx);
         kfree(htt->used_msdu_ids);
         dma_pool_destroy(htt->tx_pool);
-        return;
 }
 
 void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb)
@@ -377,7 +376,6 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)
         int msdu_id = -1;
         int res;
 
-
         res = ath10k_htt_tx_inc_pending(htt);
         if (res)
                 goto err;
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index 13568b01de9f..3cf5702c1e7e 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -36,6 +36,8 @@
 #define ATH10K_FW_API2_FILE             "firmware-2.bin"
 #define ATH10K_FW_API3_FILE             "firmware-3.bin"
 
+#define ATH10K_FW_UTF_FILE              "utf.bin"
+
 /* includes also the null byte */
 #define ATH10K_FIRMWARE_MAGIC               "QCA-ATH10K"
 
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 1f35bd1ef563..46709301a51e 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -26,6 +26,7 @@
 #include "wmi.h"
 #include "htt.h"
 #include "txrx.h"
+#include "testmode.h"
 
 /**********/
 /* Crypto */
@@ -198,7 +199,7 @@ static int ath10k_clear_vdev_key(struct ath10k_vif *arvif,
                 list_for_each_entry(peer, &ar->peers, list) {
                         for (i = 0; i < ARRAY_SIZE(peer->keys); i++) {
                                 if (peer->keys[i] == key) {
-                                        memcpy(addr, peer->addr, ETH_ALEN);
+                                        ether_addr_copy(addr, peer->addr);
                                         peer->keys[i] = NULL;
                                         break;
                                 }
@@ -224,7 +225,6 @@ static int ath10k_clear_vdev_key(struct ath10k_vif *arvif,
         return first_errno;
 }
 
-
 /*********************/
 /* General utilities */
 /*********************/
@@ -493,19 +493,6 @@ static inline int ath10k_vdev_setup_sync(struct ath10k *ar)
         return 0;
 }
 
-static bool ath10k_monitor_is_enabled(struct ath10k *ar)
-{
-        lockdep_assert_held(&ar->conf_mutex);
-
-        ath10k_dbg(ar, ATH10K_DBG_MAC,
-                   "mac monitor refs: promisc %d monitor %d cac %d\n",
-                   ar->promisc, ar->monitor,
-                   test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags));
-
-        return ar->promisc || ar->monitor ||
-               test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
-}
-
 static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id)
 {
         struct cfg80211_chan_def *chandef = &ar->chandef;
@@ -649,16 +636,6 @@ static int ath10k_monitor_start(struct ath10k *ar)
 
         lockdep_assert_held(&ar->conf_mutex);
 
-        if (!ath10k_monitor_is_enabled(ar)) {
-                ath10k_warn(ar, "trying to start monitor with no references\n");
-                return 0;
-        }
-
-        if (ar->monitor_started) {
-                ath10k_dbg(ar, ATH10K_DBG_MAC, "mac monitor already started\n");
-                return 0;
-        }
-
         ret = ath10k_monitor_vdev_create(ar);
         if (ret) {
                 ath10k_warn(ar, "failed to create monitor vdev: %d\n", ret);
@@ -678,34 +655,51 @@ static int ath10k_monitor_start(struct ath10k *ar)
         return 0;
 }
 
-static void ath10k_monitor_stop(struct ath10k *ar)
+static int ath10k_monitor_stop(struct ath10k *ar)
 {
         int ret;
 
         lockdep_assert_held(&ar->conf_mutex);
 
-        if (ath10k_monitor_is_enabled(ar)) {
-                ath10k_dbg(ar, ATH10K_DBG_MAC,
-                           "mac monitor will be stopped later\n");
-                return;
-        }
-
-        if (!ar->monitor_started) {
-                ath10k_dbg(ar, ATH10K_DBG_MAC,
-                           "mac monitor probably failed to start earlier\n");
-                return;
-        }
-
         ret = ath10k_monitor_vdev_stop(ar);
-        if (ret)
+        if (ret) {
                 ath10k_warn(ar, "failed to stop monitor vdev: %d\n", ret);
+                return ret;
+        }
 
         ret = ath10k_monitor_vdev_delete(ar);
-        if (ret)
+        if (ret) {
                 ath10k_warn(ar, "failed to delete monitor vdev: %d\n", ret);
+                return ret;
+        }
 
         ar->monitor_started = false;
         ath10k_dbg(ar, ATH10K_DBG_MAC, "mac monitor stopped\n");
+
+        return 0;
+}
+
+static int ath10k_monitor_recalc(struct ath10k *ar)
+{
+        bool should_start;
+
+        lockdep_assert_held(&ar->conf_mutex);
+
+        should_start = ar->monitor ||
+                       ar->filter_flags & FIF_PROMISC_IN_BSS ||
+                       test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
+
+        ath10k_dbg(ar, ATH10K_DBG_MAC,
+                   "mac monitor recalc started? %d should? %d\n",
+                   ar->monitor_started, should_start);
+
+        if (should_start == ar->monitor_started)
+                return 0;
+
+        if (should_start)
+                return ath10k_monitor_start(ar);
+
+        return ath10k_monitor_stop(ar);
 }
 
 static int ath10k_recalc_rtscts_prot(struct ath10k_vif *arvif)
@@ -736,7 +730,7 @@ static int ath10k_start_cac(struct ath10k *ar)
 
         set_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
 
-        ret = ath10k_monitor_start(ar);
+        ret = ath10k_monitor_recalc(ar);
         if (ret) {
                 ath10k_warn(ar, "failed to start monitor (cac): %d\n", ret);
                 clear_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
@@ -901,7 +895,7 @@ static int ath10k_vdev_stop(struct ath10k_vif *arvif)
 }
 
 static void ath10k_control_beaconing(struct ath10k_vif *arvif,
-                                struct ieee80211_bss_conf *info)
+                                     struct ieee80211_bss_conf *info)
 {
         struct ath10k *ar = arvif->ar;
         int ret = 0;
@@ -936,7 +930,7 @@ static void ath10k_control_beaconing(struct ath10k_vif *arvif,
                 return;
 
         arvif->aid = 0;
-        memcpy(arvif->bssid, info->bssid, ETH_ALEN);
+        ether_addr_copy(arvif->bssid, info->bssid);
 
         ret = ath10k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,
                                  arvif->bssid);
@@ -1056,7 +1050,7 @@ static void ath10k_peer_assoc_h_basic(struct ath10k *ar,
 {
         lockdep_assert_held(&ar->conf_mutex);
 
-        memcpy(arg->addr, sta->addr, ETH_ALEN);
+        ether_addr_copy(arg->addr, sta->addr);
         arg->vdev_id = arvif->vdev_id;
         arg->peer_aid = sta->aid;
         arg->peer_flags |= WMI_PEER_AUTH;
@@ -1111,9 +1105,9 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar,
                 ies = rcu_dereference(bss->ies);
 
                 wpaie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
-                                WLAN_OUI_TYPE_MICROSOFT_WPA,
-                                ies->data,
-                                ies->len);
+                                                WLAN_OUI_TYPE_MICROSOFT_WPA,
+                                                ies->data,
+                                                ies->len);
                 rcu_read_unlock();
                 cfg80211_put_bss(ar->hw->wiphy, bss);
         }
@@ -1163,6 +1157,7 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,
 {
         const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
         int i, n;
+        u32 stbc;
 
         lockdep_assert_held(&ar->conf_mutex);
 
@@ -1199,7 +1194,6 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,
         }
 
         if (ht_cap->cap & IEEE80211_HT_CAP_RX_STBC) {
-                u32 stbc;
                 stbc = ht_cap->cap & IEEE80211_HT_CAP_RX_STBC;
                 stbc = stbc >> IEEE80211_HT_CAP_RX_STBC_SHIFT;
                 stbc = stbc << WMI_RC_RX_STBC_FLAG_S;
@@ -1267,7 +1261,6 @@ static int ath10k_peer_assoc_qos_ap(struct ath10k *ar,
                         uapsd |= WMI_AP_PS_UAPSD_AC0_DELIVERY_EN |
                                  WMI_AP_PS_UAPSD_AC0_TRIGGER_EN;
 
-
                 if (sta->max_sp < MAX_WMI_AP_PS_PEER_PARAM_MAX_SP)
                         max_sp = sta->max_sp;
 
@@ -1296,7 +1289,8 @@ static int ath10k_peer_assoc_qos_ap(struct ath10k *ar,
                    sta->listen_interval - mac80211 patch required.
                    Currently use 10 seconds */
                 ret = ath10k_wmi_set_ap_ps_param(ar, arvif->vdev_id, sta->addr,
-                                        WMI_AP_PS_PEER_PARAM_AGEOUT_TIME, 10);
+                                                 WMI_AP_PS_PEER_PARAM_AGEOUT_TIME,
+                                                 10);
                 if (ret) {
                         ath10k_warn(ar, "failed to set ap ps peer param ageout time for vdev %i: %d\n",
                                     arvif->vdev_id, ret);
@@ -1320,7 +1314,6 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,
         arg->peer_flags |= WMI_PEER_VHT;
         arg->peer_vht_caps = vht_cap->cap;
 
-
         ampdu_factor = (vht_cap->cap &
                         IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK) >>
                        IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;
@@ -1531,7 +1524,7 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,
                    arvif->vdev_id, bss_conf->bssid, bss_conf->aid);
 
         arvif->aid = bss_conf->aid;
-        memcpy(arvif->bssid, bss_conf->bssid, ETH_ALEN);
+        ether_addr_copy(arvif->bssid, bss_conf->bssid);
 
         ret = ath10k_wmi_vdev_up(ar, arvif->vdev_id, arvif->aid, arvif->bssid);
         if (ret) {
@@ -1615,7 +1608,7 @@ static int ath10k_station_assoc(struct ath10k *ar, struct ath10k_vif *arvif,
                 return ret;
         }
 
-        if (!sta->wme) {
+        if (!sta->wme && !reassoc) {
                 arvif->num_legacy_stations++;
                 ret  = ath10k_recalc_rtscts_prot(arvif);
                 if (ret) {
@@ -1863,11 +1856,10 @@ static u8 ath10k_tx_h_get_tid(struct ieee80211_hdr *hdr)
         return ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
 }
 
-static u8 ath10k_tx_h_get_vdev_id(struct ath10k *ar,
-                                  struct ieee80211_tx_info *info)
+static u8 ath10k_tx_h_get_vdev_id(struct ath10k *ar, struct ieee80211_vif *vif)
 {
-        if (info->control.vif)
-                return ath10k_vif_to_arvif(info->control.vif)->vdev_id;
+        if (vif)
+                return ath10k_vif_to_arvif(vif)->vdev_id;
 
         if (ar->monitor_started)
                 return ar->monitor_vdev_id;
@@ -2323,7 +2315,7 @@ static void ath10k_tx(struct ieee80211_hw *hw,
 
         ATH10K_SKB_CB(skb)->htt.is_offchan = false;
         ATH10K_SKB_CB(skb)->htt.tid = ath10k_tx_h_get_tid(hdr);
-        ATH10K_SKB_CB(skb)->vdev_id = ath10k_tx_h_get_vdev_id(ar, info);
+        ATH10K_SKB_CB(skb)->vdev_id = ath10k_tx_h_get_vdev_id(ar, vif);
 
         /* it makes no sense to process injected frames like that */
         if (vif && vif->type != NL80211_IFTYPE_MONITOR) {
@@ -2369,12 +2361,14 @@ void ath10k_halt(struct ath10k *ar)
 
         lockdep_assert_held(&ar->conf_mutex);
 
-        if (ath10k_monitor_is_enabled(ar)) {
-                clear_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
-                ar->promisc = false;
-                ar->monitor = false;
+        clear_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
+        ar->filter_flags = 0;
+        ar->monitor = false;
+
+        if (ar->monitor_started)
                 ath10k_monitor_stop(ar);
-        }
+
+        ar->monitor_started = false;
 
         ath10k_scan_finish(ar);
         ath10k_peer_cleanup_all(ar);
@@ -2485,6 +2479,9 @@ static int ath10k_start(struct ieee80211_hw *hw)
                 WARN_ON(1);
                 ret = -EINVAL;
                 goto err;
+        case ATH10K_STATE_UTF:
+                ret = -EBUSY;
+                goto err;
         }
 
         ret = ath10k_hif_power_up(ar);
@@ -2493,7 +2490,7 @@ static int ath10k_start(struct ieee80211_hw *hw)
                 goto err_off;
         }
 
-        ret = ath10k_core_start(ar);
+        ret = ath10k_core_start(ar, ATH10K_FIRMWARE_MODE_NORMAL);
         if (ret) {
                 ath10k_err(ar, "Could not init core: %d\n", ret);
                 goto err_power_down;
@@ -2629,7 +2626,7 @@ static void ath10k_config_chan(struct ath10k *ar)
         /* First stop monitor interface. Some FW versions crash if there's a
          * lone monitor interface. */
         if (ar->monitor_started)
-                ath10k_monitor_vdev_stop(ar);
+                ath10k_monitor_stop(ar);
 
         list_for_each_entry(arvif, &ar->arvifs, list) {
                 if (!arvif->is_started)
@@ -2677,8 +2674,7 @@ static void ath10k_config_chan(struct ath10k *ar)
                 }
         }
 
-        if (ath10k_monitor_is_enabled(ar))
-                ath10k_monitor_vdev_start(ar, ar->monitor_vdev_id);
+        ath10k_monitor_recalc(ar);
 }
 
 static int ath10k_config(struct ieee80211_hw *hw, u32 changed)
@@ -2733,19 +2729,10 @@ static int ath10k_config(struct ieee80211_hw *hw, u32 changed)
                 ath10k_config_ps(ar);
 
         if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
-                if (conf->flags & IEEE80211_CONF_MONITOR && !ar->monitor) {
-                        ar->monitor = true;
-                        ret = ath10k_monitor_start(ar);
-                        if (ret) {
-                                ath10k_warn(ar, "failed to start monitor (config): %d\n",
-                                            ret);
-                                ar->monitor = false;
-                        }
-                } else if (!(conf->flags & IEEE80211_CONF_MONITOR) &&
-                           ar->monitor) {
-                        ar->monitor = false;
-                        ath10k_monitor_stop(ar);
-                }
+                ar->monitor = conf->flags & IEEE80211_CONF_MONITOR;
+                ret = ath10k_monitor_recalc(ar);
+                if (ret)
+                        ath10k_warn(ar, "failed to recalc monitor: %d\n", ret);
         }
 
         mutex_unlock(&ar->conf_mutex);
@@ -3009,18 +2996,9 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw,
         *total_flags &= SUPPORTED_FILTERS;
         ar->filter_flags = *total_flags;
 
-        if (ar->filter_flags & FIF_PROMISC_IN_BSS && !ar->promisc) {
-                ar->promisc = true;
-                ret = ath10k_monitor_start(ar);
-                if (ret) {
-                        ath10k_warn(ar, "failed to start monitor (promisc): %d\n",
-                                    ret);
-                        ar->promisc = false;
-                }
-        } else if (!(ar->filter_flags & FIF_PROMISC_IN_BSS) && ar->promisc) {
-                ar->promisc = false;
-                ath10k_monitor_stop(ar);
-        }
+        ret = ath10k_monitor_recalc(ar);
+        if (ret)
+                ath10k_warn(ar, "failed to recalc montior: %d\n", ret);
 
         mutex_unlock(&ar->conf_mutex);
 }
@@ -3033,7 +3011,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
         struct ath10k *ar = hw->priv;
         struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
         int ret = 0;
-        u32 vdev_param, pdev_param;
+        u32 vdev_param, pdev_param, slottime, preamble;
 
         mutex_lock(&ar->conf_mutex);
 
@@ -3112,7 +3090,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
                                  * this is never erased as we it for crypto key
                                  * clearing; this is FW requirement
                                  */
-                                memcpy(arvif->bssid, info->bssid, ETH_ALEN);
+                                ether_addr_copy(arvif->bssid, info->bssid);
 
                                 ath10k_dbg(ar, ATH10K_DBG_MAC,
                                            "mac vdev %d start %pM\n",
@@ -3154,7 +3132,6 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
-                u32 slottime;
                 if (info->use_short_slot)
                         slottime = WMI_VDEV_SLOT_TIME_SHORT; /* 9us */
 
@@ -3173,7 +3150,6 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
-                u32 preamble;
                 if (info->use_short_preamble)
                         preamble = WMI_VDEV_PREAMBLE_SHORT;
                 else
@@ -3192,8 +3168,16 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_ASSOC) {
-                if (info->assoc)
+                if (info->assoc) {
+                        /* Workaround: Make sure monitor vdev is not running
+                         * when associating to prevent some firmware revisions
+                         * (e.g. 10.1 and 10.2) from crashing.
+                         */
+                        if (ar->monitor_started)
+                                ath10k_monitor_stop(ar);
                         ath10k_bss_assoc(hw, vif, info);
+                        ath10k_monitor_recalc(ar);
+                }
         }
 
 exit:
@@ -3580,7 +3564,7 @@ exit:
 }
 
 static int ath10k_conf_tx_uapsd(struct ath10k *ar, struct ieee80211_vif *vif,
-                                 u16 ac, bool enable)
+                                u16 ac, bool enable)
 {
         struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
         u32 value = 0;
@@ -4081,8 +4065,8 @@ ath10k_bitrate_mask_nss(const struct cfg80211_bitrate_mask *mask,
                         continue;
                 else if (mask->control[band].ht_mcs[i] == 0x00)
                         break;
-                else
-                        return false;
+
+                return false;
         }
 
         ht_nss = i;
@@ -4093,8 +4077,8 @@ ath10k_bitrate_mask_nss(const struct cfg80211_bitrate_mask *mask,
                         continue;
                 else if (mask->control[band].vht_mcs[i] == 0x0000)
                         break;
-                else
-                        return false;
+
+                return false;
         }
 
         vht_nss = i;
@@ -4472,6 +4456,9 @@ static const struct ieee80211_ops ath10k_ops = {
         .sta_rc_update                  = ath10k_sta_rc_update,
         .get_tsf                        = ath10k_get_tsf,
         .ampdu_action                   = ath10k_ampdu_action,
+
+        CFG80211_TESTMODE_CMD(ath10k_tm_cmd)
+
 #ifdef CONFIG_PM
         .suspend                        = ath10k_suspend,
         .resume                         = ath10k_resume,
@@ -4723,7 +4710,6 @@ static struct ieee80211_sta_ht_cap ath10k_get_ht_cap(struct ath10k *ar)
         return ht_cap;
 }
 
-
 static void ath10k_get_arvif_iter(void *data, u8 *mac,
                                   struct ieee80211_vif *vif)
 {
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 056a35a77133..59e0ea83be50 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -64,9 +64,6 @@ static const struct pci_device_id ath10k_pci_id_table[] = {
         {0}
 };
 
-static int ath10k_pci_diag_read_access(struct ath10k *ar, u32 address,
-                                       u32 *data);
-
 static void ath10k_pci_buffer_cleanup(struct ath10k *ar);
 static int ath10k_pci_cold_reset(struct ath10k *ar);
 static int ath10k_pci_warm_reset(struct ath10k *ar);
@@ -343,8 +340,8 @@ static void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar)
 
         /* IMPORTANT: this extra read transaction is required to
          * flush the posted write buffer. */
-        (void) ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
-                                 PCIE_INTR_ENABLE_ADDRESS);
+        (void)ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
+                                PCIE_INTR_ENABLE_ADDRESS);
 }
 
 static void ath10k_pci_enable_legacy_irq(struct ath10k *ar)
@@ -355,8 +352,8 @@ static void ath10k_pci_enable_legacy_irq(struct ath10k *ar)
 
         /* IMPORTANT: this extra read transaction is required to
          * flush the posted write buffer. */
-        (void) ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
-                                 PCIE_INTR_ENABLE_ADDRESS);
+        (void)ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
+                                PCIE_INTR_ENABLE_ADDRESS);
 }
 
 static inline const char *ath10k_pci_get_irq_method(struct ath10k *ar)
@@ -365,10 +362,11 @@ static inline const char *ath10k_pci_get_irq_method(struct ath10k *ar)
 
         if (ar_pci->num_msi_intrs > 1)
                 return "msi-x";
-        else if (ar_pci->num_msi_intrs == 1)
+
+        if (ar_pci->num_msi_intrs == 1)
                 return "msi";
-        else
-                return "legacy";
+
+        return "legacy";
 }
 
 static int __ath10k_pci_rx_post_buf(struct ath10k_pci_pipe *pipe)
@@ -487,25 +485,6 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,
         void *data_buf = NULL;
         int i;
 
-        /*
-         * This code cannot handle reads to non-memory space. Redirect to the
-         * register read fn but preserve the multi word read capability of
-         * this fn
-         */
-        if (address < DRAM_BASE_ADDRESS) {
-                if (!IS_ALIGNED(address, 4) ||
-                    !IS_ALIGNED((unsigned long)data, 4))
-                        return -EIO;
-
-                while ((nbytes >= 4) &&  ((ret = ath10k_pci_diag_read_access(
-                                           ar, address, (u32 *)data)) == 0)) {
-                        nbytes -= sizeof(u32);
-                        address += sizeof(u32);
-                        data += sizeof(u32);
-                }
-                return ret;
-        }
-
         ce_diag = ar_pci->ce_diag;
 
         /*
@@ -549,7 +528,7 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,
                                                      address);
 
                 ret = ath10k_ce_send(ce_diag, NULL, (u32)address, nbytes, 0,
-                                 0);
+                                     0);
                 if (ret)
                         goto done;
 
@@ -569,7 +548,7 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,
                         goto done;
                 }
 
-                if (buf != (u32) address) {
+                if (buf != (u32)address) {
                         ret = -EIO;
                         goto done;
                 }
@@ -652,19 +631,7 @@ static int __ath10k_pci_diag_read_hi(struct ath10k *ar, void *dest,
 }
 
 #define ath10k_pci_diag_read_hi(ar, dest, src, len)             \
-        __ath10k_pci_diag_read_hi(ar, dest, HI_ITEM(src), len);
-
-/* Read 4-byte aligned data from Target memory or register */
-static int ath10k_pci_diag_read_access(struct ath10k *ar, u32 address,
-                                       u32 *data)
-{
-        /* Assume range doesn't cross this boundary */
-        if (address >= DRAM_BASE_ADDRESS)
-                return ath10k_pci_diag_read32(ar, address, data);
-
-        *data = ath10k_pci_read32(ar, address);
-        return 0;
-}
+        __ath10k_pci_diag_read_hi(ar, dest, HI_ITEM(src), len)
 
 static int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,
                                      const void *data, int nbytes)
@@ -729,7 +696,7 @@ static 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(ce_diag, NULL, (u32) ce_data,
+                ret = ath10k_ce_send(ce_diag, NULL, (u32)ce_data,
                                      nbytes, 0, 0);
                 if (ret != 0)
                         goto done;
@@ -803,18 +770,6 @@ static int ath10k_pci_diag_write32(struct ath10k *ar, u32 address, u32 value)
         return ath10k_pci_diag_write_mem(ar, address, &val, sizeof(val));
 }
 
-/* Write 4B data to Target memory or register */
-static int ath10k_pci_diag_write_access(struct ath10k *ar, u32 address,
-                                        u32 data)
-{
-        /* Assume range doesn't cross this boundary */
-        if (address >= DRAM_BASE_ADDRESS)
-                return ath10k_pci_diag_write32(ar, address, data);
-
-        ath10k_pci_write32(ar, address, data);
-        return 0;
-}
-
 static bool ath10k_pci_is_awake(struct ath10k *ar)
 {
         u32 val = ath10k_pci_reg_read32(ar, RTC_STATE_ADDRESS);
@@ -1152,7 +1107,7 @@ static int ath10k_pci_hif_map_service_to_pipe(struct ath10k *ar,
 }
 
 static void ath10k_pci_hif_get_default_pipe(struct ath10k *ar,
-                                                u8 *ul_pipe, u8 *dl_pipe)
+                                            u8 *ul_pipe, u8 *dl_pipe)
 {
         int ul_is_polled, dl_is_polled;
 
@@ -1172,16 +1127,8 @@ static void ath10k_pci_irq_disable(struct ath10k *ar)
         int i;
 
         ath10k_ce_disable_interrupts(ar);
-
-        /* Regardless how many interrupts were assigned for MSI the first one
-         * is always used for firmware indications (crashes). There's no way to
-         * mask the irq in the device so call disable_irq(). Legacy (shared)
-         * interrupts can be masked on the device though.
-         */
-        if (ar_pci->num_msi_intrs > 0)
-                disable_irq(ar_pci->pdev->irq);
-        else
-                ath10k_pci_disable_and_clear_legacy_irq(ar);
+        ath10k_pci_disable_and_clear_legacy_irq(ar);
+        /* FIXME: How to mask all MSI interrupts? */
 
         for (i = 0; i < max(1, ar_pci->num_msi_intrs); i++)
                 synchronize_irq(ar_pci->pdev->irq + i);
@@ -1189,15 +1136,9 @@ static void ath10k_pci_irq_disable(struct ath10k *ar)
 
 static void ath10k_pci_irq_enable(struct ath10k *ar)
 {
-        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
-
         ath10k_ce_enable_interrupts(ar);
-
-        /* See comment in ath10k_pci_irq_disable() */
-        if (ar_pci->num_msi_intrs > 0)
-                enable_irq(ar_pci->pdev->irq);
-        else
-                ath10k_pci_enable_legacy_irq(ar);
+        ath10k_pci_enable_legacy_irq(ar);
+        /* FIXME: How to unmask all MSI interrupts? */
 }
 
 static int ath10k_pci_hif_start(struct ath10k *ar)
@@ -1311,14 +1252,21 @@ static void ath10k_pci_hif_stop(struct ath10k *ar)
 {
         ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot hif stop\n");
 
-        ath10k_pci_irq_disable(ar);
-        ath10k_pci_flush(ar);
-
         /* Most likely the device has HTT Rx ring configured. The only way to
          * prevent the device from accessing (and possible corrupting) host
          * memory is to reset the chip now.
+         *
+         * There's also no known way of masking MSI interrupts on the device.
+         * For ranged MSI the CE-related interrupts can be masked. However
+         * regardless how many MSI interrupts are assigned the first one
+         * is always used for firmware indications (crashes) and cannot be
+         * masked. To prevent the device from asserting the interrupt reset it
+         * before proceeding with cleanup.
          */
         ath10k_pci_warm_reset(ar);
+
+        ath10k_pci_irq_disable(ar);
+        ath10k_pci_flush(ar);
 }
 
 static int ath10k_pci_hif_exchange_bmi_msg(struct ath10k *ar,
@@ -1472,28 +1420,12 @@ static int ath10k_pci_bmi_wait(struct ath10k_ce_pipe *tx_pipe,
  */
 static int ath10k_pci_wake_target_cpu(struct ath10k *ar)
 {
-        int ret;
-        u32 core_ctrl;
-
-        ret = ath10k_pci_diag_read_access(ar, SOC_CORE_BASE_ADDRESS |
-                                              CORE_CTRL_ADDRESS,
-                                          &core_ctrl);
-        if (ret) {
-                ath10k_warn(ar, "failed to read core_ctrl: %d\n", ret);
-                return ret;
-        }
-
-        /* A_INUM_FIRMWARE interrupt to Target CPU */
-        core_ctrl |= CORE_CTRL_CPU_INTR_MASK;
+        u32 addr, val;
 
-        ret = ath10k_pci_diag_write_access(ar, SOC_CORE_BASE_ADDRESS |
-                                               CORE_CTRL_ADDRESS,
-                                           core_ctrl);
-        if (ret) {
-                ath10k_warn(ar, "failed to set target CPU interrupt mask: %d\n",
-                            ret);
-                return ret;
-        }
+        addr = SOC_CORE_BASE_ADDRESS | CORE_CTRL_ADDRESS;
+        val = ath10k_pci_read32(ar, addr);
+        val |= CORE_CTRL_CPU_INTR_MASK;
+        ath10k_pci_write32(ar, addr, val);
 
         return 0;
 }
@@ -1516,8 +1448,8 @@ static int ath10k_pci_init_config(struct ath10k *ar)
                 host_interest_item_address(HI_ITEM(hi_interconnect_state));
 
         /* Supply Target-side CE configuration */
-        ret = ath10k_pci_diag_read_access(ar, interconnect_targ_addr,
-                                          &pcie_state_targ_addr);
+        ret = ath10k_pci_diag_read32(ar, interconnect_targ_addr,
+                                     &pcie_state_targ_addr);
         if (ret != 0) {
                 ath10k_err(ar, "Failed to get pcie state addr: %d\n", ret);
                 return ret;
@@ -1529,10 +1461,10 @@ static int ath10k_pci_init_config(struct ath10k *ar)
                 return ret;
         }
 
-        ret = ath10k_pci_diag_read_access(ar, pcie_state_targ_addr +
+        ret = ath10k_pci_diag_read32(ar, (pcie_state_targ_addr +
                                           offsetof(struct pcie_state,
-                                                   pipe_cfg_addr),
-                                          &pipe_cfg_targ_addr);
+                                                   pipe_cfg_addr)),
+                                     &pipe_cfg_targ_addr);
         if (ret != 0) {
                 ath10k_err(ar, "Failed to get pipe cfg addr: %d\n", ret);
                 return ret;
@@ -1545,18 +1477,18 @@ static int ath10k_pci_init_config(struct ath10k *ar)
         }
 
         ret = ath10k_pci_diag_write_mem(ar, pipe_cfg_targ_addr,
-                                 target_ce_config_wlan,
-                                 sizeof(target_ce_config_wlan));
+                                        target_ce_config_wlan,
+                                        sizeof(target_ce_config_wlan));
 
         if (ret != 0) {
                 ath10k_err(ar, "Failed to write pipe cfg: %d\n", ret);
                 return ret;
         }
 
-        ret = ath10k_pci_diag_read_access(ar, pcie_state_targ_addr +
+        ret = ath10k_pci_diag_read32(ar, (pcie_state_targ_addr +
                                           offsetof(struct pcie_state,
-                                                   svc_to_pipe_map),
-                                          &svc_to_pipe_map);
+                                                   svc_to_pipe_map)),
+                                     &svc_to_pipe_map);
         if (ret != 0) {
                 ath10k_err(ar, "Failed to get svc/pipe map: %d\n", ret);
                 return ret;
@@ -1569,17 +1501,17 @@ static int ath10k_pci_init_config(struct ath10k *ar)
         }
 
         ret = ath10k_pci_diag_write_mem(ar, svc_to_pipe_map,
-                                 target_service_to_ce_map_wlan,
-                                 sizeof(target_service_to_ce_map_wlan));
+                                        target_service_to_ce_map_wlan,
+                                        sizeof(target_service_to_ce_map_wlan));
         if (ret != 0) {
                 ath10k_err(ar, "Failed to write svc/pipe map: %d\n", ret);
                 return ret;
         }
 
-        ret = ath10k_pci_diag_read_access(ar, pcie_state_targ_addr +
+        ret = ath10k_pci_diag_read32(ar, (pcie_state_targ_addr +
                                           offsetof(struct pcie_state,
-                                                   config_flags),
-                                          &pcie_config_flags);
+                                                   config_flags)),
+                                     &pcie_config_flags);
         if (ret != 0) {
                 ath10k_err(ar, "Failed to get pcie config_flags: %d\n", ret);
                 return ret;
@@ -1587,9 +1519,10 @@ static int ath10k_pci_init_config(struct ath10k *ar)
 
         pcie_config_flags &= ~PCIE_CONFIG_FLAG_ENABLE_L1;
 
-        ret = ath10k_pci_diag_write_access(ar, pcie_state_targ_addr +
-                                 offsetof(struct pcie_state, config_flags),
-                                 pcie_config_flags);
+        ret = ath10k_pci_diag_write32(ar, (pcie_state_targ_addr +
+                                           offsetof(struct pcie_state,
+                                                    config_flags)),
+                                      pcie_config_flags);
         if (ret != 0) {
                 ath10k_err(ar, "Failed to write pcie config_flags: %d\n", ret);
                 return ret;
@@ -1598,7 +1531,7 @@ static int ath10k_pci_init_config(struct ath10k *ar)
         /* configure early allocation */
         ealloc_targ_addr = host_interest_item_address(HI_ITEM(hi_early_alloc));
 
-        ret = ath10k_pci_diag_read_access(ar, ealloc_targ_addr, &ealloc_value);
+        ret = ath10k_pci_diag_read32(ar, ealloc_targ_addr, &ealloc_value);
         if (ret != 0) {
                 ath10k_err(ar, "Faile to get early alloc val: %d\n", ret);
                 return ret;
@@ -1610,7 +1543,7 @@ static int ath10k_pci_init_config(struct ath10k *ar)
         ealloc_value |= ((1 << HI_EARLY_ALLOC_IRAM_BANKS_SHIFT) &
                          HI_EARLY_ALLOC_IRAM_BANKS_MASK);
 
-        ret = ath10k_pci_diag_write_access(ar, ealloc_targ_addr, ealloc_value);
+        ret = ath10k_pci_diag_write32(ar, ealloc_targ_addr, ealloc_value);
         if (ret != 0) {
                 ath10k_err(ar, "Failed to set early alloc val: %d\n", ret);
                 return ret;
@@ -1619,7 +1552,7 @@ static int ath10k_pci_init_config(struct ath10k *ar)
         /* Tell Target to proceed with initialization */
         flag2_targ_addr = host_interest_item_address(HI_ITEM(hi_option_flag2));
 
-        ret = ath10k_pci_diag_read_access(ar, flag2_targ_addr, &flag2_value);
+        ret = ath10k_pci_diag_read32(ar, flag2_targ_addr, &flag2_value);
         if (ret != 0) {
                 ath10k_err(ar, "Failed to get option val: %d\n", ret);
                 return ret;
@@ -1627,7 +1560,7 @@ static int ath10k_pci_init_config(struct ath10k *ar)
 
         flag2_value |= HI_OPTION_EARLY_CFG_DONE;
 
-        ret = ath10k_pci_diag_write_access(ar, flag2_targ_addr, flag2_value);
+        ret = ath10k_pci_diag_write32(ar, flag2_targ_addr, flag2_value);
         if (ret != 0) {
                 ath10k_err(ar, "Failed to set option val: %d\n", ret);
                 return ret;
@@ -1692,7 +1625,7 @@ static int ath10k_pci_ce_init(struct ath10k *ar)
                         continue;
                 }
 
-                pipe_info->buf_sz = (size_t) (attr->src_sz_max);
+                pipe_info->buf_sz = (size_t)(attr->src_sz_max);
         }
 
         return 0;
@@ -2228,7 +2161,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)
         if (ath10k_pci_irq_mode == ATH10K_PCI_IRQ_AUTO) {
                 ar_pci->num_msi_intrs = MSI_NUM_REQUEST;
                 ret = pci_enable_msi_range(ar_pci->pdev, ar_pci->num_msi_intrs,
-                                                         ar_pci->num_msi_intrs);
+                                           ar_pci->num_msi_intrs);
                 if (ret > 0)
                         return 0;
 
@@ -2554,6 +2487,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
 
 err_free_irq:
         ath10k_pci_free_irq(ar);
+        ath10k_pci_kill_tasklet(ar);
 
 err_deinit_irq:
         ath10k_pci_deinit_irq(ar);
@@ -2590,6 +2524,7 @@ static void ath10k_pci_remove(struct pci_dev *pdev)
 
         ath10k_core_unregister(ar);
         ath10k_pci_free_irq(ar);
+        ath10k_pci_kill_tasklet(ar);
         ath10k_pci_deinit_irq(ar);
         ath10k_pci_ce_deinit(ar);
         ath10k_pci_free_ce(ar);
diff --git a/drivers/net/wireless/ath/ath10k/rx_desc.h b/drivers/net/wireless/ath/ath10k/rx_desc.h
index 1c584c4b019c..e1ffdd57a18c 100644
--- a/drivers/net/wireless/ath/ath10k/rx_desc.h
+++ b/drivers/net/wireless/ath/ath10k/rx_desc.h
@@ -839,7 +839,6 @@ struct rx_ppdu_start {
  *              Reserved: HW should fill with 0, FW should ignore.
 */
 
-
 #define RX_PPDU_END_FLAGS_PHY_ERR             (1 << 0)
 #define RX_PPDU_END_FLAGS_RX_LOCATION         (1 << 1)
 #define RX_PPDU_END_FLAGS_TXBF_H_INFO         (1 << 2)
diff --git a/drivers/net/wireless/ath/ath10k/targaddrs.h b/drivers/net/wireless/ath/ath10k/targaddrs.h
index be7ba1e78afe..9d0ae30f9ff1 100644
--- a/drivers/net/wireless/ath/ath10k/targaddrs.h
+++ b/drivers/net/wireless/ath/ath10k/targaddrs.h
@@ -284,7 +284,6 @@ Fw Mode/SubMode Mask
 #define HI_OPTION_ALL_FW_SUBMODE_MASK  0xFF00
 #define HI_OPTION_ALL_FW_SUBMODE_SHIFT 0x8
 
-
 /* hi_option_flag2 options */
 #define HI_OPTION_OFFLOAD_AMSDU     0x01
 #define HI_OPTION_DFS_SUPPORT       0x02 /* Enable DFS support */
diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c
new file mode 100644
index 000000000000..483db9cb8c96
--- /dev/null
+++ b/drivers/net/wireless/ath/ath10k/testmode.c
@@ -0,0 +1,382 @@
+/*
+ * 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 "testmode.h"
+
+#include <net/netlink.h>
+#include <linux/firmware.h>
+
+#include "debug.h"
+#include "wmi.h"
+#include "hif.h"
+#include "hw.h"
+
+#include "testmode_i.h"
+
+static const struct nla_policy ath10k_tm_policy[ATH10K_TM_ATTR_MAX + 1] = {
+        [ATH10K_TM_ATTR_CMD]            = { .type = NLA_U32 },
+        [ATH10K_TM_ATTR_DATA]           = { .type = NLA_BINARY,
+                                            .len = ATH10K_TM_DATA_MAX_LEN },
+        [ATH10K_TM_ATTR_WMI_CMDID]      = { .type = NLA_U32 },
+        [ATH10K_TM_ATTR_VERSION_MAJOR]  = { .type = NLA_U32 },
+        [ATH10K_TM_ATTR_VERSION_MINOR]  = { .type = NLA_U32 },
+};
+
+/* Returns true if callee consumes the skb and the skb should be discarded.
+ * Returns false if skb is not used. Does not sleep.
+ */
+bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb)
+{
+        struct sk_buff *nl_skb;
+        bool consumed;
+        int ret;
+
+        ath10k_dbg(ar, ATH10K_DBG_TESTMODE,
+                   "testmode event wmi cmd_id %d skb %p skb->len %d\n",
+                   cmd_id, skb, skb->len);
+
+        ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", skb->data, skb->len);
+
+        spin_lock_bh(&ar->data_lock);
+
+        if (!ar->testmode.utf_monitor) {
+                consumed = false;
+                goto out;
+        }
+
+        /* Only testmode.c should be handling events from utf firmware,
+         * otherwise all sort of problems will arise as mac80211 operations
+         * are not initialised.
+         */
+        consumed = true;
+
+        nl_skb = cfg80211_testmode_alloc_event_skb(ar->hw->wiphy,
+                                                   2 * sizeof(u32) + skb->len,
+                                                   GFP_ATOMIC);
+        if (!nl_skb) {
+                ath10k_warn(ar,
+                            "failed to allocate skb for testmode wmi event\n");
+                goto out;
+        }
+
+        ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_CMD, ATH10K_TM_CMD_WMI);
+        if (ret) {
+                ath10k_warn(ar,
+                            "failed to to put testmode wmi event cmd attribute: %d\n",
+                            ret);
+                kfree_skb(nl_skb);
+                goto out;
+        }
+
+        ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_WMI_CMDID, cmd_id);
+        if (ret) {
+                ath10k_warn(ar,
+                            "failed to to put testmode wmi even cmd_id: %d\n",
+                            ret);
+                kfree_skb(nl_skb);
+                goto out;
+        }
+
+        ret = nla_put(nl_skb, ATH10K_TM_ATTR_DATA, skb->len, skb->data);
+        if (ret) {
+                ath10k_warn(ar,
+                            "failed to copy skb to testmode wmi event: %d\n",
+                            ret);
+                kfree_skb(nl_skb);
+                goto out;
+        }
+
+        cfg80211_testmode_event(nl_skb, GFP_ATOMIC);
+
+out:
+        spin_unlock_bh(&ar->data_lock);
+
+        return consumed;
+}
+
+static int ath10k_tm_cmd_get_version(struct ath10k *ar, struct nlattr *tb[])
+{
+        struct sk_buff *skb;
+        int ret;
+
+        ath10k_dbg(ar, ATH10K_DBG_TESTMODE,
+                   "testmode cmd get version_major %d version_minor %d\n",
+                   ATH10K_TESTMODE_VERSION_MAJOR,
+                   ATH10K_TESTMODE_VERSION_MINOR);
+
+        skb = cfg80211_testmode_alloc_reply_skb(ar->hw->wiphy,
+                                                nla_total_size(sizeof(u32)));
+        if (!skb)
+                return -ENOMEM;
+
+        ret = nla_put_u32(skb, ATH10K_TM_ATTR_VERSION_MAJOR,
+                          ATH10K_TESTMODE_VERSION_MAJOR);
+        if (ret) {
+                kfree_skb(skb);
+                return ret;
+        }
+
+        ret = nla_put_u32(skb, ATH10K_TM_ATTR_VERSION_MINOR,
+                          ATH10K_TESTMODE_VERSION_MINOR);
+        if (ret) {
+                kfree_skb(skb);
+                return ret;
+        }
+
+        return cfg80211_testmode_reply(skb);
+}
+
+static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])
+{
+        char filename[100];
+        int ret;
+
+        ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode cmd utf start\n");
+
+        mutex_lock(&ar->conf_mutex);
+
+        if (ar->state == ATH10K_STATE_UTF) {
+                ret = -EALREADY;
+                goto err;
+        }
+
+        /* start utf only when the driver is not in use  */
+        if (ar->state != ATH10K_STATE_OFF) {
+                ret = -EBUSY;
+                goto err;
+        }
+
+        if (WARN_ON(ar->testmode.utf != NULL)) {
+                /* utf image is already downloaded, it shouldn't be */
+                ret = -EEXIST;
+                goto err;
+        }
+
+        snprintf(filename, sizeof(filename), "%s/%s",
+                 ar->hw_params.fw.dir, ATH10K_FW_UTF_FILE);
+
+        /* load utf firmware image */
+        ret = request_firmware(&ar->testmode.utf, filename, ar->dev);
+        if (ret) {
+                ath10k_warn(ar, "failed to retrieve utf firmware '%s': %d\n",
+                            filename, ret);
+                goto err;
+        }
+
+        spin_lock_bh(&ar->data_lock);
+
+        ar->testmode.utf_monitor = true;
+
+        spin_unlock_bh(&ar->data_lock);
+
+        BUILD_BUG_ON(sizeof(ar->fw_features) !=
+                     sizeof(ar->testmode.orig_fw_features));
+
+        memcpy(ar->testmode.orig_fw_features, ar->fw_features,
+               sizeof(ar->fw_features));
+
+        /* utf.bin firmware image does not advertise firmware features. Do
+         * an ugly hack where we force the firmware features so that wmi.c
+         * will use the correct WMI interface.
+         */
+        memset(ar->fw_features, 0, sizeof(ar->fw_features));
+        __set_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features);
+
+        ret = ath10k_hif_power_up(ar);
+        if (ret) {
+                ath10k_err(ar, "failed to power up hif (testmode): %d\n", ret);
+                ar->state = ATH10K_STATE_OFF;
+                goto err_fw_features;
+        }
+
+        ret = ath10k_core_start(ar, ATH10K_FIRMWARE_MODE_UTF);
+        if (ret) {
+                ath10k_err(ar, "failed to start core (testmode): %d\n", ret);
+                ar->state = ATH10K_STATE_OFF;
+                goto err_power_down;
+        }
+
+        ar->state = ATH10K_STATE_UTF;
+
+        ath10k_info(ar, "UTF firmware started\n");
+
+        mutex_unlock(&ar->conf_mutex);
+
+        return 0;
+
+err_power_down:
+        ath10k_hif_power_down(ar);
+
+err_fw_features:
+        /* return the original firmware features */
+        memcpy(ar->fw_features, ar->testmode.orig_fw_features,
+               sizeof(ar->fw_features));
+
+        release_firmware(ar->testmode.utf);
+        ar->testmode.utf = NULL;
+
+err:
+        mutex_unlock(&ar->conf_mutex);
+
+        return ret;
+}
+
+static void __ath10k_tm_cmd_utf_stop(struct ath10k *ar)
+{
+        lockdep_assert_held(&ar->conf_mutex);
+
+        ath10k_core_stop(ar);
+        ath10k_hif_power_down(ar);
+
+        spin_lock_bh(&ar->data_lock);
+
+        ar->testmode.utf_monitor = false;
+
+        spin_unlock_bh(&ar->data_lock);
+
+        /* return the original firmware features */
+        memcpy(ar->fw_features, ar->testmode.orig_fw_features,
+               sizeof(ar->fw_features));
+
+        release_firmware(ar->testmode.utf);
+        ar->testmode.utf = NULL;
+
+        ar->state = ATH10K_STATE_OFF;
+}
+
+static int ath10k_tm_cmd_utf_stop(struct ath10k *ar, struct nlattr *tb[])
+{
+        int ret;
+
+        ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode cmd utf stop\n");
+
+        mutex_lock(&ar->conf_mutex);
+
+        if (ar->state != ATH10K_STATE_UTF) {
+                ret = -ENETDOWN;
+                goto out;
+        }
+
+        __ath10k_tm_cmd_utf_stop(ar);
+
+        ret = 0;
+
+        ath10k_info(ar, "UTF firmware stopped\n");
+
+out:
+        mutex_unlock(&ar->conf_mutex);
+        return ret;
+}
+
+static int ath10k_tm_cmd_wmi(struct ath10k *ar, struct nlattr *tb[])
+{
+        struct sk_buff *skb;
+        int ret, buf_len;
+        u32 cmd_id;
+        void *buf;
+
+        mutex_lock(&ar->conf_mutex);
+
+        if (ar->state != ATH10K_STATE_UTF) {
+                ret = -ENETDOWN;
+                goto out;
+        }
+
+        if (!tb[ATH10K_TM_ATTR_DATA]) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (!tb[ATH10K_TM_ATTR_WMI_CMDID]) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        buf = nla_data(tb[ATH10K_TM_ATTR_DATA]);
+        buf_len = nla_len(tb[ATH10K_TM_ATTR_DATA]);
+        cmd_id = nla_get_u32(tb[ATH10K_TM_ATTR_WMI_CMDID]);
+
+        ath10k_dbg(ar, ATH10K_DBG_TESTMODE,
+                   "testmode cmd wmi cmd_id %d buf %p buf_len %d\n",
+                   cmd_id, buf, buf_len);
+
+        ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", buf, buf_len);
+
+        skb = ath10k_wmi_alloc_skb(ar, buf_len);
+        if (!skb) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        memcpy(skb->data, buf, buf_len);
+
+        ret = ath10k_wmi_cmd_send(ar, skb, cmd_id);
+        if (ret) {
+                ath10k_warn(ar, "failed to transmit wmi command (testmode): %d\n",
+                            ret);
+                goto out;
+        }
+
+        ret = 0;
+
+out:
+        mutex_unlock(&ar->conf_mutex);
+        return ret;
+}
+
+int ath10k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                  void *data, int len)
+{
+        struct ath10k *ar = hw->priv;
+        struct nlattr *tb[ATH10K_TM_ATTR_MAX + 1];
+        int ret;
+
+        ret = nla_parse(tb, ATH10K_TM_ATTR_MAX, data, len,
+                        ath10k_tm_policy);
+        if (ret)
+                return ret;
+
+        if (!tb[ATH10K_TM_ATTR_CMD])
+                return -EINVAL;
+
+        switch (nla_get_u32(tb[ATH10K_TM_ATTR_CMD])) {
+        case ATH10K_TM_CMD_GET_VERSION:
+                return ath10k_tm_cmd_get_version(ar, tb);
+        case ATH10K_TM_CMD_UTF_START:
+                return ath10k_tm_cmd_utf_start(ar, tb);
+        case ATH10K_TM_CMD_UTF_STOP:
+                return ath10k_tm_cmd_utf_stop(ar, tb);
+        case ATH10K_TM_CMD_WMI:
+                return ath10k_tm_cmd_wmi(ar, tb);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+void ath10k_testmode_destroy(struct ath10k *ar)
+{
+        mutex_lock(&ar->conf_mutex);
+
+        if (ar->state != ATH10K_STATE_UTF) {
+                /* utf firmware is not running, nothing to do */
+                goto out;
+        }
+
+        __ath10k_tm_cmd_utf_stop(ar);
+
+out:
+        mutex_unlock(&ar->conf_mutex);
+}
diff --git a/drivers/net/wireless/ath/ath10k/testmode.h b/drivers/net/wireless/ath/ath10k/testmode.h
new file mode 100644
index 000000000000..9cdd150815db
--- /dev/null
+++ b/drivers/net/wireless/ath/ath10k/testmode.h
@@ -0,0 +1,46 @@
+/*
+ * 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"
+
+#ifdef CONFIG_NL80211_TESTMODE
+
+void ath10k_testmode_destroy(struct ath10k *ar);
+
+bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb);
+int ath10k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                  void *data, int len);
+
+#else
+
+static inline void ath10k_testmode_destroy(struct ath10k *ar)
+{
+}
+
+static inline bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id,
+                                       struct sk_buff *skb)
+{
+        return false;
+}
+
+static inline int ath10k_tm_cmd(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                void *data, int len)
+{
+        return 0;
+}
+
+#endif
diff --git a/drivers/net/wireless/ath/ath10k/testmode_i.h b/drivers/net/wireless/ath/ath10k/testmode_i.h
new file mode 100644
index 000000000000..ba81bf66ce85
--- /dev/null
+++ b/drivers/net/wireless/ath/ath10k/testmode_i.h
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+/* "API" level of the ath10k testmode interface. Bump it after every
+ * incompatible interface change.
+ */
+#define ATH10K_TESTMODE_VERSION_MAJOR 1
+
+/* Bump this after every _compatible_ interface change, for example
+ * addition of a new command or an attribute.
+ */
+#define ATH10K_TESTMODE_VERSION_MINOR 0
+
+#define ATH10K_TM_DATA_MAX_LEN          5000
+
+enum ath10k_tm_attr {
+        __ATH10K_TM_ATTR_INVALID        = 0,
+        ATH10K_TM_ATTR_CMD              = 1,
+        ATH10K_TM_ATTR_DATA             = 2,
+        ATH10K_TM_ATTR_WMI_CMDID        = 3,
+        ATH10K_TM_ATTR_VERSION_MAJOR    = 4,
+        ATH10K_TM_ATTR_VERSION_MINOR    = 5,
+
+        /* keep last */
+        __ATH10K_TM_ATTR_AFTER_LAST,
+        ATH10K_TM_ATTR_MAX              = __ATH10K_TM_ATTR_AFTER_LAST - 1,
+};
+
+/* All ath10k testmode interface commands specified in
+ * ATH10K_TM_ATTR_CMD
+ */
+enum ath10k_tm_cmd {
+        /* Returns the supported ath10k testmode interface version in
+         * ATH10K_TM_ATTR_VERSION. Always guaranteed to work. User space
+         * uses this to verify it's using the correct version of the
+         * testmode interface
+         */
+        ATH10K_TM_CMD_GET_VERSION = 0,
+
+        /* Boots the UTF firmware, the netdev interface must be down at the
+         * time.
+         */
+        ATH10K_TM_CMD_UTF_START = 1,
+
+        /* Shuts down the UTF firmware and puts the driver back into OFF
+         * state.
+         */
+        ATH10K_TM_CMD_UTF_STOP = 2,
+
+        /* The command used to transmit a WMI command to the firmware and
+         * the event to receive WMI events from the firmware. Without
+         * struct wmi_cmd_hdr header, only the WMI payload. Command id is
+         * provided with ATH10K_TM_ATTR_WMI_CMDID and payload in
+         * ATH10K_TM_ATTR_DATA.
+         */
+        ATH10K_TM_CMD_WMI = 3,
+};
diff --git a/drivers/net/wireless/ath/ath10k/trace.h b/drivers/net/wireless/ath/ath10k/trace.h
index 4eb2ecbc06ef..574b75ab2609 100644
--- a/drivers/net/wireless/ath/ath10k/trace.h
+++ b/drivers/net/wireless/ath/ath10k/trace.h
@@ -18,6 +18,7 @@
 #if !defined(_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
 
 #include <linux/tracepoint.h>
+#include "core.h"
 
 #define _TRACE_H_
 
@@ -39,59 +40,79 @@ static inline void trace_ ## name(proto) {}
 #define ATH10K_MSG_MAX 200
 
 DECLARE_EVENT_CLASS(ath10k_log_event,
-        TP_PROTO(struct va_format *vaf),
-        TP_ARGS(vaf),
+        TP_PROTO(struct ath10k *ar, struct va_format *vaf),
+        TP_ARGS(ar, vaf),
         TP_STRUCT__entry(
+                __string(device, dev_name(ar->dev))
+                __string(driver, dev_driver_string(ar->dev))
                 __dynamic_array(char, msg, ATH10K_MSG_MAX)
         ),
         TP_fast_assign(
+                __assign_str(device, dev_name(ar->dev));
+                __assign_str(driver, dev_driver_string(ar->dev));
                 WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
                                        ATH10K_MSG_MAX,
                                        vaf->fmt,
                                        *vaf->va) >= ATH10K_MSG_MAX);
         ),
-        TP_printk("%s", __get_str(msg))
+        TP_printk(
+                "%s %s %s",
+                __get_str(driver),
+                __get_str(device),
+                __get_str(msg)
+        )
 );
 
 DEFINE_EVENT(ath10k_log_event, ath10k_log_err,
-             TP_PROTO(struct va_format *vaf),
-             TP_ARGS(vaf)
+             TP_PROTO(struct ath10k *ar, struct va_format *vaf),
+             TP_ARGS(ar, vaf)
 );
 
 DEFINE_EVENT(ath10k_log_event, ath10k_log_warn,
-             TP_PROTO(struct va_format *vaf),
-             TP_ARGS(vaf)
+             TP_PROTO(struct ath10k *ar, struct va_format *vaf),
+             TP_ARGS(ar, vaf)
 );
 
 DEFINE_EVENT(ath10k_log_event, ath10k_log_info,
-             TP_PROTO(struct va_format *vaf),
-             TP_ARGS(vaf)
+             TP_PROTO(struct ath10k *ar, struct va_format *vaf),
+             TP_ARGS(ar, vaf)
 );
 
 TRACE_EVENT(ath10k_log_dbg,
-        TP_PROTO(unsigned int level, struct va_format *vaf),
-        TP_ARGS(level, vaf),
+        TP_PROTO(struct ath10k *ar, unsigned int level, struct va_format *vaf),
+        TP_ARGS(ar, level, vaf),
         TP_STRUCT__entry(
+                __string(device, dev_name(ar->dev))
+                __string(driver, dev_driver_string(ar->dev))
                 __field(unsigned int, level)
                 __dynamic_array(char, msg, ATH10K_MSG_MAX)
         ),
         TP_fast_assign(
+                __assign_str(device, dev_name(ar->dev));
+                __assign_str(driver, dev_driver_string(ar->dev));
                 __entry->level = level;
                 WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
                                        ATH10K_MSG_MAX,
                                        vaf->fmt,
                                        *vaf->va) >= ATH10K_MSG_MAX);
         ),
-        TP_printk("%s", __get_str(msg))
+        TP_printk(
+                "%s %s %s",
+                __get_str(driver),
+                __get_str(device),
+                __get_str(msg)
+        )
 );
 
 TRACE_EVENT(ath10k_log_dbg_dump,
-        TP_PROTO(const char *msg, const char *prefix,
+        TP_PROTO(struct ath10k *ar, const char *msg, const char *prefix,
                  const void *buf, size_t buf_len),
 
-        TP_ARGS(msg, prefix, buf, buf_len),
+        TP_ARGS(ar, msg, prefix, buf, buf_len),
 
         TP_STRUCT__entry(
+                __string(device, dev_name(ar->dev))
+                __string(driver, dev_driver_string(ar->dev))
                 __string(msg, msg)
                 __string(prefix, prefix)
                 __field(size_t, buf_len)
@@ -99,6 +120,8 @@ TRACE_EVENT(ath10k_log_dbg_dump,
         ),
 
         TP_fast_assign(
+                __assign_str(device, dev_name(ar->dev));
+                __assign_str(driver, dev_driver_string(ar->dev));
                 __assign_str(msg, msg);
                 __assign_str(prefix, prefix);
                 __entry->buf_len = buf_len;
@@ -106,16 +129,22 @@ TRACE_EVENT(ath10k_log_dbg_dump,
         ),
 
         TP_printk(
-                "%s/%s\n", __get_str(prefix), __get_str(msg)
+                "%s %s %s/%s\n",
+                __get_str(driver),
+                __get_str(device),
+                __get_str(prefix),
+                __get_str(msg)
         )
 );
 
 TRACE_EVENT(ath10k_wmi_cmd,
-        TP_PROTO(int id, void *buf, size_t buf_len, int ret),
+        TP_PROTO(struct ath10k *ar, int id, void *buf, size_t buf_len, int ret),
 
-        TP_ARGS(id, buf, buf_len, ret),
+        TP_ARGS(ar, id, buf, buf_len, ret),
 
         TP_STRUCT__entry(
+                __string(device, dev_name(ar->dev))
+                __string(driver, dev_driver_string(ar->dev))
                 __field(unsigned int, id)
                 __field(size_t, buf_len)
                 __dynamic_array(u8, buf, buf_len)
@@ -123,6 +152,8 @@ TRACE_EVENT(ath10k_wmi_cmd,
         ),
 
         TP_fast_assign(
+                __assign_str(device, dev_name(ar->dev));
+                __assign_str(driver, dev_driver_string(ar->dev));
                 __entry->id = id;
                 __entry->buf_len = buf_len;
                 __entry->ret = ret;
@@ -130,7 +161,9 @@ TRACE_EVENT(ath10k_wmi_cmd,
         ),
 
         TP_printk(
-                "id %d len %zu ret %d",
+                "%s %s id %d len %zu ret %d",
+                __get_str(driver),
+                __get_str(device),
                 __entry->id,
                 __entry->buf_len,
                 __entry->ret
@@ -138,67 +171,85 @@ TRACE_EVENT(ath10k_wmi_cmd,
 );
 
 TRACE_EVENT(ath10k_wmi_event,
-        TP_PROTO(int id, void *buf, size_t buf_len),
+        TP_PROTO(struct ath10k *ar, int id, void *buf, size_t buf_len),
 
-        TP_ARGS(id, buf, buf_len),
+        TP_ARGS(ar, id, buf, buf_len),
 
         TP_STRUCT__entry(
+                __string(device, dev_name(ar->dev))
+                __string(driver, dev_driver_string(ar->dev))
                 __field(unsigned int, id)
                 __field(size_t, buf_len)
                 __dynamic_array(u8, buf, buf_len)
         ),
 
         TP_fast_assign(
+                __assign_str(device, dev_name(ar->dev));
+                __assign_str(driver, dev_driver_string(ar->dev));
                 __entry->id = id;
                 __entry->buf_len = buf_len;
                 memcpy(__get_dynamic_array(buf), buf, buf_len);
         ),
 
         TP_printk(
-                "id %d len %zu",
+                "%s %s id %d len %zu",
+                __get_str(driver),
+                __get_str(device),
                 __entry->id,
                 __entry->buf_len
         )
 );
 
 TRACE_EVENT(ath10k_htt_stats,
-        TP_PROTO(void *buf, size_t buf_len),
+        TP_PROTO(struct ath10k *ar, void *buf, size_t buf_len),
 
-        TP_ARGS(buf, buf_len),
+        TP_ARGS(ar, buf, buf_len),
 
         TP_STRUCT__entry(
+                __string(device, dev_name(ar->dev))
+                __string(driver, dev_driver_string(ar->dev))
                 __field(size_t, buf_len)
                 __dynamic_array(u8, buf, buf_len)
         ),
 
         TP_fast_assign(
+                __assign_str(device, dev_name(ar->dev));
+                __assign_str(driver, dev_driver_string(ar->dev));
                 __entry->buf_len = buf_len;
                 memcpy(__get_dynamic_array(buf), buf, buf_len);
         ),
 
         TP_printk(
-                "len %zu",
+                "%s %s len %zu",
+                __get_str(driver),
+                __get_str(device),
                 __entry->buf_len
         )
 );
 
 TRACE_EVENT(ath10k_wmi_dbglog,
-        TP_PROTO(void *buf, size_t buf_len),
+        TP_PROTO(struct ath10k *ar, void *buf, size_t buf_len),
 
-        TP_ARGS(buf, buf_len),
+        TP_ARGS(ar, buf, buf_len),
 
         TP_STRUCT__entry(
+                __string(device, dev_name(ar->dev))
+                __string(driver, dev_driver_string(ar->dev))
                 __field(size_t, buf_len)
                 __dynamic_array(u8, buf, buf_len)
         ),
 
         TP_fast_assign(
+                __assign_str(device, dev_name(ar->dev));
+                __assign_str(driver, dev_driver_string(ar->dev));
                 __entry->buf_len = buf_len;
                 memcpy(__get_dynamic_array(buf), buf, buf_len);
         ),
 
         TP_printk(
-                "len %zu",
+                "%s %s len %zu",
+                __get_str(driver),
+                __get_str(device),
                 __entry->buf_len
         )
 );
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
index 2eeec8a63d5c..a0cbc21d0d4b 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -178,7 +178,7 @@ void ath10k_peer_map_event(struct ath10k_htt *htt,
                         goto exit;
 
                 peer->vdev_id = ev->vdev_id;
-                memcpy(peer->addr, ev->addr, ETH_ALEN);
+                ether_addr_copy(peer->addr, ev->addr);
                 list_add(&peer->list, &ar->peers);
                 wake_up(&ar->peer_mapping_wq);
         }
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index e500a3cc905e..2c42bd504b79 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -23,6 +23,7 @@
 #include "debug.h"
 #include "wmi.h"
 #include "mac.h"
+#include "testmode.h"
 
 /* MAIN WMI cmd track */
 static struct wmi_cmd_map wmi_cmd_map = {
@@ -611,6 +612,7 @@ static struct wmi_cmd_map wmi_10_2_cmd_map = {
 int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)
 {
         int ret;
+
         ret = wait_for_completion_timeout(&ar->wmi.service_ready,
                                           WMI_SERVICE_READY_TIMEOUT_HZ);
         return ret;
@@ -619,12 +621,13 @@ int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)
 int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar)
 {
         int ret;
+
         ret = wait_for_completion_timeout(&ar->wmi.unified_ready,
                                           WMI_UNIFIED_READY_TIMEOUT_HZ);
         return ret;
 }
 
-static struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len)
+struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len)
 {
         struct sk_buff *skb;
         u32 round_len = roundup(len, 4);
@@ -666,7 +669,7 @@ static int ath10k_wmi_cmd_send_nowait(struct ath10k *ar, struct sk_buff *skb,
 
         memset(skb_cb, 0, sizeof(*skb_cb));
         ret = ath10k_htc_send(&ar->htc, ar->wmi.eid, skb);
-        trace_ath10k_wmi_cmd(cmd_id, skb->data, skb->len, ret);
+        trace_ath10k_wmi_cmd(ar, cmd_id, skb->data, skb->len, ret);
 
         if (ret)
                 goto err_pull;
@@ -725,8 +728,7 @@ static void ath10k_wmi_op_ep_tx_credits(struct ath10k *ar)
         wake_up(&ar->wmi.tx_credits_wq);
 }
 
-static int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb,
-                               u32 cmd_id)
+int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id)
 {
         int ret = -EOPNOTSUPP;
 
@@ -792,7 +794,7 @@ int ath10k_wmi_mgmt_tx(struct ath10k *ar, struct sk_buff *skb)
         cmd->hdr.tx_power = 0;
         cmd->hdr.buf_len = __cpu_to_le32(buf_len);
 
-        memcpy(cmd->hdr.peer_macaddr.addr, ieee80211_get_DA(hdr), ETH_ALEN);
+        ether_addr_copy(cmd->hdr.peer_macaddr.addr, ieee80211_get_DA(hdr));
         memcpy(cmd->buf, skb->data, skb->len);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi mgmt tx skb %p len %d ftype %02x stype %02x\n",
@@ -1288,7 +1290,7 @@ static int ath10k_wmi_event_debug_mesg(struct ath10k *ar, struct sk_buff *skb)
         ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi event debug mesg len %d\n",
                    skb->len);
 
-        trace_ath10k_wmi_dbglog(skb->data, skb->len);
+        trace_ath10k_wmi_dbglog(ar, skb->data, skb->len);
 
         return 0;
 }
@@ -1384,6 +1386,8 @@ static void ath10k_wmi_update_tim(struct ath10k *ar,
         struct ieee80211_tim_ie *tim;
         u8 *ies, *ie;
         u8 ie_len, pvm_len;
+        __le32 t;
+        u32 v;
 
         /* if next SWBA has no tim_changed the tim_bitmap is garbage.
          * we must copy the bitmap upon change and reuse it later */
@@ -1394,8 +1398,8 @@ static void ath10k_wmi_update_tim(struct ath10k *ar,
                              sizeof(bcn_info->tim_info.tim_bitmap));
 
                 for (i = 0; i < sizeof(arvif->u.ap.tim_bitmap); i++) {
-                        __le32 t = bcn_info->tim_info.tim_bitmap[i / 4];
-                        u32 v = __le32_to_cpu(t);
+                        t = bcn_info->tim_info.tim_bitmap[i / 4];
+                        v = __le32_to_cpu(t);
                         arvif->u.ap.tim_bitmap[i] = (v >> ((i % 4) * 8)) & 0xFF;
                 }
 
@@ -1511,7 +1515,6 @@ static u32 ath10k_p2p_calc_noa_ie_len(struct wmi_p2p_noa_info *noa)
         u8 opp_ps_info = noa->ctwindow_oppps;
         bool opps_enabled = !!(opp_ps_info & WMI_P2P_OPPPS_ENABLE_BIT);
 
-
         if (!noa_descriptors && !opps_enabled)
                 return len;
 
@@ -1568,7 +1571,6 @@ cleanup:
         kfree(old_data);
 }
 
-
 static void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)
 {
         struct wmi_host_swba_event *ev;
@@ -1859,9 +1861,10 @@ static void ath10k_wmi_event_dfs(struct ath10k *ar,
         }
 }
 
-static void ath10k_wmi_event_spectral_scan(struct ath10k *ar,
-                                struct wmi_single_phyerr_rx_event *event,
-                                u64 tsf)
+static void
+ath10k_wmi_event_spectral_scan(struct ath10k *ar,
+                               struct wmi_single_phyerr_rx_event *event,
+                               u64 tsf)
 {
         int buf_len, tlv_len, res, i = 0;
         struct phyerr_tlv *tlv;
@@ -1989,7 +1992,7 @@ static void ath10k_wmi_event_roam(struct ath10k *ar, struct sk_buff *skb)
 }
 
 static void ath10k_wmi_event_profile_match(struct ath10k *ar,
-                                    struct sk_buff *skb)
+                                           struct sk_buff *skb)
 {
         ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_PROFILE_MATCH\n");
 }
@@ -2040,13 +2043,13 @@ static void ath10k_wmi_event_wlan_profile_data(struct ath10k *ar,
 }
 
 static void ath10k_wmi_event_rtt_measurement_report(struct ath10k *ar,
-                                             struct sk_buff *skb)
+                                                    struct sk_buff *skb)
 {
         ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_RTT_MEASUREMENT_REPORT_EVENTID\n");
 }
 
 static void ath10k_wmi_event_tsf_measurement_report(struct ath10k *ar,
-                                             struct sk_buff *skb)
+                                                    struct sk_buff *skb)
 {
         ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_TSF_MEASUREMENT_REPORT_EVENTID\n");
 }
@@ -2082,7 +2085,7 @@ static void ath10k_wmi_event_pdev_ftm_intg(struct ath10k *ar,
 }
 
 static void ath10k_wmi_event_gtk_offload_status(struct ath10k *ar,
-                                         struct sk_buff *skb)
+                                                struct sk_buff *skb)
 {
         ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_GTK_OFFLOAD_STATUS_EVENTID\n");
 }
@@ -2106,7 +2109,7 @@ static void ath10k_wmi_event_addba_complete(struct ath10k *ar,
 }
 
 static void ath10k_wmi_event_vdev_install_key_complete(struct ath10k *ar,
-                                                struct sk_buff *skb)
+                                                       struct sk_buff *skb)
 {
         ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID\n");
 }
@@ -2130,7 +2133,7 @@ static void ath10k_wmi_event_vdev_resume_req(struct ath10k *ar,
 }
 
 static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id,
-                                      u32 num_units, u32 unit_len)
+                                     u32 num_units, u32 unit_len)
 {
         dma_addr_t paddr;
         u32 pool_size;
@@ -2164,7 +2167,7 @@ static void ath10k_wmi_service_ready_event_rx(struct ath10k *ar,
                                               struct sk_buff *skb)
 {
         struct wmi_service_ready_event *ev = (void *)skb->data;
-        DECLARE_BITMAP(svc_bmap, WMI_SERVICE_BM_SIZE) = {};
+        DECLARE_BITMAP(svc_bmap, WMI_SERVICE_MAX) = {};
 
         if (skb->len < sizeof(*ev)) {
                 ath10k_warn(ar, "Service ready event was %d B but expected %zu B. Wrong firmware version?\n",
@@ -2241,7 +2244,7 @@ static void ath10k_wmi_10x_service_ready_event_rx(struct ath10k *ar,
         u32 num_units, req_id, unit_size, num_mem_reqs, num_unit_info, i;
         int ret;
         struct wmi_service_ready_event_10x *ev = (void *)skb->data;
-        DECLARE_BITMAP(svc_bmap, WMI_SERVICE_BM_SIZE) = {};
+        DECLARE_BITMAP(svc_bmap, WMI_SERVICE_MAX) = {};
 
         if (skb->len < sizeof(*ev)) {
                 ath10k_warn(ar, "Service ready event was %d B but expected %zu B. Wrong firmware version?\n",
@@ -2347,7 +2350,7 @@ static int ath10k_wmi_ready_event_rx(struct ath10k *ar, struct sk_buff *skb)
         if (WARN_ON(skb->len < sizeof(*ev)))
                 return -EINVAL;
 
-        memcpy(ar->mac_addr, ev->mac_addr.addr, ETH_ALEN);
+        ether_addr_copy(ar->mac_addr, ev->mac_addr.addr);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
                    "wmi event ready sw_version %u abi_version %u mac_addr %pM status %d skb->len %i ev-sz %zu\n",
@@ -2371,7 +2374,7 @@ static void ath10k_wmi_main_process_rx(struct ath10k *ar, struct sk_buff *skb)
         if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)
                 return;
 
-        trace_ath10k_wmi_event(id, skb->data, skb->len);
+        trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
 
         switch (id) {
         case WMI_MGMT_RX_EVENTID:
@@ -2480,6 +2483,7 @@ static void ath10k_wmi_10x_process_rx(struct ath10k *ar, struct sk_buff *skb)
 {
         struct wmi_cmd_hdr *cmd_hdr;
         enum wmi_10x_event_id id;
+        bool consumed;
 
         cmd_hdr = (struct wmi_cmd_hdr *)skb->data;
         id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID);
@@ -2487,7 +2491,19 @@ static void ath10k_wmi_10x_process_rx(struct ath10k *ar, struct sk_buff *skb)
         if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)
                 return;
 
-        trace_ath10k_wmi_event(id, skb->data, skb->len);
+        trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
+
+        consumed = ath10k_tm_event_wmi(ar, id, skb);
+
+        /* Ready event must be handled normally also in UTF mode so that we
+         * know the UTF firmware has booted, others we are just bypass WMI
+         * events to testmode.
+         */
+        if (consumed && id != WMI_10X_READY_EVENTID) {
+                ath10k_dbg(ar, ATH10K_DBG_WMI,
+                           "wmi testmode consumed 0x%x\n", id);
+                goto out;
+        }
 
         switch (id) {
         case WMI_10X_MGMT_RX_EVENTID:
@@ -2575,11 +2591,15 @@ static void ath10k_wmi_10x_process_rx(struct ath10k *ar, struct sk_buff *skb)
         case WMI_10X_READY_EVENTID:
                 ath10k_wmi_ready_event_rx(ar, skb);
                 break;
+        case WMI_10X_PDEV_UTF_EVENTID:
+                /* ignore utf events */
+                break;
         default:
                 ath10k_warn(ar, "Unknown eventid: %d\n", id);
                 break;
         }
 
+out:
         dev_kfree_skb(skb);
 }
 
@@ -2594,7 +2614,7 @@ static void ath10k_wmi_10_2_process_rx(struct ath10k *ar, struct sk_buff *skb)
         if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)
                 return;
 
-        trace_ath10k_wmi_event(id, skb->data, skb->len);
+        trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
 
         switch (id) {
         case WMI_10_2_MGMT_RX_EVENTID:
@@ -3476,7 +3496,7 @@ int ath10k_wmi_vdev_create(struct ath10k *ar, u32 vdev_id,
         cmd->vdev_id      = __cpu_to_le32(vdev_id);
         cmd->vdev_type    = __cpu_to_le32(type);
         cmd->vdev_subtype = __cpu_to_le32(subtype);
-        memcpy(cmd->vdev_macaddr.addr, macaddr, ETH_ALEN);
+        ether_addr_copy(cmd->vdev_macaddr.addr, macaddr);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
                    "WMI vdev create: id %d type %d subtype %d macaddr %pM\n",
@@ -3503,9 +3523,10 @@ int ath10k_wmi_vdev_delete(struct ath10k *ar, u32 vdev_id)
         return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_delete_cmdid);
 }
 
-static int ath10k_wmi_vdev_start_restart(struct ath10k *ar,
-                                const struct wmi_vdev_start_request_arg *arg,
-                                u32 cmd_id)
+static int
+ath10k_wmi_vdev_start_restart(struct ath10k *ar,
+                              const struct wmi_vdev_start_request_arg *arg,
+                              u32 cmd_id)
 {
         struct wmi_vdev_start_request_cmd *cmd;
         struct sk_buff *skb;
@@ -3569,8 +3590,8 @@ static int ath10k_wmi_vdev_start_restart(struct ath10k *ar,
         cmd->chan.antenna_max = arg->channel.max_antenna_gain;
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
-                   "wmi vdev %s id 0x%x flags: 0x%0X, freq %d, mode %d, "
-                   "ch_flags: 0x%0X, max_power: %d\n", cmdname, arg->vdev_id,
+                   "wmi vdev %s id 0x%x flags: 0x%0X, freq %d, mode %d, ch_flags: 0x%0X, max_power: %d\n",
+                   cmdname, arg->vdev_id,
                    flags, arg->channel.freq, arg->channel.mode,
                    cmd->chan.flags, arg->channel.max_power);
 
@@ -3586,7 +3607,7 @@ int ath10k_wmi_vdev_start(struct ath10k *ar,
 }
 
 int ath10k_wmi_vdev_restart(struct ath10k *ar,
-                     const struct wmi_vdev_start_request_arg *arg)
+                            const struct wmi_vdev_start_request_arg *arg)
 {
         u32 cmd_id = ar->wmi.cmd->vdev_restart_request_cmdid;
 
@@ -3622,7 +3643,7 @@ int ath10k_wmi_vdev_up(struct ath10k *ar, u32 vdev_id, u32 aid, const u8 *bssid)
         cmd = (struct wmi_vdev_up_cmd *)skb->data;
         cmd->vdev_id       = __cpu_to_le32(vdev_id);
         cmd->vdev_assoc_id = __cpu_to_le32(aid);
-        memcpy(&cmd->vdev_bssid.addr, bssid, ETH_ALEN);
+        ether_addr_copy(cmd->vdev_bssid.addr, bssid);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
                    "wmi mgmt vdev up id 0x%x assoc id %d bssid %pM\n",
@@ -3703,7 +3724,7 @@ int ath10k_wmi_vdev_install_key(struct ath10k *ar,
         cmd->key_rxmic_len = __cpu_to_le32(arg->key_rxmic_len);
 
         if (arg->macaddr)
-                memcpy(cmd->peer_macaddr.addr, arg->macaddr, ETH_ALEN);
+                ether_addr_copy(cmd->peer_macaddr.addr, arg->macaddr);
         if (arg->key_data)
                 memcpy(cmd->key_data, arg->key_data, arg->key_len);
 
@@ -3782,7 +3803,7 @@ int ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id,
 
         cmd = (struct wmi_peer_create_cmd *)skb->data;
         cmd->vdev_id = __cpu_to_le32(vdev_id);
-        memcpy(cmd->peer_macaddr.addr, peer_addr, ETH_ALEN);
+        ether_addr_copy(cmd->peer_macaddr.addr, peer_addr);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
                    "wmi peer create vdev_id %d peer_addr %pM\n",
@@ -3802,7 +3823,7 @@ int ath10k_wmi_peer_delete(struct ath10k *ar, u32 vdev_id,
 
         cmd = (struct wmi_peer_delete_cmd *)skb->data;
         cmd->vdev_id = __cpu_to_le32(vdev_id);
-        memcpy(cmd->peer_macaddr.addr, peer_addr, ETH_ALEN);
+        ether_addr_copy(cmd->peer_macaddr.addr, peer_addr);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
                    "wmi peer delete vdev_id %d peer_addr %pM\n",
@@ -3823,7 +3844,7 @@ int ath10k_wmi_peer_flush(struct ath10k *ar, u32 vdev_id,
         cmd = (struct wmi_peer_flush_tids_cmd *)skb->data;
         cmd->vdev_id         = __cpu_to_le32(vdev_id);
         cmd->peer_tid_bitmap = __cpu_to_le32(tid_bitmap);
-        memcpy(cmd->peer_macaddr.addr, peer_addr, ETH_ALEN);
+        ether_addr_copy(cmd->peer_macaddr.addr, peer_addr);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
                    "wmi peer flush vdev_id %d peer_addr %pM tids %08x\n",
@@ -3846,7 +3867,7 @@ int ath10k_wmi_peer_set_param(struct ath10k *ar, u32 vdev_id,
         cmd->vdev_id     = __cpu_to_le32(vdev_id);
         cmd->param_id    = __cpu_to_le32(param_id);
         cmd->param_value = __cpu_to_le32(param_value);
-        memcpy(&cmd->peer_macaddr.addr, peer_addr, ETH_ALEN);
+        ether_addr_copy(cmd->peer_macaddr.addr, peer_addr);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
                    "wmi vdev %d peer 0x%pM set param %d value %d\n",
@@ -3917,7 +3938,7 @@ int ath10k_wmi_set_ap_ps_param(struct ath10k *ar, u32 vdev_id, const u8 *mac,
         cmd->vdev_id = __cpu_to_le32(vdev_id);
         cmd->param_id = __cpu_to_le32(param_id);
         cmd->param_value = __cpu_to_le32(value);
-        memcpy(&cmd->peer_macaddr, mac, ETH_ALEN);
+        ether_addr_copy(cmd->peer_macaddr.addr, mac);
 
         ath10k_dbg(ar, ATH10K_DBG_WMI,
                    "wmi ap ps param vdev_id 0x%X param %d value %d mac_addr %pM\n",
@@ -4001,7 +4022,7 @@ ath10k_wmi_peer_assoc_fill(struct ath10k *ar, void *buf,
         cmd->peer_vht_caps      = __cpu_to_le32(arg->peer_vht_caps);
         cmd->peer_phymode       = __cpu_to_le32(arg->peer_phymode);
 
-        memcpy(cmd->peer_macaddr.addr, arg->addr, ETH_ALEN);
+        ether_addr_copy(cmd->peer_macaddr.addr, arg->addr);
 
         cmd->peer_legacy_rates.num_rates =
                 __cpu_to_le32(arg->peer_legacy_rates.num_rates);
@@ -4155,7 +4176,7 @@ static void ath10k_wmi_pdev_set_wmm_param(struct wmi_wmm_params *params,
 }
 
 int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar,
-                        const struct wmi_pdev_set_wmm_params_arg *arg)
+                                   const struct wmi_pdev_set_wmm_params_arg *arg)
 {
         struct wmi_pdev_set_wmm_params *cmd;
         struct sk_buff *skb;
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index e70836586756..86f5ebccfe79 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -109,6 +109,9 @@ enum wmi_service {
         WMI_SERVICE_BURST,
         WMI_SERVICE_SMART_ANTENNA_SW_SUPPORT,
         WMI_SERVICE_SMART_ANTENNA_HW_SUPPORT,
+
+        /* keep last */
+        WMI_SERVICE_MAX,
 };
 
 enum wmi_10x_service {
@@ -219,8 +222,6 @@ static inline char *wmi_service_name(int service_id)
 #undef SVCSTR
 }
 
-#define WMI_MAX_SERVICE 64
-
 #define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id) \
         (__le32_to_cpu((wmi_svc_bmap)[(svc_id)/(sizeof(u32))]) & \
          BIT((svc_id)%(sizeof(u32))))
@@ -347,9 +348,6 @@ static inline void wmi_main_svc_map(const __le32 *in, unsigned long *out)
 
 #undef SVCMAP
 
-#define WMI_SERVICE_BM_SIZE \
-        ((WMI_MAX_SERVICE + sizeof(u32) - 1)/sizeof(u32))
-
 /* 2 word representation of MAC addr */
 struct wmi_mac_addr {
         union {
@@ -1271,7 +1269,6 @@ enum wmi_channel_change_cause {
                                 WMI_HT_CAP_RX_STBC       | \
                                 WMI_HT_CAP_LDPC)
 
-
 /*
  * WMI_VHT_CAP_* these maps to ieee 802.11ac vht capability information
  * field. The fields not defined here are not supported, or reserved.
@@ -1405,7 +1402,7 @@ struct wmi_service_ready_event {
         __le32 phy_capability;
         /* Maximum number of frag table entries that SW will populate less 1 */
         __le32 max_frag_entry;
-        __le32 wmi_service_bitmap[WMI_SERVICE_BM_SIZE];
+        __le32 wmi_service_bitmap[16];
         __le32 num_rf_chains;
         /*
          * The following field is only valid for service type
@@ -1444,7 +1441,7 @@ struct wmi_service_ready_event_10x {
 
         /* Maximum number of frag table entries that SW will populate less 1 */
         __le32 max_frag_entry;
-        __le32 wmi_service_bitmap[WMI_SERVICE_BM_SIZE];
+        __le32 wmi_service_bitmap[16];
         __le32 num_rf_chains;
 
         /*
@@ -1473,7 +1470,6 @@ struct wmi_service_ready_event_10x {
         struct wlan_host_mem_req mem_reqs[1];
 } __packed;
 
-
 #define WMI_SERVICE_READY_TIMEOUT_HZ (5*HZ)
 #define WMI_UNIFIED_READY_TIMEOUT_HZ (5*HZ)
 
@@ -2127,7 +2123,6 @@ struct wmi_start_scan_cmd_10x {
          */
 } __packed;
 
-
 struct wmi_ssid_arg {
         int len;
         const u8 *ssid;
@@ -2188,7 +2183,6 @@ struct wmi_start_scan_arg {
 /* WMI_SCAN_CLASS_MASK must be the same value as IEEE80211_SCAN_CLASS_MASK */
 #define WMI_SCAN_CLASS_MASK 0xFF000000
 
-
 enum wmi_stop_scan_type {
         WMI_SCAN_STOP_ONE       = 0x00000000, /* stop by scan_id */
         WMI_SCAN_STOP_VDEV_ALL  = 0x01000000, /* stop by vdev_id */
@@ -2373,7 +2367,6 @@ struct wmi_single_phyerr_rx_hdr {
         __le32 nf_list_1;
         __le32 nf_list_2;
 
-
         /* Length of the frame */
         __le32 buf_len;
 } __packed;
@@ -2475,7 +2468,6 @@ struct phyerr_fft_report {
 #define SEARCH_FFT_REPORT_REG1_NUM_STR_BINS_IB_MASK     0x000000FF
 #define SEARCH_FFT_REPORT_REG1_NUM_STR_BINS_IB_LSB      0
 
-
 struct phyerr_tlv {
         __le16 len;
         u8 tag;
@@ -2506,7 +2498,6 @@ struct wmi_echo_cmd {
         __le32 value;
 } __packed;
 
-
 struct wmi_pdev_set_regdomain_cmd {
         __le32 reg_domain;
         __le32 reg_domain_2G;
@@ -2555,7 +2546,6 @@ struct wmi_pdev_set_quiet_cmd {
         __le32 enabled;
 } __packed;
 
-
 /*
  * 802.11g protection mode.
  */
@@ -4293,7 +4283,6 @@ struct wmi_tbtt_offset_event {
         __le32 tbttoffset_list[WMI_MAX_AP_VDEV];
 } __packed;
 
-
 struct wmi_peer_create_cmd {
         __le32 vdev_id;
         struct wmi_mac_addr peer_macaddr;
@@ -4739,6 +4728,10 @@ int ath10k_wmi_wait_for_service_ready(struct ath10k *ar);
 int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar);
 
 int ath10k_wmi_connect(struct ath10k *ar);
+
+struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len);
+int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);
+
 int ath10k_wmi_pdev_set_channel(struct ath10k *ar,
                                 const struct wmi_channel_arg *);
 int ath10k_wmi_pdev_suspend_target(struct ath10k *ar, u32 suspend_opt);
@@ -4774,11 +4767,11 @@ int ath10k_wmi_vdev_spectral_conf(struct ath10k *ar,
 int ath10k_wmi_vdev_spectral_enable(struct ath10k *ar, u32 vdev_id, u32 trigger,
                                     u32 enable);
 int ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id,
-                    const u8 peer_addr[ETH_ALEN]);
+                           const u8 peer_addr[ETH_ALEN]);
 int ath10k_wmi_peer_delete(struct ath10k *ar, u32 vdev_id,
-                    const u8 peer_addr[ETH_ALEN]);
+                           const u8 peer_addr[ETH_ALEN]);
 int ath10k_wmi_peer_flush(struct ath10k *ar, u32 vdev_id,
-                   const u8 peer_addr[ETH_ALEN], u32 tid_bitmap);
+                          const u8 peer_addr[ETH_ALEN], u32 tid_bitmap);
 int ath10k_wmi_peer_set_param(struct ath10k *ar, u32 vdev_id,
                               const u8 *peer_addr,
                               enum wmi_peer_param param_id, u32 param_value);
@@ -4795,7 +4788,7 @@ int ath10k_wmi_scan_chan_list(struct ath10k *ar,
                               const struct wmi_scan_chan_list_arg *arg);
 int ath10k_wmi_beacon_send_ref_nowait(struct ath10k_vif *arvif);
 int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar,
-                        const struct wmi_pdev_set_wmm_params_arg *arg);
+                                   const struct wmi_pdev_set_wmm_params_arg *arg);
 int ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id);
 int ath10k_wmi_force_fw_hang(struct ath10k *ar,
                              enum wmi_force_fw_hang_type type, u32 delay_ms);
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
index c9f81a388f15..93caf8e68901 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -1,13 +1,12 @@
 config ATH5K
         tristate "Atheros 5xxx wireless cards support"
-        depends on (PCI || ATHEROS_AR231X) && MAC80211
+        depends on PCI && MAC80211
         select ATH_COMMON
         select MAC80211_LEDS
         select LEDS_CLASS
         select NEW_LEDS
         select AVERAGE
-        select ATH5K_AHB if (ATHEROS_AR231X && !PCI)
-        select ATH5K_PCI if (!ATHEROS_AR231X && PCI)
+        select ATH5K_PCI
         ---help---
           This module adds support for wireless adapters based on
           Atheros 5xxx chipset.
@@ -52,16 +51,9 @@ config ATH5K_TRACER
 
           If unsure, say N.
 
-config ATH5K_AHB
-        bool "Atheros 5xxx AHB bus support"
-        depends on (ATHEROS_AR231X && !PCI)
-        ---help---
-          This adds support for WiSoC type chipsets of the 5xxx Atheros
-          family.
-
 config ATH5K_PCI
         bool "Atheros 5xxx PCI bus support"
-        depends on (!ATHEROS_AR231X && PCI)
+        depends on PCI
         ---help---
           This adds support for PCI type chipsets of the 5xxx Atheros
           family.
diff --git a/drivers/net/wireless/ath/ath5k/Makefile b/drivers/net/wireless/ath/ath5k/Makefile
index 1b3a34f7f224..51e2d8668041 100644
--- a/drivers/net/wireless/ath/ath5k/Makefile
+++ b/drivers/net/wireless/ath/ath5k/Makefile
@@ -17,6 +17,5 @@ ath5k-y				+= ani.o
 ath5k-y                         += sysfs.o
 ath5k-y                         += mac80211-ops.o
 ath5k-$(CONFIG_ATH5K_DEBUG)     += debug.o
-ath5k-$(CONFIG_ATH5K_AHB)       += ahb.o
 ath5k-$(CONFIG_ATH5K_PCI)       += pci.o
 obj-$(CONFIG_ATH5K)             += ath5k.o
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
deleted file mode 100644
index 79bffe165cab..000000000000
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 2008-2009 Atheros Communications Inc.
- * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (c) 2009 Imre Kaloz <kaloz@openwrt.org>
- *
- * 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/nl80211.h>
-#include <linux/platform_device.h>
-#include <linux/etherdevice.h>
-#include <linux/export.h>
-#include <ar231x_platform.h>
-#include "ath5k.h"
-#include "debug.h"
-#include "base.h"
-#include "reg.h"
-
-/* return bus cachesize in 4B word units */
-static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz)
-{
-        *csz = L1_CACHE_BYTES >> 2;
-}
-
-static bool
-ath5k_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
-{
-        struct ath5k_hw *ah = common->priv;
-        struct platform_device *pdev = to_platform_device(ah->dev);
-        struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
-        u16 *eeprom, *eeprom_end;
-
-        eeprom = (u16 *) bcfg->radio;
-        eeprom_end = ((void *) bcfg->config) + BOARD_CONFIG_BUFSZ;
-
-        eeprom += off;
-        if (eeprom > eeprom_end)
-                return false;
-
-        *data = *eeprom;
-        return true;
-}
-
-int ath5k_hw_read_srev(struct ath5k_hw *ah)
-{
-        struct platform_device *pdev = to_platform_device(ah->dev);
-        struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
-        ah->ah_mac_srev = bcfg->devid;
-        return 0;
-}
-
-static int ath5k_ahb_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)
-{
-        struct platform_device *pdev = to_platform_device(ah->dev);
-        struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
-        u8 *cfg_mac;
-
-        if (to_platform_device(ah->dev)->id == 0)
-                cfg_mac = bcfg->config->wlan0_mac;
-        else
-                cfg_mac = bcfg->config->wlan1_mac;
-
-        memcpy(mac, cfg_mac, ETH_ALEN);
-        return 0;
-}
-
-static const struct ath_bus_ops ath_ahb_bus_ops = {
-        .ath_bus_type = ATH_AHB,
-        .read_cachesize = ath5k_ahb_read_cachesize,
-        .eeprom_read = ath5k_ahb_eeprom_read,
-        .eeprom_read_mac = ath5k_ahb_eeprom_read_mac,
-};
-
-/*Initialization*/
-static int ath_ahb_probe(struct platform_device *pdev)
-{
-        struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
-        struct ath5k_hw *ah;
-        struct ieee80211_hw *hw;
-        struct resource *res;
-        void __iomem *mem;
-        int irq;
-        int ret = 0;
-        u32 reg;
-
-        if (!dev_get_platdata(&pdev->dev)) {
-                dev_err(&pdev->dev, "no platform data specified\n");
-                ret = -EINVAL;
-                goto err_out;
-        }
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "no memory resource found\n");
-                ret = -ENXIO;
-                goto err_out;
-        }
-
-        mem = ioremap_nocache(res->start, resource_size(res));
-        if (mem == NULL) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                ret = -ENOMEM;
-                goto err_out;
-        }
-
-        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "no IRQ resource found\n");
-                ret = -ENXIO;
-                goto err_iounmap;
-        }
-
-        irq = res->start;
-
-        hw = ieee80211_alloc_hw(sizeof(struct ath5k_hw), &ath5k_hw_ops);
-        if (hw == NULL) {
-                dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
-                ret = -ENOMEM;
-                goto err_iounmap;
-        }
-
-        ah = hw->priv;
-        ah->hw = hw;
-        ah->dev = &pdev->dev;
-        ah->iobase = mem;
-        ah->irq = irq;
-        ah->devid = bcfg->devid;
-
-        if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
-                /* Enable WMAC AHB arbitration */
-                reg = ioread32((void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
-                reg |= AR5K_AR2315_AHB_ARB_CTL_WLAN;
-                iowrite32(reg, (void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
-
-                /* Enable global WMAC swapping */
-                reg = ioread32((void __iomem *) AR5K_AR2315_BYTESWAP);
-                reg |= AR5K_AR2315_BYTESWAP_WMAC;
-                iowrite32(reg, (void __iomem *) AR5K_AR2315_BYTESWAP);
-        } else {
-                /* Enable WMAC DMA access (assuming 5312 or 231x*/
-                /* TODO: check other platforms */
-                reg = ioread32((void __iomem *) AR5K_AR5312_ENABLE);
-                if (to_platform_device(ah->dev)->id == 0)
-                        reg |= AR5K_AR5312_ENABLE_WLAN0;
-                else
-                        reg |= AR5K_AR5312_ENABLE_WLAN1;
-                iowrite32(reg, (void __iomem *) AR5K_AR5312_ENABLE);
-
-                /*
-                 * On a dual-band AR5312, the multiband radio is only
-                 * used as pass-through. Disable 2 GHz support in the
-                 * driver for it
-                 */
-                if (to_platform_device(ah->dev)->id == 0 &&
-                    (bcfg->config->flags & (BD_WLAN0 | BD_WLAN1)) ==
-                     (BD_WLAN1 | BD_WLAN0))
-                        ah->ah_capabilities.cap_needs_2GHz_ovr = true;
-                else
-                        ah->ah_capabilities.cap_needs_2GHz_ovr = false;
-        }
-
-        ret = ath5k_init_ah(ah, &ath_ahb_bus_ops);
-        if (ret != 0) {
-                dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret);
-                ret = -ENODEV;
-                goto err_free_hw;
-        }
-
-        platform_set_drvdata(pdev, hw);
-
-        return 0;
-
- err_free_hw:
-        ieee80211_free_hw(hw);
- err_iounmap:
-        iounmap(mem);
- err_out:
-        return ret;
-}
-
-static int ath_ahb_remove(struct platform_device *pdev)
-{
-        struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
-        struct ieee80211_hw *hw = platform_get_drvdata(pdev);
-        struct ath5k_hw *ah;
-        u32 reg;
-
-        if (!hw)
-                return 0;
-
-        ah = hw->priv;
-
-        if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
-                /* Disable WMAC AHB arbitration */
-                reg = ioread32((void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
-                reg &= ~AR5K_AR2315_AHB_ARB_CTL_WLAN;
-                iowrite32(reg, (void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
-        } else {
-                /*Stop DMA access */
-                reg = ioread32((void __iomem *) AR5K_AR5312_ENABLE);
-                if (to_platform_device(ah->dev)->id == 0)
-                        reg &= ~AR5K_AR5312_ENABLE_WLAN0;
-                else
-                        reg &= ~AR5K_AR5312_ENABLE_WLAN1;
-                iowrite32(reg, (void __iomem *) AR5K_AR5312_ENABLE);
-        }
-
-        ath5k_deinit_ah(ah);
-        iounmap(ah->iobase);
-        ieee80211_free_hw(hw);
-
-        return 0;
-}
-
-static struct platform_driver ath_ahb_driver = {
-        .probe      = ath_ahb_probe,
-        .remove     = ath_ahb_remove,
-        .driver         = {
-                .name   = "ar231x-wmac",
-                .owner  = THIS_MODULE,
-        },
-};
-
-module_platform_driver(ath_ahb_driver);
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index 85316bb3f8c6..ed2468220216 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -1647,32 +1647,6 @@ static inline struct ath_regulatory *ath5k_hw_regulatory(struct ath5k_hw *ah)
         return &(ath5k_hw_common(ah)->regulatory);
 }
 
-#ifdef CONFIG_ATHEROS_AR231X
-#define AR5K_AR2315_PCI_BASE    ((void __iomem *)0xb0100000)
-
-static inline void __iomem *ath5k_ahb_reg(struct ath5k_hw *ah, u16 reg)
-{
-        /* On AR2315 and AR2317 the PCI clock domain registers
-         * are outside of the WMAC register space */
-        if (unlikely((reg >= 0x4000) && (reg < 0x5000) &&
-            (ah->ah_mac_srev >= AR5K_SREV_AR2315_R6)))
-                return AR5K_AR2315_PCI_BASE + reg;
-
-        return ah->iobase + reg;
-}
-
-static inline u32 ath5k_hw_reg_read(struct ath5k_hw *ah, u16 reg)
-{
-        return ioread32(ath5k_ahb_reg(ah, reg));
-}
-
-static inline void ath5k_hw_reg_write(struct ath5k_hw *ah, u32 val, u16 reg)
-{
-        iowrite32(val, ath5k_ahb_reg(ah, reg));
-}
-
-#else
-
 static inline u32 ath5k_hw_reg_read(struct ath5k_hw *ah, u16 reg)
 {
         return ioread32(ah->iobase + reg);
@@ -1683,8 +1657,6 @@ static inline void ath5k_hw_reg_write(struct ath5k_hw *ah, u32 val, u16 reg)
         iowrite32(val, ah->iobase + reg);
 }
 
-#endif
-
 static inline enum ath_bus_type ath5k_get_bus_type(struct ath5k_hw *ah)
 {
         return ath5k_hw_common(ah)->bus_ops->ath_bus_type;
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 59a87247aac4..a4a09bb8f2f3 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -99,15 +99,6 @@ static int ath5k_reset(struct ath5k_hw *ah, struct ieee80211_channel *chan,
 
 /* Known SREVs */
 static const struct ath5k_srev_name srev_names[] = {
-#ifdef CONFIG_ATHEROS_AR231X
-        { "5312",       AR5K_VERSION_MAC,       AR5K_SREV_AR5312_R2 },
-        { "5312",       AR5K_VERSION_MAC,       AR5K_SREV_AR5312_R7 },
-        { "2313",       AR5K_VERSION_MAC,       AR5K_SREV_AR2313_R8 },
-        { "2315",       AR5K_VERSION_MAC,       AR5K_SREV_AR2315_R6 },
-        { "2315",       AR5K_VERSION_MAC,       AR5K_SREV_AR2315_R7 },
-        { "2317",       AR5K_VERSION_MAC,       AR5K_SREV_AR2317_R1 },
-        { "2317",       AR5K_VERSION_MAC,       AR5K_SREV_AR2317_R2 },
-#else
         { "5210",       AR5K_VERSION_MAC,       AR5K_SREV_AR5210 },
         { "5311",       AR5K_VERSION_MAC,       AR5K_SREV_AR5311 },
         { "5311A",      AR5K_VERSION_MAC,       AR5K_SREV_AR5311A },
@@ -126,7 +117,6 @@ static const struct ath5k_srev_name srev_names[] = {
         { "5418",       AR5K_VERSION_MAC,       AR5K_SREV_AR5418 },
         { "2425",       AR5K_VERSION_MAC,       AR5K_SREV_AR2425 },
         { "2417",       AR5K_VERSION_MAC,       AR5K_SREV_AR2417 },
-#endif
         { "xxxxx",      AR5K_VERSION_MAC,       AR5K_SREV_UNKNOWN },
         { "5110",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5110 },
         { "5111",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5111 },
@@ -142,10 +132,6 @@ static const struct ath5k_srev_name srev_names[] = {
         { "5413",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5413 },
         { "5424",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5424 },
         { "5133",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5133 },
-#ifdef CONFIG_ATHEROS_AR231X
-        { "2316",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2316 },
-        { "2317",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2317 },
-#endif
         { "xxxxx",      AR5K_VERSION_RAD,       AR5K_SREV_UNKNOWN },
 };
 
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 399728618fb9..c70782e8f07b 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -66,6 +66,7 @@
 
 #include <linux/seq_file.h>
 #include <linux/list.h>
+#include <linux/vmalloc.h>
 #include "debug.h"
 #include "ath5k.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c
index 2062d1190556..0beb7e7d6075 100644
--- a/drivers/net/wireless/ath/ath5k/led.c
+++ b/drivers/net/wireless/ath/ath5k/led.c
@@ -163,20 +163,14 @@ int ath5k_init_leds(struct ath5k_hw *ah)
 {
         int ret = 0;
         struct ieee80211_hw *hw = ah->hw;
-#ifndef CONFIG_ATHEROS_AR231X
         struct pci_dev *pdev = ah->pdev;
-#endif
         char name[ATH5K_LED_MAX_NAME_LEN + 1];
         const struct pci_device_id *match;
 
         if (!ah->pdev)
                 return 0;
 
-#ifdef CONFIG_ATHEROS_AR231X
-        match = NULL;
-#else
         match = pci_match_id(&ath5k_led_devices[0], pdev);
-#endif
         if (match) {
                 __set_bit(ATH_STAT_LEDSOFT, ah->status);
                 ah->led_pin = ATH_PIN(match->driver_data);
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 00fb8badbacc..b72d0be716db 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -1004,9 +1004,11 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
         case ATH9K_ANI_FIRSTEP_LEVEL:{
                 u32 level = param;
 
-                value = level;
+                value = level * 2;
                 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
                               AR_PHY_FIND_SIG_FIRSTEP, value);
+                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
+                              AR_PHY_FIND_SIG_FIRSTEP_LOW, value);
 
                 if (level != aniState->firstepLevel) {
                         ath_dbg(common, ANI,
@@ -1040,9 +1042,8 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                 REG_RMW_FIELD(ah, AR_PHY_TIMING5,
                               AR_PHY_TIMING5_CYCPWR_THR1, value);
 
-                if (IS_CHAN_HT40(ah->curchan))
-                        REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
-                                      AR_PHY_EXT_TIMING5_CYCPWR_THR1, value);
+                REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
+                                  AR_PHY_EXT_TIMING5_CYCPWR_THR1, value - 1);
 
                 if (level != aniState->spurImmunityLevel) {
                         ath_dbg(common, ANI,
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
index 669cb3747208..2a93519f4bdf 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@ -381,16 +381,27 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
         ts->evm1 = ads->AR_TxEVM1;
         ts->evm2 = ads->AR_TxEVM2;
 
-        status = ACCESS_ONCE(ads->ds_ctl4);
-        ts->duration[0] = MS(status, AR_PacketDur0);
-        ts->duration[1] = MS(status, AR_PacketDur1);
-        status = ACCESS_ONCE(ads->ds_ctl5);
-        ts->duration[2] = MS(status, AR_PacketDur2);
-        ts->duration[3] = MS(status, AR_PacketDur3);
-
         return 0;
 }
 
+static int ar9002_hw_get_duration(struct ath_hw *ah, const void *ds, int index)
+{
+        struct ar5416_desc *ads = AR5416DESC(ds);
+
+        switch (index) {
+        case 0:
+                return MS(ACCESS_ONCE(ads->ds_ctl4), AR_PacketDur0);
+        case 1:
+                return MS(ACCESS_ONCE(ads->ds_ctl4), AR_PacketDur1);
+        case 2:
+                return MS(ACCESS_ONCE(ads->ds_ctl5), AR_PacketDur2);
+        case 3:
+                return MS(ACCESS_ONCE(ads->ds_ctl5), AR_PacketDur3);
+        default:
+                return -1;
+        }
+}
+
 void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds,
                           u32 size, u32 flags)
 {
@@ -413,4 +424,5 @@ void ar9002_hw_attach_mac_ops(struct ath_hw *ah)
         ops->get_isr = ar9002_hw_get_isr;
         ops->set_txdesc = ar9002_set_txdesc;
         ops->proc_txdesc = ar9002_hw_proc_txdesc;
+        ops->get_duration = ar9002_hw_get_duration;
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index e5f7c11fa144..057b1657c428 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -355,11 +355,9 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
                                  struct ath_tx_status *ts)
 {
         struct ar9003_txs *ads;
-        struct ar9003_txc *adc;
         u32 status;
 
         ads = &ah->ts_ring[ah->ts_tail];
-        adc = (struct ar9003_txc *)ads;
 
         status = ACCESS_ONCE(ads->status8);
         if ((status & AR_TxDone) == 0)
@@ -428,18 +426,29 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
         ts->ts_rssi_ext1 = MS(status, AR_TxRSSIAnt11);
         ts->ts_rssi_ext2 = MS(status, AR_TxRSSIAnt12);
 
-        status = ACCESS_ONCE(adc->ctl15);
-        ts->duration[0] = MS(status, AR_PacketDur0);
-        ts->duration[1] = MS(status, AR_PacketDur1);
-        status = ACCESS_ONCE(adc->ctl16);
-        ts->duration[2] = MS(status, AR_PacketDur2);
-        ts->duration[3] = MS(status, AR_PacketDur3);
-
         memset(ads, 0, sizeof(*ads));
 
         return 0;
 }
 
+static int ar9003_hw_get_duration(struct ath_hw *ah, const void *ds, int index)
+{
+        const struct ar9003_txc *adc = ds;
+
+        switch (index) {
+        case 0:
+                return MS(ACCESS_ONCE(adc->ctl15), AR_PacketDur0);
+        case 1:
+                return MS(ACCESS_ONCE(adc->ctl15), AR_PacketDur1);
+        case 2:
+                return MS(ACCESS_ONCE(adc->ctl16), AR_PacketDur2);
+        case 3:
+                return MS(ACCESS_ONCE(adc->ctl16), AR_PacketDur3);
+        default:
+                return 0;
+        }
+}
+
 void ar9003_hw_attach_mac_ops(struct ath_hw *hw)
 {
         struct ath_hw_ops *ops = ath9k_hw_ops(hw);
@@ -449,6 +458,7 @@ void ar9003_hw_attach_mac_ops(struct ath_hw *hw)
         ops->get_isr = ar9003_hw_get_isr;
         ops->set_txdesc = ar9003_set_txdesc;
         ops->proc_txdesc = ar9003_hw_proc_txdesc;
+        ops->get_duration = ar9003_hw_get_duration;
 }
 
 void ath9k_hw_set_rx_bufsize(struct ath_hw *ah, u16 buf_size)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 542a8d51d3b0..697c4ae90af0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -517,6 +517,23 @@ static void ar9003_hw_spur_mitigate(struct ath_hw *ah,
         ar9003_hw_spur_mitigate_ofdm(ah, chan);
 }
 
+static u32 ar9003_hw_compute_pll_control_soc(struct ath_hw *ah,
+                                             struct ath9k_channel *chan)
+{
+        u32 pll;
+
+        pll = SM(0x5, AR_RTC_9300_SOC_PLL_REFDIV);
+
+        if (chan && IS_CHAN_HALF_RATE(chan))
+                pll |= SM(0x1, AR_RTC_9300_SOC_PLL_CLKSEL);
+        else if (chan && IS_CHAN_QUARTER_RATE(chan))
+                pll |= SM(0x2, AR_RTC_9300_SOC_PLL_CLKSEL);
+
+        pll |= SM(0x2c, AR_RTC_9300_SOC_PLL_DIV_INT);
+
+        return pll;
+}
+
 static u32 ar9003_hw_compute_pll_control(struct ath_hw *ah,
                                          struct ath9k_channel *chan)
 {
@@ -1781,7 +1798,12 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
 
         priv_ops->rf_set_freq = ar9003_hw_set_channel;
         priv_ops->spur_mitigate_freq = ar9003_hw_spur_mitigate;
-        priv_ops->compute_pll_control = ar9003_hw_compute_pll_control;
+
+        if (AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah))
+                priv_ops->compute_pll_control = ar9003_hw_compute_pll_control_soc;
+        else
+                priv_ops->compute_pll_control = ar9003_hw_compute_pll_control;
+
         priv_ops->set_channel_regs = ar9003_hw_set_channel_regs;
         priv_ops->init_bb = ar9003_hw_init_bb;
         priv_ops->process_ini = ar9003_hw_process_ini;
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 8cd116efe3ea..bfa0b1518da1 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -354,6 +354,7 @@ struct ath_chanctx {
         bool switch_after_beacon;
 
         short nvifs;
+        short nvifs_assigned;
         unsigned int rxfilter;
 };
 
@@ -454,7 +455,8 @@ void ath9k_p2p_bss_info_changed(struct ath_softc *sc,
 void ath9k_beacon_add_noa(struct ath_softc *sc, struct ath_vif *avp,
                           struct sk_buff *skb);
 void ath9k_p2p_ps_timer(void *priv);
-void ath9k_chanctx_wake_queues(struct ath_softc *sc);
+void ath9k_chanctx_wake_queues(struct ath_softc *sc, struct ath_chanctx *ctx);
+void ath9k_chanctx_stop_queues(struct ath_softc *sc, struct ath_chanctx *ctx);
 void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx);
 
 void ath_chanctx_beacon_recv_ev(struct ath_softc *sc,
@@ -524,7 +526,12 @@ static inline void ath9k_beacon_add_noa(struct ath_softc *sc, struct ath_vif *av
 static inline void ath9k_p2p_ps_timer(struct ath_softc *sc)
 {
 }
-static inline void ath9k_chanctx_wake_queues(struct ath_softc *sc)
+static inline void ath9k_chanctx_wake_queues(struct ath_softc *sc,
+                                             struct ath_chanctx *ctx)
+{
+}
+static inline void ath9k_chanctx_stop_queues(struct ath_softc *sc,
+                                             struct ath_chanctx *ctx)
 {
 }
 static inline void ath_chanctx_check_active(struct ath_softc *sc,
@@ -585,6 +592,11 @@ void ath9k_release_buffered_frames(struct ieee80211_hw *hw,
 struct ath_vif {
         struct list_head list;
 
+        /* BSS info */
+        u8 bssid[ETH_ALEN];
+        u16 aid;
+        bool assoc;
+
         struct ieee80211_vif *vif;
         struct ath_node mcast_node;
         int av_bslot;
diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index 77c99eb55834..945c89826b14 100644
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -211,7 +211,7 @@ void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx)
                 switch (vif->type) {
                 case NL80211_IFTYPE_P2P_CLIENT:
                 case NL80211_IFTYPE_STATION:
-                        if (vif->bss_conf.assoc)
+                        if (avp->assoc)
                                 active = true;
                         break;
                 default:
@@ -761,6 +761,13 @@ void ath_offchannel_next(struct ath_softc *sc)
 
 void ath_roc_complete(struct ath_softc *sc, bool abort)
 {
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+        if (abort)
+                ath_dbg(common, CHAN_CTX, "RoC aborted\n");
+        else
+                ath_dbg(common, CHAN_CTX, "RoC expired\n");
+
         sc->offchannel.roc_vif = NULL;
         sc->offchannel.roc_chan = NULL;
         if (!abort)
@@ -917,7 +924,7 @@ ath_chanctx_send_vif_ps_frame(struct ath_softc *sc, struct ath_vif *avp,
 
         switch (vif->type) {
         case NL80211_IFTYPE_STATION:
-                if (!vif->bss_conf.assoc)
+                if (!avp->assoc)
                         return false;
 
                 skb = ieee80211_nullfunc_get(sc->hw, vif);
@@ -1037,9 +1044,11 @@ static void ath_offchannel_channel_change(struct ath_softc *sc)
 void ath_chanctx_set_next(struct ath_softc *sc, bool force)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_chanctx *old_ctx;
         struct timespec ts;
         bool measure_time = false;
         bool send_ps = false;
+        bool queues_stopped = false;
 
         spin_lock_bh(&sc->chan_lock);
         if (!sc->next_chan) {
@@ -1069,6 +1078,10 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force)
                         getrawmonotonic(&ts);
                         measure_time = true;
                 }
+
+                ath9k_chanctx_stop_queues(sc, sc->cur_chan);
+                queues_stopped = true;
+
                 __ath9k_flush(sc->hw, ~0, true);
 
                 if (ath_chanctx_send_ps_frame(sc, true))
@@ -1082,6 +1095,7 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force)
                         sc->cur_chan->tsf_val = ath9k_hw_gettsf64(sc->sc_ah);
                 }
         }
+        old_ctx = sc->cur_chan;
         sc->cur_chan = sc->next_chan;
         sc->cur_chan->stopped = false;
         sc->next_chan = NULL;
@@ -1104,7 +1118,16 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force)
                 if (measure_time)
                         sc->sched.channel_switch_time =
                                 ath9k_hw_get_tsf_offset(&ts, NULL);
+                /*
+                 * A reset will ensure that all queues are woken up,
+                 * so there is no need to awaken them again.
+                 */
+                goto out;
         }
+
+        if (queues_stopped)
+                ath9k_chanctx_wake_queues(sc, old_ctx);
+out:
         if (send_ps)
                 ath_chanctx_send_ps_frame(sc, false);
 
@@ -1170,18 +1193,37 @@ bool ath9k_is_chanctx_enabled(void)
 /* Queue management */
 /********************/
 
-void ath9k_chanctx_wake_queues(struct ath_softc *sc)
+void ath9k_chanctx_stop_queues(struct ath_softc *sc, struct ath_chanctx *ctx)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        int i;
+
+        if (ctx == &sc->offchannel.chan) {
+                ieee80211_stop_queue(sc->hw,
+                                     sc->hw->offchannel_tx_hw_queue);
+        } else {
+                for (i = 0; i < IEEE80211_NUM_ACS; i++)
+                        ieee80211_stop_queue(sc->hw,
+                                             ctx->hw_queue_base + i);
+        }
+
+        if (ah->opmode == NL80211_IFTYPE_AP)
+                ieee80211_stop_queue(sc->hw, sc->hw->queues - 2);
+}
+
+
+void ath9k_chanctx_wake_queues(struct ath_softc *sc, struct ath_chanctx *ctx)
 {
         struct ath_hw *ah = sc->sc_ah;
         int i;
 
-        if (sc->cur_chan == &sc->offchannel.chan) {
+        if (ctx == &sc->offchannel.chan) {
                 ieee80211_wake_queue(sc->hw,
                                      sc->hw->offchannel_tx_hw_queue);
         } else {
                 for (i = 0; i < IEEE80211_NUM_ACS; i++)
                         ieee80211_wake_queue(sc->hw,
-                                             sc->cur_chan->hw_queue_base + i);
+                                             ctx->hw_queue_base + i);
         }
 
         if (ah->opmode == NL80211_IFTYPE_AP)
@@ -1339,7 +1381,7 @@ void ath9k_p2p_ps_timer(void *priv)
         rcu_read_lock();
 
         vif = avp->vif;
-        sta = ieee80211_find_sta(vif, vif->bss_conf.bssid);
+        sta = ieee80211_find_sta(vif, avp->bssid);
         if (!sta)
                 goto out;
 
diff --git a/drivers/net/wireless/ath/ath9k/dynack.c b/drivers/net/wireless/ath/ath9k/dynack.c
index 6ae8e0bc9e1f..22b3cc4c27cd 100644
--- a/drivers/net/wireless/ath/ath9k/dynack.c
+++ b/drivers/net/wireless/ath/ath9k/dynack.c
@@ -202,7 +202,7 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,
         ridx = ts->ts_rateindex;
 
         da->st_rbf.ts[da->st_rbf.t_rb].tstamp = ts->ts_tstamp;
-        da->st_rbf.ts[da->st_rbf.t_rb].dur = ts->duration[ts->ts_rateindex];
+        da->st_rbf.ts[da->st_rbf.t_rb].dur = ts->duration;
         ether_addr_copy(da->st_rbf.addr[da->st_rbf.t_rb].h_dest, hdr->addr1);
         ether_addr_copy(da->st_rbf.addr[da->st_rbf.t_rb].h_src, hdr->addr2);
 
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h
index a47ea8423f1e..8e85efeaeffc 100644
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
@@ -67,6 +67,12 @@ static inline int ath9k_hw_txprocdesc(struct ath_hw *ah, void *ds,
         return ath9k_hw_ops(ah)->proc_txdesc(ah, ds, ts);
 }
 
+static inline int ath9k_hw_get_duration(struct ath_hw *ah, const void *ds,
+                                        int index)
+{
+        return ath9k_hw_ops(ah)->get_duration(ah, ds, index);
+}
+
 static inline void ath9k_hw_antdiv_comb_conf_get(struct ath_hw *ah,
                 struct ath_hw_antcomb_conf *antconf)
 {
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 3aed729e4d5e..8be4b1453394 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -222,31 +222,28 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
 {
         u32 val;
 
+        if (ah->get_mac_revision)
+                ah->hw_version.macRev = ah->get_mac_revision();
+
         switch (ah->hw_version.devid) {
         case AR5416_AR9100_DEVID:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9100;
                 break;
         case AR9300_DEVID_AR9330:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9330;
-                if (ah->get_mac_revision) {
-                        ah->hw_version.macRev = ah->get_mac_revision();
-                } else {
+                if (!ah->get_mac_revision) {
                         val = REG_READ(ah, AR_SREV);
                         ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);
                 }
                 return;
         case AR9300_DEVID_AR9340:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9340;
-                val = REG_READ(ah, AR_SREV);
-                ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);
                 return;
         case AR9300_DEVID_QCA955X:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9550;
                 return;
         case AR9300_DEVID_AR953X:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9531;
-                if (ah->get_mac_revision)
-                        ah->hw_version.macRev = ah->get_mac_revision();
                 return;
         }
 
@@ -704,6 +701,8 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
 {
         u32 pll;
 
+        pll = ath9k_hw_compute_pll_control(ah, chan);
+
         if (AR_SREV_9485(ah) || AR_SREV_9565(ah)) {
                 /* program BB PLL ki and kd value, ki=0x4, kd=0x40 */
                 REG_RMW_FIELD(ah, AR_CH0_BB_DPLL2,
@@ -754,7 +753,8 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
                 REG_RMW_FIELD(ah, AR_CH0_DDR_DPLL3,
                               AR_CH0_DPLL3_PHASE_SHIFT, 0x1);
 
-                REG_WRITE(ah, AR_RTC_PLL_CONTROL, 0x1142c);
+                REG_WRITE(ah, AR_RTC_PLL_CONTROL,
+                          pll | AR_RTC_9300_PLL_BYPASS);
                 udelay(1000);
 
                 /* program refdiv, nint, frac to RTC register */
@@ -770,7 +770,8 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
         } else if (AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah)) {
                 u32 regval, pll2_divint, pll2_divfrac, refdiv;
 
-                REG_WRITE(ah, AR_RTC_PLL_CONTROL, 0x1142c);
+                REG_WRITE(ah, AR_RTC_PLL_CONTROL,
+                          pll | AR_RTC_9300_SOC_PLL_BYPASS);
                 udelay(1000);
 
                 REG_SET_BIT(ah, AR_PHY_PLL_MODE, 0x1 << 16);
@@ -843,7 +844,6 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
                 udelay(1000);
         }
 
-        pll = ath9k_hw_compute_pll_control(ah, chan);
         if (AR_SREV_9565(ah))
                 pll |= 0x40000;
         REG_WRITE(ah, AR_RTC_PLL_CONTROL, pll);
@@ -1192,9 +1192,12 @@ static void ath9k_hw_set_operating_mode(struct ath_hw *ah, int opmode)
 
         switch (opmode) {
         case NL80211_IFTYPE_ADHOC:
-                set |= AR_STA_ID1_ADHOC;
-                REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
-                break;
+                if (!AR_SREV_9340_13(ah)) {
+                        set |= AR_STA_ID1_ADHOC;
+                        REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
+                        break;
+                }
+                /* fall through */
         case NL80211_IFTYPE_MESH_POINT:
         case NL80211_IFTYPE_AP:
                 set |= AR_STA_ID1_STA_AP;
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index b9eef3362fbb..975074fc11bc 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -691,6 +691,7 @@ struct ath_hw_ops {
                            struct ath_tx_info *i);
         int (*proc_txdesc)(struct ath_hw *ah, void *ds,
                            struct ath_tx_status *ts);
+        int (*get_duration)(struct ath_hw *ah, const void *ds, int index);
         void (*antdiv_comb_conf_get)(struct ath_hw *ah,
                         struct ath_hw_antcomb_conf *antconf);
         void (*antdiv_comb_conf_set)(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index cd05a7791073..aa69ceaad0be 100644
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -121,7 +121,7 @@ struct ath_tx_status {
         u32 evm0;
         u32 evm1;
         u32 evm2;
-        u32 duration[4];
+        u32 duration;
 };
 
 struct ath_rx_status {
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index fbf23ac61c97..205162449b72 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -60,8 +60,10 @@ static bool ath9k_has_pending_frames(struct ath_softc *sc, struct ath_txq *txq)
 
         spin_lock_bh(&txq->axq_lock);
 
-        if (txq->axq_depth)
+        if (txq->axq_depth) {
                 pending = true;
+                goto out;
+        }
 
         if (txq->mac80211_qnum >= 0) {
                 struct list_head *list;
@@ -70,6 +72,7 @@ static bool ath9k_has_pending_frames(struct ath_softc *sc, struct ath_txq *txq)
                 if (!list_empty(list))
                         pending = true;
         }
+out:
         spin_unlock_bh(&txq->axq_lock);
         return pending;
 }
@@ -261,12 +264,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
 
         ath9k_hw_set_interrupts(ah);
         ath9k_hw_enable_interrupts(ah);
-
-        if (!ath9k_is_chanctx_enabled())
-                ieee80211_wake_queues(sc->hw);
-        else
-                ath9k_chanctx_wake_queues(sc);
-
+        ieee80211_wake_queues(sc->hw);
         ath9k_p2p_ps_timer(sc);
 
         return true;
@@ -898,6 +896,7 @@ static bool ath9k_uses_beacons(int type)
 static void ath9k_vif_iter(struct ath9k_vif_iter_data *iter_data,
                            u8 *mac, struct ieee80211_vif *vif)
 {
+        struct ath_vif *avp = (struct ath_vif *)vif->drv_priv;
         int i;
 
         if (iter_data->has_hw_macaddr) {
@@ -918,7 +917,7 @@ static void ath9k_vif_iter(struct ath9k_vif_iter_data *iter_data,
                 break;
         case NL80211_IFTYPE_STATION:
                 iter_data->nstations++;
-                if (vif->bss_conf.assoc && !iter_data->primary_sta)
+                if (avp->assoc && !iter_data->primary_sta)
                         iter_data->primary_sta = vif;
                 break;
         case NL80211_IFTYPE_ADHOC:
@@ -939,6 +938,34 @@ static void ath9k_vif_iter(struct ath9k_vif_iter_data *iter_data,
         }
 }
 
+static void ath9k_update_bssid_mask(struct ath_softc *sc,
+                                    struct ath_chanctx *ctx,
+                                    struct ath9k_vif_iter_data *iter_data)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_vif *avp;
+        int i;
+
+        if (!ath9k_is_chanctx_enabled())
+                return;
+
+        list_for_each_entry(avp, &ctx->vifs, list) {
+                if (ctx->nvifs_assigned != 1)
+                        continue;
+
+                if (!avp->vif->p2p || !iter_data->has_hw_macaddr)
+                        continue;
+
+                ether_addr_copy(common->curbssid, avp->bssid);
+
+                /* perm_addr will be used as the p2p device address. */
+                for (i = 0; i < ETH_ALEN; i++)
+                        iter_data->mask[i] &=
+                                ~(iter_data->hw_macaddr[i] ^
+                                  sc->hw->wiphy->perm_addr[i]);
+        }
+}
+
 /* Called with sc->mutex held. */
 void ath9k_calculate_iter_data(struct ath_softc *sc,
                                struct ath_chanctx *ctx,
@@ -957,19 +984,21 @@ void ath9k_calculate_iter_data(struct ath_softc *sc,
 
         list_for_each_entry(avp, &ctx->vifs, list)
                 ath9k_vif_iter(iter_data, avp->vif->addr, avp->vif);
+
+        ath9k_update_bssid_mask(sc, ctx, iter_data);
 }
 
 static void ath9k_set_assoc_state(struct ath_softc *sc,
                                   struct ieee80211_vif *vif, bool changed)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
+        struct ath_vif *avp = (struct ath_vif *)vif->drv_priv;
         unsigned long flags;
 
         set_bit(ATH_OP_PRIM_STA_VIF, &common->op_flags);
 
-        ether_addr_copy(common->curbssid, bss_conf->bssid);
-        common->curaid = bss_conf->aid;
+        ether_addr_copy(common->curbssid, avp->bssid);
+        common->curaid = avp->aid;
         ath9k_hw_write_associd(sc->sc_ah);
 
         if (changed) {
@@ -1121,6 +1150,10 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,
         else
                 clear_bit(ATH_OP_PRIM_STA_VIF, &common->op_flags);
 
+        ath_dbg(common, CONFIG,
+                "macaddr: %pM, bssid: %pM, bssidmask: %pM\n",
+                common->macaddr, common->curbssid, common->bssidmask);
+
         ath9k_ps_restore(sc);
 }
 
@@ -1698,6 +1731,10 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
                 ath_dbg(common, CONFIG, "BSSID %pM Changed ASSOC %d\n",
                         bss_conf->bssid, bss_conf->assoc);
 
+                ether_addr_copy(avp->bssid, bss_conf->bssid);
+                avp->aid = bss_conf->aid;
+                avp->assoc = bss_conf->assoc;
+
                 ath9k_calculate_summary_state(sc, avp->chanctx);
 
                 if (ath9k_is_chanctx_enabled()) {
@@ -1932,9 +1969,6 @@ static bool ath9k_has_tx_pending(struct ath_softc *sc)
                 if (!ATH_TXQ_SETUP(sc, i))
                         continue;
 
-                if (!sc->tx.txq[i].axq_depth)
-                        continue;
-
                 npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]);
                 if (npend)
                         break;
@@ -1960,7 +1994,6 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
         struct ath_common *common = ath9k_hw_common(ah);
         int timeout = HZ / 5; /* 200 ms */
         bool drain_txq;
-        int i;
 
         cancel_delayed_work_sync(&sc->tx_complete_work);
 
@@ -1988,10 +2021,6 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
                         ath_reset(sc);
 
                 ath9k_ps_restore(sc);
-                for (i = 0; i < IEEE80211_NUM_ACS; i++) {
-                        ieee80211_wake_queue(sc->hw,
-                                             sc->cur_chan->hw_queue_base + i);
-                }
         }
 
         ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
@@ -2000,16 +2029,8 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 static bool ath9k_tx_frames_pending(struct ieee80211_hw *hw)
 {
         struct ath_softc *sc = hw->priv;
-        int i;
 
-        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-                if (!ATH_TXQ_SETUP(sc, i))
-                        continue;
-
-                if (ath9k_has_pending_frames(sc, &sc->tx.txq[i]))
-                        return true;
-        }
-        return false;
+        return ath9k_has_tx_pending(sc);
 }
 
 static int ath9k_tx_last_beacon(struct ieee80211_hw *hw)
@@ -2351,6 +2372,7 @@ static int ath9k_assign_vif_chanctx(struct ieee80211_hw *hw,
                 conf->def.chan->center_freq);
 
         avp->chanctx = ctx;
+        ctx->nvifs_assigned++;
         list_add_tail(&avp->list, &ctx->vifs);
         ath9k_calculate_summary_state(sc, ctx);
         for (i = 0; i < IEEE80211_NUM_ACS; i++)
@@ -2379,6 +2401,7 @@ static void ath9k_unassign_vif_chanctx(struct ieee80211_hw *hw,
                 conf->def.chan->center_freq);
 
         avp->chanctx = NULL;
+        ctx->nvifs_assigned--;
         list_del(&avp->list);
         ath9k_calculate_summary_state(sc, ctx);
         for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index a1499700bcf2..2a938f4feac5 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -903,6 +903,10 @@
 #define AR_SREV_9340(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9340))
 
+#define AR_SREV_9340_13(_ah) \
+        (AR_SREV_9340((_ah)) && \
+         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9340_13))
+
 #define AR_SREV_9340_13_OR_LATER(_ah) \
         (AR_SREV_9340((_ah)) && \
          ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9340_13))
@@ -1240,12 +1244,23 @@ enum {
 #define AR_CH0_DPLL3_PHASE_SHIFT_S   23
 #define AR_PHY_CCA_NOM_VAL_2GHZ      -118
 
+#define AR_RTC_9300_SOC_PLL_DIV_INT          0x0000003f
+#define AR_RTC_9300_SOC_PLL_DIV_INT_S        0
+#define AR_RTC_9300_SOC_PLL_DIV_FRAC         0x000fffc0
+#define AR_RTC_9300_SOC_PLL_DIV_FRAC_S       6
+#define AR_RTC_9300_SOC_PLL_REFDIV           0x01f00000
+#define AR_RTC_9300_SOC_PLL_REFDIV_S         20
+#define AR_RTC_9300_SOC_PLL_CLKSEL           0x06000000
+#define AR_RTC_9300_SOC_PLL_CLKSEL_S         25
+#define AR_RTC_9300_SOC_PLL_BYPASS           0x08000000
+
 #define AR_RTC_9300_PLL_DIV          0x000003ff
 #define AR_RTC_9300_PLL_DIV_S        0
 #define AR_RTC_9300_PLL_REFDIV       0x00003C00
 #define AR_RTC_9300_PLL_REFDIV_S     10
 #define AR_RTC_9300_PLL_CLKSEL       0x0000C000
 #define AR_RTC_9300_PLL_CLKSEL_S     14
+#define AR_RTC_9300_PLL_BYPASS       0x00010000
 
 #define AR_RTC_9160_PLL_DIV     0x000003ff
 #define AR_RTC_9160_PLL_DIV_S   0
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 93ad31be0ada..151ae49fa57e 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -158,7 +158,6 @@ static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,
 {
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct ath_frame_info *fi = get_frame_info(skb);
-        int hw_queue;
         int q = fi->txq;
 
         if (q < 0)
@@ -168,10 +167,9 @@ static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,
         if (WARN_ON(--txq->pending_frames < 0))
                 txq->pending_frames = 0;
 
-        hw_queue = (info->hw_queue >= sc->hw->queues - 2) ? q : info->hw_queue;
         if (txq->stopped &&
             txq->pending_frames < sc->tx.txq_max_pending[q]) {
-                ieee80211_wake_queue(sc->hw, hw_queue);
+                ieee80211_wake_queue(sc->hw, info->hw_queue);
                 txq->stopped = false;
         }
 }
@@ -685,6 +683,8 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
         if (bf_is_ampdu_not_probing(bf))
                 txq->axq_ampdu_depth--;
 
+        ts->duration = ath9k_hw_get_duration(sc->sc_ah, bf->bf_desc,
+                                             ts->ts_rateindex);
         if (!bf_isampdu(bf)) {
                 if (!flush) {
                         info = IEEE80211_SKB_CB(bf->bf_mpdu);
@@ -1841,15 +1841,17 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
         if (txq->mac80211_qnum < 0)
                 return;
 
+        if (test_bit(ATH_OP_HW_RESET, &common->op_flags))
+                return;
+
         spin_lock_bh(&sc->chan_lock);
         ac_list = &sc->cur_chan->acq[txq->mac80211_qnum];
-        spin_unlock_bh(&sc->chan_lock);
 
-        if (test_bit(ATH_OP_HW_RESET, &common->op_flags) ||
-            list_empty(ac_list))
+        if (list_empty(ac_list)) {
+                spin_unlock_bh(&sc->chan_lock);
                 return;
+        }
 
-        spin_lock_bh(&sc->chan_lock);
         rcu_read_lock();
 
         last_ac = list_entry(ac_list->prev, struct ath_atx_ac, list);
@@ -2207,9 +2209,8 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
         struct ath_txq *txq = txctl->txq;
         struct ath_atx_tid *tid = NULL;
         struct ath_buf *bf;
-        bool queue;
-        int q, hw_queue;
-        int ret;
+        bool queue, skip_uapsd = false;
+        int q, ret;
 
         if (vif)
                 avp = (void *)vif->drv_priv;
@@ -2228,14 +2229,13 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
          */
 
         q = skb_get_queue_mapping(skb);
-        hw_queue = (info->hw_queue >= sc->hw->queues - 2) ? q : info->hw_queue;
 
         ath_txq_lock(sc, txq);
         if (txq == sc->tx.txq_map[q]) {
                 fi->txq = q;
                 if (++txq->pending_frames > sc->tx.txq_max_pending[q] &&
                     !txq->stopped) {
-                        ieee80211_stop_queue(sc->hw, hw_queue);
+                        ieee80211_stop_queue(sc->hw, info->hw_queue);
                         txq->stopped = true;
                 }
         }
@@ -2250,15 +2250,14 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
              sc->cur_chan->stopped) && !txctl->force_channel) {
                 if (!txctl->an)
                         txctl->an = &avp->mcast_node;
-                info->flags &= ~IEEE80211_TX_CTL_PS_RESPONSE;
                 queue = true;
+                skip_uapsd = true;
         }
 
         if (txctl->an && queue)
                 tid = ath_get_skb_tid(sc, txctl->an, skb);
 
-        if (info->flags & (IEEE80211_TX_CTL_PS_RESPONSE |
-                           IEEE80211_TX_CTL_TX_OFFCHAN)) {
+        if (!skip_uapsd && (info->flags & IEEE80211_TX_CTL_PS_RESPONSE)) {
                 ath_txq_unlock(sc, txq);
                 txq = sc->tx.uapsdq;
                 ath_txq_lock(sc, txq);
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
index 8b0ac14d5c32..83f47af19280 100644
--- a/drivers/net/wireless/ath/main.c
+++ b/drivers/net/wireless/ath/main.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 
 #include "ath.h"
+#include "trace.h"
 
 MODULE_AUTHOR("Atheros Communications");
 MODULE_DESCRIPTION("Shared library for Atheros wireless LAN cards.");
@@ -84,6 +85,8 @@ void ath_printk(const char *level, const struct ath_common* common,
         else
                 printk("%sath: %pV", level, &vaf);
 
+        trace_ath_log(common->hw->wiphy, &vaf);
+
         va_end(args);
 }
 EXPORT_SYMBOL(ath_printk);
diff --git a/drivers/net/wireless/ath/trace.c b/drivers/net/wireless/ath/trace.c
new file mode 100644
index 000000000000..18fb3a071931
--- /dev/null
+++ b/drivers/net/wireless/ath/trace.c
@@ -0,0 +1,20 @@
+/*
+ * 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 <linux/module.h>
+
+#define CREATE_TRACE_POINTS
+#include "trace.h"
diff --git a/drivers/net/wireless/ath/trace.h b/drivers/net/wireless/ath/trace.h
new file mode 100644
index 000000000000..ba711644d27e
--- /dev/null
+++ b/drivers/net/wireless/ath/trace.h
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+#if !defined(_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_H
+
+#include <linux/tracepoint.h>
+#include "ath.h"
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM ath
+
+#if !defined(CONFIG_ATH_TRACEPOINTS)
+
+#undef TRACE_EVENT
+#define TRACE_EVENT(name, proto, ...) static inline void trace_ ## name(proto) {}
+
+#endif /* CONFIG_ATH_TRACEPOINTS */
+
+TRACE_EVENT(ath_log,
+
+            TP_PROTO(struct wiphy *wiphy,
+                     struct va_format *vaf),
+
+            TP_ARGS(wiphy, vaf),
+
+            TP_STRUCT__entry(
+                    __string(device, wiphy_name(wiphy))
+                    __string(driver, KBUILD_MODNAME)
+                    __dynamic_array(char, msg, ATH_DBG_MAX_LEN)
+            ),
+
+            TP_fast_assign(
+                    __assign_str(device, wiphy_name(wiphy));
+                    __assign_str(driver, KBUILD_MODNAME);
+                    WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
+                                           ATH_DBG_MAX_LEN,
+                                           vaf->fmt,
+                                           *vaf->va) >= ATH_DBG_MAX_LEN);
+            ),
+
+            TP_printk(
+                    "%s %s %s",
+                    __get_str(driver),
+                    __get_str(device),
+                    __get_str(msg)
+            )
+);
+
+#endif /* _TRACE_H || TRACE_HEADER_MULTI_READ */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE trace
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/drivers/net/wireless/ath/wil6210/Makefile b/drivers/net/wireless/ath/wil6210/Makefile
index a471d74ae409..8ad4b5f97e04 100644
--- a/drivers/net/wireless/ath/wil6210/Makefile
+++ b/drivers/net/wireless/ath/wil6210/Makefile
@@ -10,10 +10,12 @@ wil6210-y += interrupt.o
 wil6210-y += txrx.o
 wil6210-y += debug.o
 wil6210-y += rx_reorder.o
+wil6210-y += ioctl.o
 wil6210-y += fw.o
 wil6210-$(CONFIG_WIL6210_TRACING) += trace.o
 wil6210-y += wil_platform.o
 wil6210-$(CONFIG_WIL6210_PLATFORM_MSM) += wil_platform_msm.o
+wil6210-y += ethtool.o
 
 # for tracing framework to find trace.h
 CFLAGS_trace.o := -I$(src)
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index f3a31e8c2535..d9f4b30dd343 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -728,6 +728,8 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
                 wil_print_bcon_data(bcon);
         }
 
+        wil_set_recovery_state(wil, fw_recovery_idle);
+
         mutex_lock(&wil->mutex);
 
         __wil_down(wil);
@@ -775,6 +777,8 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy,
 
         wil_dbg_misc(wil, "%s()\n", __func__);
 
+        wil_set_recovery_state(wil, fw_recovery_idle);
+
         mutex_lock(&wil->mutex);
 
         rc = wmi_pcp_stop(wil);
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index eb2204e5fdd4..54a6ddc6301b 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1041,6 +1041,71 @@ static const struct file_operations fops_info = {
         .llseek         = seq_lseek,
 };
 
+/*---------recovery------------*/
+/* mode = [manual|auto]
+ * state = [idle|pending|running]
+ */
+static ssize_t wil_read_file_recovery(struct file *file, char __user *user_buf,
+                                      size_t count, loff_t *ppos)
+{
+        struct wil6210_priv *wil = file->private_data;
+        char buf[80];
+        int n;
+        static const char * const sstate[] = {"idle", "pending", "running"};
+
+        n = snprintf(buf, sizeof(buf), "mode = %s\nstate = %s\n",
+                     no_fw_recovery ? "manual" : "auto",
+                     sstate[wil->recovery_state]);
+
+        n = min_t(int, n, sizeof(buf));
+
+        return simple_read_from_buffer(user_buf, count, ppos,
+                                       buf, n);
+}
+
+static ssize_t wil_write_file_recovery(struct file *file,
+                                       const char __user *buf_,
+                                       size_t count, loff_t *ppos)
+{
+        struct wil6210_priv *wil = file->private_data;
+        static const char run_command[] = "run";
+        char buf[sizeof(run_command) + 1]; /* to detect "runx" */
+        ssize_t rc;
+
+        if (wil->recovery_state != fw_recovery_pending) {
+                wil_err(wil, "No recovery pending\n");
+                return -EINVAL;
+        }
+
+        if (*ppos != 0) {
+                wil_err(wil, "Offset [%d]\n", (int)*ppos);
+                return -EINVAL;
+        }
+
+        if (count > sizeof(buf)) {
+                wil_err(wil, "Input too long, len = %d\n", (int)count);
+                return -EINVAL;
+        }
+
+        rc = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, buf_, count);
+        if (rc < 0)
+                return rc;
+
+        buf[rc] = '\0';
+        if (0 == strcmp(buf, run_command))
+                wil_set_recovery_state(wil, fw_recovery_running);
+        else
+                wil_err(wil, "Bad recovery command \"%s\"\n", buf);
+
+        return rc;
+}
+
+static const struct file_operations fops_recovery = {
+        .read = wil_read_file_recovery,
+        .write = wil_write_file_recovery,
+        .open  = simple_open,
+};
+
 /*---------Station matrix------------*/
 static void wil_print_rxtid(struct seq_file *s, struct wil_tid_ampdu_rx *r)
 {
@@ -1152,6 +1217,7 @@ static const struct {
         {"freq",        S_IRUGO,                &fops_freq},
         {"link",        S_IRUGO,                &fops_link},
         {"info",        S_IRUGO,                &fops_info},
+        {"recovery",    S_IRUGO | S_IWUSR,      &fops_recovery},
 };
 
 static void wil6210_debugfs_init_files(struct wil6210_priv *wil,
@@ -1194,6 +1260,7 @@ static const struct dbg_off dbg_wil_off[] = {
         WIL_FIELD(status,       S_IRUGO | S_IWUSR,      doff_ulong),
         WIL_FIELD(fw_version,   S_IRUGO,                doff_u32),
         WIL_FIELD(hw_version,   S_IRUGO,                doff_x32),
+        WIL_FIELD(recovery_count, S_IRUGO,              doff_u32),
         {},
 };
 
diff --git a/drivers/net/wireless/ath/wil6210/ethtool.c b/drivers/net/wireless/ath/wil6210/ethtool.c
new file mode 100644
index 000000000000..d686638972be
--- /dev/null
+++ b/drivers/net/wireless/ath/wil6210/ethtool.c
@@ -0,0 +1,103 @@
+/*
+ * 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 <linux/etherdevice.h>
+#include <linux/pci.h>
+#include <linux/rtnetlink.h>
+#include <net/cfg80211.h>
+
+#include "wil6210.h"
+
+static int wil_ethtoolops_begin(struct net_device *ndev)
+{
+        struct wil6210_priv *wil = ndev_to_wil(ndev);
+
+        mutex_lock(&wil->mutex);
+
+        wil_dbg_misc(wil, "%s()\n", __func__);
+
+        return 0;
+}
+
+static void wil_ethtoolops_complete(struct net_device *ndev)
+{
+        struct wil6210_priv *wil = ndev_to_wil(ndev);
+
+        wil_dbg_misc(wil, "%s()\n", __func__);
+
+        mutex_unlock(&wil->mutex);
+}
+
+static int wil_ethtoolops_get_coalesce(struct net_device *ndev,
+                                       struct ethtool_coalesce *cp)
+{
+        struct wil6210_priv *wil = ndev_to_wil(ndev);
+        u32 itr_en, itr_val = 0;
+
+        wil_dbg_misc(wil, "%s()\n", __func__);
+
+        itr_en = ioread32(wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
+        if (itr_en & BIT_DMA_ITR_CNT_CRL_EN)
+                itr_val = ioread32(wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
+
+        cp->rx_coalesce_usecs = itr_val;
+
+        return 0;
+}
+
+static int wil_ethtoolops_set_coalesce(struct net_device *ndev,
+                                       struct ethtool_coalesce *cp)
+{
+        struct wil6210_priv *wil = ndev_to_wil(ndev);
+
+        wil_dbg_misc(wil, "%s(%d usec)\n", __func__, cp->rx_coalesce_usecs);
+
+        if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR) {
+                wil_dbg_misc(wil, "No IRQ coalescing in monitor mode\n");
+                return -EINVAL;
+        }
+
+        /* only @rx_coalesce_usecs supported, ignore
+         * other parameters
+         */
+
+        if (cp->rx_coalesce_usecs > WIL6210_ITR_TRSH_MAX)
+                goto out_bad;
+
+        wil->itr_trsh = cp->rx_coalesce_usecs;
+        wil_set_itr_trsh(wil);
+
+        return 0;
+
+out_bad:
+        wil_dbg_misc(wil, "Unsupported coalescing params. Raw command:\n");
+        print_hex_dump_debug("DBG[MISC] coal ", DUMP_PREFIX_OFFSET, 16, 4,
+                             cp, sizeof(*cp), false);
+        return -EINVAL;
+}
+
+static const struct ethtool_ops wil_ethtool_ops = {
+        .begin          = wil_ethtoolops_begin,
+        .complete       = wil_ethtoolops_complete,
+        .get_drvinfo    = cfg80211_get_drvinfo,
+        .get_coalesce   = wil_ethtoolops_get_coalesce,
+        .set_coalesce   = wil_ethtoolops_set_coalesce,
+};
+
+void wil_set_ethtoolops(struct net_device *ndev)
+{
+        ndev->ethtool_ops = &wil_ethtool_ops;
+}
diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c
index 7269bac111b9..90f416f239bd 100644
--- a/drivers/net/wireless/ath/wil6210/interrupt.c
+++ b/drivers/net/wireless/ath/wil6210/interrupt.c
@@ -157,17 +157,7 @@ void wil_unmask_irq(struct wil6210_priv *wil)
                   offsetof(struct RGF_ICR, ICC));
 
         /* interrupt moderation parameters */
-        if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR) {
-                /* disable interrupt moderation for monitor
-                 * to get better timestamp precision
-                 */
-                iowrite32(0, wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
-        } else {
-                iowrite32(WIL6210_ITR_TRSH,
-                          wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
-                iowrite32(BIT_DMA_ITR_CNT_CRL_EN,
-                          wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
-        }
+        wil_set_itr_trsh(wil);
 
         wil6210_unmask_irq_pseudo(wil);
         wil6210_unmask_irq_tx(wil);
diff --git a/drivers/net/wireless/ath/wil6210/ioctl.c b/drivers/net/wireless/ath/wil6210/ioctl.c
new file mode 100644
index 000000000000..e9c0673819c6
--- /dev/null
+++ b/drivers/net/wireless/ath/wil6210/ioctl.c
@@ -0,0 +1,173 @@
+/*
+ * 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 <linux/uaccess.h>
+
+#include "wil6210.h"
+#include <uapi/linux/wil6210_uapi.h>
+
+#define wil_hex_dump_ioctl(prefix_str, buf, len) \
+        print_hex_dump_debug("DBG[IOC ]" prefix_str, \
+                             DUMP_PREFIX_OFFSET, 16, 1, buf, len, true)
+#define wil_dbg_ioctl(wil, fmt, arg...) wil_dbg(wil, "DBG[IOC ]" fmt, ##arg)
+
+static void __iomem *wil_ioc_addr(struct wil6210_priv *wil, uint32_t addr,
+                                  uint32_t size, enum wil_memio_op op)
+{
+        void __iomem *a;
+        u32 off;
+
+        switch (op & wil_mmio_addr_mask) {
+        case wil_mmio_addr_linker:
+                a = wmi_buffer(wil, cpu_to_le32(addr));
+                break;
+        case wil_mmio_addr_ahb:
+                a = wmi_addr(wil, addr);
+                break;
+        case wil_mmio_addr_bar:
+                a = wmi_addr(wil, addr + WIL6210_FW_HOST_OFF);
+                break;
+        default:
+                wil_err(wil, "Unsupported address mode, op = 0x%08x\n", op);
+                return NULL;
+        }
+
+        off = a - wil->csr;
+        if (size >= WIL6210_MEM_SIZE - off) {
+                wil_err(wil, "Requested block does not fit into memory: "
+                        "off = 0x%08x size = 0x%08x\n", off, size);
+                return NULL;
+        }
+
+        return a;
+}
+
+static int wil_ioc_memio_dword(struct wil6210_priv *wil, void __user *data)
+{
+        struct wil_memio io;
+        void __iomem *a;
+        bool need_copy = false;
+
+        if (copy_from_user(&io, data, sizeof(io)))
+                return -EFAULT;
+
+        wil_dbg_ioctl(wil, "IO: addr = 0x%08x val = 0x%08x op = 0x%08x\n",
+                      io.addr, io.val, io.op);
+
+        a = wil_ioc_addr(wil, io.addr, sizeof(u32), io.op);
+        if (!a) {
+                wil_err(wil, "invalid address 0x%08x, op = 0x%08x\n", io.addr,
+                        io.op);
+                return -EINVAL;
+        }
+        /* operation */
+        switch (io.op & wil_mmio_op_mask) {
+        case wil_mmio_read:
+                io.val = ioread32(a);
+                need_copy = true;
+                break;
+        case wil_mmio_write:
+                iowrite32(io.val, a);
+                wmb(); /* make sure write propagated to HW */
+                break;
+        default:
+                wil_err(wil, "Unsupported operation, op = 0x%08x\n", io.op);
+                return -EINVAL;
+        }
+
+        if (need_copy) {
+                wil_dbg_ioctl(wil, "IO done: addr = 0x%08x"
+                              " val = 0x%08x op = 0x%08x\n",
+                              io.addr, io.val, io.op);
+                if (copy_to_user(data, &io, sizeof(io)))
+                        return -EFAULT;
+        }
+
+        return 0;
+}
+
+static int wil_ioc_memio_block(struct wil6210_priv *wil, void __user *data)
+{
+        struct wil_memio_block io;
+        void *block;
+        void __iomem *a;
+        int rc = 0;
+
+        if (copy_from_user(&io, data, sizeof(io)))
+                return -EFAULT;
+
+        wil_dbg_ioctl(wil, "IO: addr = 0x%08x size = 0x%08x op = 0x%08x\n",
+                      io.addr, io.size, io.op);
+
+        /* size */
+        if (io.size % 4) {
+                wil_err(wil, "size is not multiple of 4:  0x%08x\n", io.size);
+                return -EINVAL;
+        }
+
+        a = wil_ioc_addr(wil, io.addr, io.size, io.op);
+        if (!a) {
+                wil_err(wil, "invalid address 0x%08x, op = 0x%08x\n", io.addr,
+                        io.op);
+                return -EINVAL;
+        }
+
+        block = kmalloc(io.size, GFP_USER);
+        if (!block)
+                return -ENOMEM;
+
+        /* operation */
+        switch (io.op & wil_mmio_op_mask) {
+        case wil_mmio_read:
+                wil_memcpy_fromio_32(block, a, io.size);
+                wil_hex_dump_ioctl("Read  ", block, io.size);
+                if (copy_to_user(io.block, block, io.size)) {
+                        rc = -EFAULT;
+                        goto out_free;
+                }
+                break;
+        case wil_mmio_write:
+                if (copy_from_user(block, io.block, io.size)) {
+                        rc = -EFAULT;
+                        goto out_free;
+                }
+                wil_memcpy_toio_32(a, block, io.size);
+                wmb(); /* make sure write propagated to HW */
+                wil_hex_dump_ioctl("Write ", block, io.size);
+                break;
+        default:
+                wil_err(wil, "Unsupported operation, op = 0x%08x\n", io.op);
+                rc = -EINVAL;
+                break;
+        }
+
+out_free:
+        kfree(block);
+        return rc;
+}
+
+int wil_ioctl(struct wil6210_priv *wil, void __user *data, int cmd)
+{
+        switch (cmd) {
+        case WIL_IOCTL_MEMIO:
+                return wil_ioc_memio_dword(wil, data);
+        case WIL_IOCTL_MEMIO_BLOCK:
+                return wil_ioc_memio_block(wil, data);
+        default:
+                wil_dbg_ioctl(wil, "Unsupported IOCTL 0x%04x\n", cmd);
+                return -ENOIOCTLCMD;
+        }
+}
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 21667e0c3d14..6500caf8d609 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -25,14 +25,19 @@
 #define WAIT_FOR_DISCONNECT_TIMEOUT_MS 2000
 #define WAIT_FOR_DISCONNECT_INTERVAL_MS 10
 
-static bool no_fw_recovery;
+bool no_fw_recovery;
 module_param(no_fw_recovery, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(no_fw_recovery, " disable FW error recovery");
+MODULE_PARM_DESC(no_fw_recovery, " disable automatic FW error recovery");
 
 static bool no_fw_load = true;
 module_param(no_fw_load, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(no_fw_load, " do not download FW, use one in on-card flash.");
 
+static unsigned int itr_trsh = WIL6210_ITR_TRSH_DEFAULT;
+
+module_param(itr_trsh, uint, S_IRUGO);
+MODULE_PARM_DESC(itr_trsh, " Interrupt moderation threshold, usecs.");
+
 #define RST_DELAY (20) /* msec, for loop in @wil_target_reset */
 #define RST_COUNT (1 + 1000/RST_DELAY) /* round up to be above 1 sec total */
 
@@ -186,17 +191,38 @@ static void wil_scan_timer_fn(ulong x)
         schedule_work(&wil->fw_error_worker);
 }
 
+static int wil_wait_for_recovery(struct wil6210_priv *wil)
+{
+        if (wait_event_interruptible(wil->wq, wil->recovery_state !=
+                                     fw_recovery_pending)) {
+                wil_err(wil, "Interrupt, canceling recovery\n");
+                return -ERESTARTSYS;
+        }
+        if (wil->recovery_state != fw_recovery_running) {
+                wil_info(wil, "Recovery cancelled\n");
+                return -EINTR;
+        }
+        wil_info(wil, "Proceed with recovery\n");
+        return 0;
+}
+
+void wil_set_recovery_state(struct wil6210_priv *wil, int state)
+{
+        wil_dbg_misc(wil, "%s(%d -> %d)\n", __func__,
+                     wil->recovery_state, state);
+
+        wil->recovery_state = state;
+        wake_up_interruptible(&wil->wq);
+}
+
 static void wil_fw_error_worker(struct work_struct *work)
 {
-        struct wil6210_priv *wil = container_of(work,
-                        struct wil6210_priv, fw_error_worker);
+        struct wil6210_priv *wil = container_of(work, struct wil6210_priv,
+                                                fw_error_worker);
         struct wireless_dev *wdev = wil->wdev;
 
         wil_dbg_misc(wil, "fw error worker\n");
 
-        if (no_fw_recovery)
-                return;
-
         /* increment @recovery_count if less then WIL6210_FW_RECOVERY_TO
          * passed since last recovery attempt
          */
@@ -219,8 +245,13 @@ static void wil_fw_error_worker(struct work_struct *work)
         case NL80211_IFTYPE_STATION:
         case NL80211_IFTYPE_P2P_CLIENT:
         case NL80211_IFTYPE_MONITOR:
-                wil_info(wil, "fw error recovery started (try %d)...\n",
+                wil_info(wil, "fw error recovery requested (try %d)...\n",
                          wil->recovery_count);
+                if (!no_fw_recovery)
+                        wil->recovery_state = fw_recovery_running;
+                if (0 != wil_wait_for_recovery(wil))
+                        break;
+
                 __wil_down(wil);
                 __wil_up(wil);
                 break;
@@ -297,6 +328,7 @@ int wil_priv_init(struct wil6210_priv *wil)
 
         INIT_LIST_HEAD(&wil->pending_wmi_ev);
         spin_lock_init(&wil->wmi_ev_lock);
+        init_waitqueue_head(&wil->wq);
 
         wil->wmi_wq = create_singlethread_workqueue(WIL_NAME"_wmi");
         if (!wil->wmi_wq)
@@ -309,6 +341,7 @@ int wil_priv_init(struct wil6210_priv *wil)
         }
 
         wil->last_fw_recovery = jiffies;
+        wil->itr_trsh = itr_trsh;
 
         return 0;
 }
@@ -325,6 +358,7 @@ void wil_priv_deinit(struct wil6210_priv *wil)
 {
         wil_dbg_misc(wil, "%s()\n", __func__);
 
+        wil_set_recovery_state(wil, fw_recovery_idle);
         del_timer_sync(&wil->scan_timer);
         cancel_work_sync(&wil->disconnect_worker);
         cancel_work_sync(&wil->fw_error_worker);
@@ -437,6 +471,26 @@ static int wil_target_reset(struct wil6210_priv *wil)
         return 0;
 }
 
+/**
+ * wil_set_itr_trsh: - apply interrupt coalescing params
+ */
+void wil_set_itr_trsh(struct wil6210_priv *wil)
+{
+        /* disable, use usec resolution */
+        W(RGF_DMA_ITR_CNT_CRL, BIT_DMA_ITR_CNT_CRL_EXT_TICK);
+
+        /* disable interrupt moderation for monitor
+         * to get better timestamp precision
+         */
+        if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR)
+                return;
+
+        wil_info(wil, "set ITR_TRSH = %d usec\n", wil->itr_trsh);
+        W(RGF_DMA_ITR_CNT_TRSH, wil->itr_trsh);
+        W(RGF_DMA_ITR_CNT_CRL, BIT_DMA_ITR_CNT_CRL_EN |
+          BIT_DMA_ITR_CNT_CRL_EXT_TICK); /* start it */
+}
+
 #undef R
 #undef W
 #undef S
@@ -547,6 +601,7 @@ int wil_reset(struct wil6210_priv *wil)
 void wil_fw_error_recovery(struct wil6210_priv *wil)
 {
         wil_dbg_misc(wil, "starting fw error recovery\n");
+        wil->recovery_state = fw_recovery_pending;
         schedule_work(&wil->fw_error_worker);
 }
 
@@ -698,6 +753,7 @@ int wil_down(struct wil6210_priv *wil)
 
         wil_dbg_misc(wil, "%s()\n", __func__);
 
+        wil_set_recovery_state(wil, fw_recovery_idle);
         mutex_lock(&wil->mutex);
         rc = __wil_down(wil);
         mutex_unlock(&wil->mutex);
diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index 1c0c77d9a14f..239965106c05 100644
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -52,6 +52,17 @@ static int wil_change_mtu(struct net_device *ndev, int new_mtu)
         return 0;
 }
 
+static int wil_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
+{
+        struct wil6210_priv *wil = ndev_to_wil(ndev);
+
+        int ret = wil_ioctl(wil, ifr->ifr_data, cmd);
+
+        wil_dbg_misc(wil, "ioctl(0x%04x) -> %d\n", cmd, ret);
+
+        return ret;
+}
+
 static const struct net_device_ops wil_netdev_ops = {
         .ndo_open               = wil_open,
         .ndo_stop               = wil_stop,
@@ -59,6 +70,7 @@ static const struct net_device_ops wil_netdev_ops = {
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_change_mtu         = wil_change_mtu,
+        .ndo_do_ioctl           = wil_do_ioctl,
 };
 
 static int wil6210_netdev_poll_rx(struct napi_struct *napi, int budget)
@@ -149,6 +161,7 @@ void *wil_if_alloc(struct device *dev, void __iomem *csr)
         }
 
         ndev->netdev_ops = &wil_netdev_ops;
+        wil_set_ethtoolops(ndev);
         ndev->ieee80211_ptr = wdev;
         ndev->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM |
                             NETIF_F_SG | NETIF_F_GRO;
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 41aa79327584..ce6488e42091 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -23,6 +23,7 @@
 #include <linux/timex.h>
 #include "wil_platform.h"
 
+extern bool no_fw_recovery;
 
 #define WIL_NAME "wil6210"
 #define WIL_FW_NAME "wil6210.fw"
@@ -52,7 +53,9 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1)
 #define WIL6210_MAX_TX_RINGS    (24) /* HW limit */
 #define WIL6210_MAX_CID         (8) /* HW limit */
 #define WIL6210_NAPI_BUDGET     (16) /* arbitrary */
-#define WIL6210_ITR_TRSH        (10000) /* arbitrary - about 15 IRQs/msec */
+/* Max supported by wil6210 value for interrupt threshold is 5sec. */
+#define WIL6210_ITR_TRSH_MAX (5000000)
+#define WIL6210_ITR_TRSH_DEFAULT        (300) /* usec */
 #define WIL6210_FW_RECOVERY_RETRIES     (5) /* try to recover this many times */
 #define WIL6210_FW_RECOVERY_TO  msecs_to_jiffies(5000)
 #define WIL6210_SCAN_TO         msecs_to_jiffies(10000)
@@ -377,6 +380,12 @@ struct wil_sta_info {
         unsigned long tid_rx_stop_requested[BITS_TO_LONGS(WIL_STA_TID_NUM)];
 };
 
+enum {
+        fw_recovery_idle = 0,
+        fw_recovery_pending = 1,
+        fw_recovery_running = 2,
+};
+
 struct wil6210_priv {
         struct pci_dev *pdev;
         int n_msi;
@@ -387,12 +396,15 @@ struct wil6210_priv {
         u32 hw_version;
         struct wil_board *board;
         u8 n_mids; /* number of additional MIDs as reported by FW */
-        int recovery_count; /* num of FW recovery attempts in a short time */
+        u32 recovery_count; /* num of FW recovery attempts in a short time */
+        u32 recovery_state; /* FW recovery state machine */
         unsigned long last_fw_recovery; /* jiffies of last fw recovery */
+        wait_queue_head_t wq; /* for all wait_event() use */
         /* profile */
         u32 monitor_flags;
         u32 secure_pcp; /* create secure PCP? */
         int sinfo_gen;
+        u32 itr_trsh;
         /* cached ISR registers */
         u32 isr_misc;
         /* mailbox related */
@@ -502,7 +514,9 @@ void wil_if_remove(struct wil6210_priv *wil);
 int wil_priv_init(struct wil6210_priv *wil);
 void wil_priv_deinit(struct wil6210_priv *wil);
 int wil_reset(struct wil6210_priv *wil);
+void wil_set_itr_trsh(struct wil6210_priv *wil);
 void wil_fw_error_recovery(struct wil6210_priv *wil);
+void wil_set_recovery_state(struct wil6210_priv *wil, int state);
 void wil_link_on(struct wil6210_priv *wil);
 void wil_link_off(struct wil6210_priv *wil);
 int wil_up(struct wil6210_priv *wil);
@@ -511,6 +525,7 @@ int wil_down(struct wil6210_priv *wil);
 int __wil_down(struct wil6210_priv *wil);
 void wil_mbox_ring_le2cpus(struct wil6210_mbox_ring *r);
 int wil_find_cid(struct wil6210_priv *wil, const u8 *mac);
+void wil_set_ethtoolops(struct net_device *ndev);
 
 void __iomem *wmi_buffer(struct wil6210_priv *wil, __le32 ptr);
 void __iomem *wmi_addr(struct wil6210_priv *wil, u32 ptr);
@@ -580,5 +595,7 @@ void wil6210_unmask_irq_rx(struct wil6210_priv *wil);
 
 int wil_iftype_nl2wmi(enum nl80211_iftype type);
 
+int wil_ioctl(struct wil6210_priv *wil, void __user *data, int cmd);
 int wil_request_firmware(struct wil6210_priv *wil, const char *name);
+
 #endif /* __WIL6210_H__ */
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index bd781c7adf2a..4311df982c60 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -299,6 +299,7 @@ static void wmi_evt_fw_ready(struct wil6210_priv *wil, int id, void *d,
 {
         wil_dbg_wmi(wil, "WMI: got FW ready event\n");
 
+        wil_set_recovery_state(wil, fw_recovery_idle);
         set_bit(wil_status_fwready, &wil->status);
         /* let the reset sequence continue */
         complete(&wil->wmi_ready);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index 3122b86050a1..80e73a1262be 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -67,6 +67,7 @@ struct brcmf_bus_dcmd {
  * @txctl: transmit a control request message to dongle.
  * @rxctl: receive a control response message from dongle.
  * @gettxq: obtain a reference of bus transmit queue (optional).
+ * @wowl_config: specify if dongle is configured for wowl when going to suspend
  *
  * This structure provides an abstract interface towards the
  * bus specific driver. For control messages to common driver
@@ -80,6 +81,7 @@ struct brcmf_bus_ops {
         int (*txctl)(struct device *dev, unsigned char *msg, uint len);
         int (*rxctl)(struct device *dev, unsigned char *msg, uint len);
         struct pktq * (*gettxq)(struct device *dev);
+        void (*wowl_config)(struct device *dev, bool enabled);
 };
 
 
@@ -114,6 +116,7 @@ struct brcmf_bus_msgbuf {
  * @dstats: dongle-based statistical data.
  * @dcmd_list: bus/device specific dongle initialization commands.
  * @chip: device identifier of the dongle chip.
+ * @wowl_supported: is wowl supported by bus driver.
  * @chiprev: revision of the dongle chip.
  */
 struct brcmf_bus {
@@ -131,6 +134,7 @@ struct brcmf_bus {
         u32 chip;
         u32 chiprev;
         bool always_use_fws_queue;
+        bool wowl_supported;
 
         struct brcmf_bus_ops *ops;
         struct brcmf_bus_msgbuf *msgbuf;
@@ -177,6 +181,13 @@ struct pktq *brcmf_bus_gettxq(struct brcmf_bus *bus)
         return bus->ops->gettxq(bus->dev);
 }
 
+static inline
+void brcmf_bus_wowl_config(struct brcmf_bus *bus, bool enabled)
+{
+        if (bus->ops->wowl_config)
+                bus->ops->wowl_config(bus->dev, enabled);
+}
+
 static inline bool brcmf_bus_ready(struct brcmf_bus *bus)
 {
         return bus->state == BRCMF_BUS_LOAD || bus->state == BRCMF_BUS_DATA;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/brcm80211/brcmfmac/feature.c
index 50877e3c5d2f..aed53acef456 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/feature.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.c
@@ -107,6 +107,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
         struct brcmf_if *ifp = drvr->iflist[0];
 
         brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MCHAN, "mchan");
+        if (drvr->bus_if->wowl_supported)
+                brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl");
 
         /* set chip related quirks */
         switch (drvr->bus_if->chip) {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.h b/drivers/net/wireless/brcm80211/brcmfmac/feature.h
index 961d175f8afb..b9a796d0a44d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/feature.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.h
@@ -22,7 +22,8 @@
  * MCHAN: multi-channel for concurrent P2P.
  */
 #define BRCMF_FEAT_LIST \
-        BRCMF_FEAT_DEF(MCHAN)
+        BRCMF_FEAT_DEF(MCHAN) \
+        BRCMF_FEAT_DEF(WOWL)
 /*
  * Quirks:
  *
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/flowring.c b/drivers/net/wireless/brcm80211/brcmfmac/flowring.c
index a1016b811284..1faa929f5fff 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/flowring.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/flowring.c
@@ -354,7 +354,7 @@ struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings)
         struct brcmf_flowring *flow;
         u32 i;
 
-        flow = kzalloc(sizeof(*flow), GFP_ATOMIC);
+        flow = kzalloc(sizeof(*flow), GFP_KERNEL);
         if (flow) {
                 flow->dev = dev;
                 flow->nrofrings = nrofrings;
@@ -364,7 +364,7 @@ struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings)
                 for (i = 0; i < ARRAY_SIZE(flow->hash); i++)
                         flow->hash[i].ifidx = BRCMF_FLOWRING_INVALID_IFIDX;
                 flow->rings = kcalloc(nrofrings, sizeof(*flow->rings),
-                                      GFP_ATOMIC);
+                                      GFP_KERNEL);
                 if (!flow->rings) {
                         kfree(flow);
                         flow = NULL;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
index 2bc68a2137fc..5ff5cd0bb032 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
@@ -53,6 +53,62 @@
 #define BRCMF_OBSS_COEX_OFF             0
 #define BRCMF_OBSS_COEX_ON              1
 
+/* WOWL bits */
+/* Wakeup on Magic packet: */
+#define WL_WOWL_MAGIC                   (1 << 0)
+/* Wakeup on Netpattern */
+#define WL_WOWL_NET                     (1 << 1)
+/* Wakeup on loss-of-link due to Disassoc/Deauth: */
+#define WL_WOWL_DIS                     (1 << 2)
+/* Wakeup on retrograde TSF: */
+#define WL_WOWL_RETR                    (1 << 3)
+/* Wakeup on loss of beacon: */
+#define WL_WOWL_BCN                     (1 << 4)
+/* Wakeup after test: */
+#define WL_WOWL_TST                     (1 << 5)
+/* Wakeup after PTK refresh: */
+#define WL_WOWL_M1                      (1 << 6)
+/* Wakeup after receipt of EAP-Identity Req: */
+#define WL_WOWL_EAPID                   (1 << 7)
+/* Wakeind via PME(0) or GPIO(1): */
+#define WL_WOWL_PME_GPIO                (1 << 8)
+/* need tkip phase 1 key to be updated by the driver: */
+#define WL_WOWL_NEEDTKIP1               (1 << 9)
+/* enable wakeup if GTK fails: */
+#define WL_WOWL_GTK_FAILURE             (1 << 10)
+/* support extended magic packets: */
+#define WL_WOWL_EXTMAGPAT               (1 << 11)
+/* support ARP/NS/keepalive offloading: */
+#define WL_WOWL_ARPOFFLOAD              (1 << 12)
+/* read protocol version for EAPOL frames: */
+#define WL_WOWL_WPA2                    (1 << 13)
+/* If the bit is set, use key rotaton: */
+#define WL_WOWL_KEYROT                  (1 << 14)
+/* If the bit is set, frm received was bcast frame: */
+#define WL_WOWL_BCAST                   (1 << 15)
+/* If the bit is set, scan offload is enabled: */
+#define WL_WOWL_SCANOL                  (1 << 16)
+/* Wakeup on tcpkeep alive timeout: */
+#define WL_WOWL_TCPKEEP_TIME            (1 << 17)
+/* Wakeup on mDNS Conflict Resolution: */
+#define WL_WOWL_MDNS_CONFLICT           (1 << 18)
+/* Wakeup on mDNS Service Connect: */
+#define WL_WOWL_MDNS_SERVICE            (1 << 19)
+/* tcp keepalive got data: */
+#define WL_WOWL_TCPKEEP_DATA            (1 << 20)
+/* Firmware died in wowl mode: */
+#define WL_WOWL_FW_HALT                 (1 << 21)
+/* Enable detection of radio button changes: */
+#define WL_WOWL_ENAB_HWRADIO            (1 << 22)
+/* Offloads detected MIC failure(s): */
+#define WL_WOWL_MIC_FAIL                (1 << 23)
+/* Wakeup in Unassociated state (Net/Magic Pattern): */
+#define WL_WOWL_UNASSOC                 (1 << 24)
+/* Wakeup if received matched secured pattern: */
+#define WL_WOWL_SECURE                  (1 << 25)
+/* Link Down indication in WoWL mode: */
+#define WL_WOWL_LINKDOWN                (1 << 31)
+
 /* join preference types for join_pref iovar */
 enum brcmf_join_pref_types {
         BRCMF_JOIN_PREF_RSSI = 1,
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index d42f7d04b65f..183f08d7fc8c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -1636,7 +1636,7 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
         if (!signal_len)
                 return 0;
         /* if flow control disabled, skip to packet data and leave */
-        if (!fws->fw_signals) {
+        if ((!fws) || (!fws->fw_signals)) {
                 skb_pull(skb, signal_len);
                 return 0;
         }
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
index 8f8b9373de95..11cc051f97cd 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
@@ -208,6 +208,14 @@ struct msgbuf_flowring_flush_resp {
         __le32                          rsvd0[3];
 };
 
+struct brcmf_msgbuf_work_item {
+        struct list_head queue;
+        u32 flowid;
+        int ifidx;
+        u8 sa[ETH_ALEN];
+        u8 da[ETH_ALEN];
+};
+
 struct brcmf_msgbuf {
         struct brcmf_pub *drvr;
 
@@ -230,7 +238,7 @@ struct brcmf_msgbuf {
         dma_addr_t ioctbuf_handle;
         u32 ioctbuf_phys_hi;
         u32 ioctbuf_phys_lo;
-        u32 ioctl_resp_status;
+        int ioctl_resp_status;
         u32 ioctl_resp_ret_len;
         u32 ioctl_resp_pktid;
 
@@ -248,6 +256,10 @@ struct brcmf_msgbuf {
         struct work_struct txflow_work;
         unsigned long *flow_map;
         unsigned long *txstatus_done_map;
+
+        struct work_struct flowring_work;
+        spinlock_t flowring_work_lock;
+        struct list_head work_queue;
 };
 
 struct brcmf_msgbuf_pktid {
@@ -284,11 +296,11 @@ brcmf_msgbuf_init_pktids(u32 nr_array_entries,
         struct brcmf_msgbuf_pktid *array;
         struct brcmf_msgbuf_pktids *pktids;
 
-        array = kcalloc(nr_array_entries, sizeof(*array), GFP_ATOMIC);
+        array = kcalloc(nr_array_entries, sizeof(*array), GFP_KERNEL);
         if (!array)
                 return NULL;
 
-        pktids = kzalloc(sizeof(*pktids), GFP_ATOMIC);
+        pktids = kzalloc(sizeof(*pktids), GFP_KERNEL);
         if (!pktids) {
                 kfree(array);
                 return NULL;
@@ -544,11 +556,29 @@ brcmf_msgbuf_remove_flowring(struct brcmf_msgbuf *msgbuf, u16 flowid)
 }
 
 
-static u32 brcmf_msgbuf_flowring_create(struct brcmf_msgbuf *msgbuf, int ifidx,
-                                        struct sk_buff *skb)
+static struct brcmf_msgbuf_work_item *
+brcmf_msgbuf_dequeue_work(struct brcmf_msgbuf *msgbuf)
+{
+        struct brcmf_msgbuf_work_item *work = NULL;
+        ulong flags;
+
+        spin_lock_irqsave(&msgbuf->flowring_work_lock, flags);
+        if (!list_empty(&msgbuf->work_queue)) {
+                work = list_first_entry(&msgbuf->work_queue,
+                                        struct brcmf_msgbuf_work_item, queue);
+                list_del(&work->queue);
+        }
+        spin_unlock_irqrestore(&msgbuf->flowring_work_lock, flags);
+
+        return work;
+}
+
+
+static u32
+brcmf_msgbuf_flowring_create_worker(struct brcmf_msgbuf *msgbuf,
+                                    struct brcmf_msgbuf_work_item *work)
 {
         struct msgbuf_tx_flowring_create_req *create;
-        struct ethhdr *eh = (struct ethhdr *)(skb->data);
         struct brcmf_commonring *commonring;
         void *ret_ptr;
         u32 flowid;
@@ -557,16 +587,11 @@ static u32 brcmf_msgbuf_flowring_create(struct brcmf_msgbuf *msgbuf, int ifidx,
         long long address;
         int err;
 
-        flowid = brcmf_flowring_create(msgbuf->flow, eh->h_dest,
-                                       skb->priority, ifidx);
-        if (flowid == BRCMF_FLOWRING_INVALID_ID)
-                return flowid;
-
+        flowid = work->flowid;
         dma_sz = BRCMF_H2D_TXFLOWRING_MAX_ITEM * BRCMF_H2D_TXFLOWRING_ITEMSIZE;
-
         dma_buf = dma_alloc_coherent(msgbuf->drvr->bus_if->dev, dma_sz,
                                      &msgbuf->flowring_dma_handle[flowid],
-                                     GFP_ATOMIC);
+                                     GFP_KERNEL);
         if (!dma_buf) {
                 brcmf_err("dma_alloc_coherent failed\n");
                 brcmf_flowring_delete(msgbuf->flow, flowid);
@@ -589,13 +614,13 @@ static u32 brcmf_msgbuf_flowring_create(struct brcmf_msgbuf *msgbuf, int ifidx,
 
         create = (struct msgbuf_tx_flowring_create_req *)ret_ptr;
         create->msg.msgtype = MSGBUF_TYPE_FLOW_RING_CREATE;
-        create->msg.ifidx = ifidx;
+        create->msg.ifidx = work->ifidx;
         create->msg.request_id = 0;
         create->tid = brcmf_flowring_tid(msgbuf->flow, flowid);
         create->flow_ring_id = cpu_to_le16(flowid +
                                            BRCMF_NROF_H2D_COMMON_MSGRINGS);
-        memcpy(create->sa, eh->h_source, ETH_ALEN);
-        memcpy(create->da, eh->h_dest, ETH_ALEN);
+        memcpy(create->sa, work->sa, ETH_ALEN);
+        memcpy(create->da, work->da, ETH_ALEN);
         address = (long long)(long)msgbuf->flowring_dma_handle[flowid];
         create->flow_ring_addr.high_addr = cpu_to_le32(address >> 32);
         create->flow_ring_addr.low_addr = cpu_to_le32(address & 0xffffffff);
@@ -603,7 +628,7 @@ static u32 brcmf_msgbuf_flowring_create(struct brcmf_msgbuf *msgbuf, int ifidx,
         create->len_item = cpu_to_le16(BRCMF_H2D_TXFLOWRING_ITEMSIZE);
 
         brcmf_dbg(MSGBUF, "Send Flow Create Req flow ID %d for peer %pM prio %d ifindex %d\n",
-                  flowid, eh->h_dest, create->tid, ifidx);
+                  flowid, work->da, create->tid, work->ifidx);
 
         err = brcmf_commonring_write_complete(commonring);
         brcmf_commonring_unlock(commonring);
@@ -617,6 +642,53 @@ static u32 brcmf_msgbuf_flowring_create(struct brcmf_msgbuf *msgbuf, int ifidx,
 }
 
 
+static void brcmf_msgbuf_flowring_worker(struct work_struct *work)
+{
+        struct brcmf_msgbuf *msgbuf;
+        struct brcmf_msgbuf_work_item *create;
+
+        msgbuf = container_of(work, struct brcmf_msgbuf, flowring_work);
+
+        while ((create = brcmf_msgbuf_dequeue_work(msgbuf))) {
+                brcmf_msgbuf_flowring_create_worker(msgbuf, create);
+                kfree(create);
+        }
+}
+
+
+static u32 brcmf_msgbuf_flowring_create(struct brcmf_msgbuf *msgbuf, int ifidx,
+                                        struct sk_buff *skb)
+{
+        struct brcmf_msgbuf_work_item *create;
+        struct ethhdr *eh = (struct ethhdr *)(skb->data);
+        u32 flowid;
+        ulong flags;
+
+        create = kzalloc(sizeof(*create), GFP_ATOMIC);
+        if (create == NULL)
+                return BRCMF_FLOWRING_INVALID_ID;
+
+        flowid = brcmf_flowring_create(msgbuf->flow, eh->h_dest,
+                                       skb->priority, ifidx);
+        if (flowid == BRCMF_FLOWRING_INVALID_ID) {
+                kfree(create);
+                return flowid;
+        }
+
+        create->flowid = flowid;
+        create->ifidx = ifidx;
+        memcpy(create->sa, eh->h_source, ETH_ALEN);
+        memcpy(create->da, eh->h_dest, ETH_ALEN);
+
+        spin_lock_irqsave(&msgbuf->flowring_work_lock, flags);
+        list_add_tail(&create->queue, &msgbuf->work_queue);
+        spin_unlock_irqrestore(&msgbuf->flowring_work_lock, flags);
+        schedule_work(&msgbuf->flowring_work);
+
+        return flowid;
+}
+
+
 static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u8 flowid)
 {
         struct brcmf_flowring *flow = msgbuf->flow;
@@ -767,7 +839,8 @@ brcmf_msgbuf_process_ioctl_complete(struct brcmf_msgbuf *msgbuf, void *buf)
 
         ioctl_resp = (struct msgbuf_ioctl_resp_hdr *)buf;
 
-        msgbuf->ioctl_resp_status = le16_to_cpu(ioctl_resp->compl_hdr.status);
+        msgbuf->ioctl_resp_status =
+                        (s16)le16_to_cpu(ioctl_resp->compl_hdr.status);
         msgbuf->ioctl_resp_ret_len = le16_to_cpu(ioctl_resp->resp_len);
         msgbuf->ioctl_resp_pktid = le32_to_cpu(ioctl_resp->msg.request_id);
 
@@ -1271,7 +1344,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
         u32 count;
 
         if_msgbuf = drvr->bus_if->msgbuf;
-        msgbuf = kzalloc(sizeof(*msgbuf), GFP_ATOMIC);
+        msgbuf = kzalloc(sizeof(*msgbuf), GFP_KERNEL);
         if (!msgbuf)
                 goto fail;
 
@@ -1282,11 +1355,11 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
         }
         INIT_WORK(&msgbuf->txflow_work, brcmf_msgbuf_txflow_worker);
         count = BITS_TO_LONGS(if_msgbuf->nrof_flowrings);
-        msgbuf->flow_map = kzalloc(count, GFP_ATOMIC);
+        msgbuf->flow_map = kzalloc(count, GFP_KERNEL);
         if (!msgbuf->flow_map)
                 goto fail;
 
-        msgbuf->txstatus_done_map = kzalloc(count, GFP_ATOMIC);
+        msgbuf->txstatus_done_map = kzalloc(count, GFP_KERNEL);
         if (!msgbuf->txstatus_done_map)
                 goto fail;
 
@@ -1294,7 +1367,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
         msgbuf->ioctbuf = dma_alloc_coherent(drvr->bus_if->dev,
                                              BRCMF_TX_IOCTL_MAX_MSG_SIZE,
                                              &msgbuf->ioctbuf_handle,
-                                             GFP_ATOMIC);
+                                             GFP_KERNEL);
         if (!msgbuf->ioctbuf)
                 goto fail;
         address = (long long)(long)msgbuf->ioctbuf_handle;
@@ -1317,7 +1390,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
         msgbuf->flowrings = (struct brcmf_commonring **)if_msgbuf->flowrings;
         msgbuf->nrof_flowrings = if_msgbuf->nrof_flowrings;
         msgbuf->flowring_dma_handle = kzalloc(msgbuf->nrof_flowrings *
-                sizeof(*msgbuf->flowring_dma_handle), GFP_ATOMIC);
+                sizeof(*msgbuf->flowring_dma_handle), GFP_KERNEL);
         if (!msgbuf->flowring_dma_handle)
                 goto fail;
 
@@ -1357,6 +1430,10 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
         brcmf_msgbuf_rxbuf_event_post(msgbuf);
         brcmf_msgbuf_rxbuf_ioctlresp_post(msgbuf);
 
+        INIT_WORK(&msgbuf->flowring_work, brcmf_msgbuf_flowring_worker);
+        spin_lock_init(&msgbuf->flowring_work_lock);
+        INIT_LIST_HEAD(&msgbuf->work_queue);
+
         return 0;
 
 fail:
@@ -1379,11 +1456,19 @@ fail:
 void brcmf_proto_msgbuf_detach(struct brcmf_pub *drvr)
 {
         struct brcmf_msgbuf *msgbuf;
+        struct brcmf_msgbuf_work_item *work;
 
         brcmf_dbg(TRACE, "Enter\n");
         if (drvr->proto->pd) {
                 msgbuf = (struct brcmf_msgbuf *)drvr->proto->pd;
-
+                cancel_work_sync(&msgbuf->flowring_work);
+                while (!list_empty(&msgbuf->work_queue)) {
+                        work = list_first_entry(&msgbuf->work_queue,
+                                                struct brcmf_msgbuf_work_item,
+                                                queue);
+                        list_del(&work->queue);
+                        kfree(work);
+                }
                 kfree(msgbuf->flow_map);
                 kfree(msgbuf->txstatus_done_map);
                 if (msgbuf->txflow_wq)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 1d78a91db594..d54c58a32faa 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -440,8 +440,11 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
 
         /* In case of COB type, firmware has default mac address
          * After Initializing firmware, we have to set current mac address to
-         * firmware for P2P device address
+         * firmware for P2P device address. This must be done with discovery
+         * disabled.
          */
+        brcmf_fil_iovar_int_set(ifp, "p2p_disc", 0);
+
         ret = brcmf_fil_iovar_data_set(ifp, "p2p_da_override", p2p_mac,
                                        ETH_ALEN);
         if (ret)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
index e5101b287e4e..8c0632ec9f7a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
@@ -165,6 +165,8 @@ enum brcmf_pcie_state {
 
 #define BRCMF_H2D_HOST_D3_INFORM                0x00000001
 #define BRCMF_H2D_HOST_DS_ACK                   0x00000002
+#define BRCMF_H2D_HOST_D0_INFORM_IN_USE         0x00000008
+#define BRCMF_H2D_HOST_D0_INFORM                0x00000010
 
 #define BRCMF_PCIE_MBDATA_TIMEOUT               2000
 
@@ -243,6 +245,7 @@ struct brcmf_pciedev_info {
         wait_queue_head_t mbdata_resp_wait;
         bool mbdata_completed;
         bool irq_allocated;
+        bool wowl_enabled;
 };
 
 struct brcmf_pcie_ringbuf {
@@ -537,7 +540,7 @@ static int brcmf_pcie_exit_download_state(struct brcmf_pciedev_info *devinfo,
 }
 
 
-static void
+static int
 brcmf_pcie_send_mb_data(struct brcmf_pciedev_info *devinfo, u32 htod_mb_data)
 {
         struct brcmf_pcie_shared_info *shared;
@@ -558,13 +561,15 @@ brcmf_pcie_send_mb_data(struct brcmf_pciedev_info *devinfo, u32 htod_mb_data)
                 msleep(10);
                 i++;
                 if (i > 100)
-                        break;
+                        return -EIO;
                 cur_htod_mb_data = brcmf_pcie_read_tcm32(devinfo, addr);
         }
 
         brcmf_pcie_write_tcm32(devinfo, addr, htod_mb_data);
         pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_SBMBX, 1);
         pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_SBMBX, 1);
+
+        return 0;
 }
 
 
@@ -1229,11 +1234,27 @@ static int brcmf_pcie_rx_ctlpkt(struct device *dev, unsigned char *msg,
 }
 
 
+static void brcmf_pcie_wowl_config(struct device *dev, bool enabled)
+{
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_pciedev *buspub = bus_if->bus_priv.pcie;
+        struct brcmf_pciedev_info *devinfo = buspub->devinfo;
+
+        brcmf_dbg(PCIE, "Configuring WOWL, enabled=%d\n", enabled);
+        devinfo->wowl_enabled = enabled;
+        if (enabled)
+                device_set_wakeup_enable(&devinfo->pdev->dev, true);
+        else
+                device_set_wakeup_enable(&devinfo->pdev->dev, false);
+}
+
+
 static struct brcmf_bus_ops brcmf_pcie_bus_ops = {
         .txdata = brcmf_pcie_tx,
         .stop = brcmf_pcie_down,
         .txctl = brcmf_pcie_tx_ctlpkt,
         .rxctl = brcmf_pcie_rx_ctlpkt,
+        .wowl_config = brcmf_pcie_wowl_config,
 };
 
 
@@ -1668,6 +1689,7 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         bus->ops = &brcmf_pcie_bus_ops;
         bus->proto_type = BRCMF_PROTO_MSGBUF;
         bus->chip = devinfo->coreid;
+        bus->wowl_supported = pci_pme_capable(pdev, PCI_D3hot);
         dev_set_drvdata(&pdev->dev, bus);
 
         ret = brcmf_pcie_get_fwnames(devinfo);
@@ -1759,36 +1781,62 @@ static int brcmf_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
                 brcmf_err("Timeout on response for entering D3 substate\n");
                 return -EIO;
         }
-        brcmf_pcie_release_irq(devinfo);
+        brcmf_pcie_send_mb_data(devinfo, BRCMF_H2D_HOST_D0_INFORM_IN_USE);
 
         err = pci_save_state(pdev);
-        if (err) {
+        if (err)
                 brcmf_err("pci_save_state failed, err=%d\n", err);
-                return err;
+        if ((err) || (!devinfo->wowl_enabled)) {
+                brcmf_chip_detach(devinfo->ci);
+                devinfo->ci = NULL;
+                brcmf_pcie_remove(pdev);
+                return 0;
         }
 
-        brcmf_chip_detach(devinfo->ci);
-        devinfo->ci = NULL;
-
-        brcmf_pcie_remove(pdev);
-
         return pci_prepare_to_sleep(pdev);
 }
 
-
 static int brcmf_pcie_resume(struct pci_dev *pdev)
 {
+        struct brcmf_pciedev_info *devinfo;
+        struct brcmf_bus *bus;
         int err;
 
-        brcmf_dbg(PCIE, "Enter, pdev=%p\n", pdev);
+        bus = dev_get_drvdata(&pdev->dev);
+        brcmf_dbg(PCIE, "Enter, pdev=%p, bus=%p\n", pdev, bus);
 
         err = pci_set_power_state(pdev, PCI_D0);
         if (err) {
                 brcmf_err("pci_set_power_state failed, err=%d\n", err);
-                return err;
+                goto cleanup;
         }
         pci_restore_state(pdev);
+        pci_enable_wake(pdev, PCI_D3hot, false);
+        pci_enable_wake(pdev, PCI_D3cold, false);
+
+        /* Check if device is still up and running, if so we are ready */
+        if (bus) {
+                devinfo = bus->bus_priv.pcie->devinfo;
+                if (brcmf_pcie_read_reg32(devinfo,
+                                          BRCMF_PCIE_PCIE2REG_INTMASK) != 0) {
+                        if (brcmf_pcie_send_mb_data(devinfo,
+                                                    BRCMF_H2D_HOST_D0_INFORM))
+                                goto cleanup;
+                        brcmf_dbg(PCIE, "Hot resume, continue....\n");
+                        brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2);
+                        brcmf_bus_change_state(bus, BRCMF_BUS_DATA);
+                        brcmf_pcie_intr_enable(devinfo);
+                        return 0;
+                }
+        }
 
+cleanup:
+        if (bus) {
+                devinfo = bus->bus_priv.pcie->devinfo;
+                brcmf_chip_detach(devinfo->ci);
+                devinfo->ci = NULL;
+                brcmf_pcie_remove(pdev);
+        }
         err = brcmf_pcie_probe(pdev, NULL);
         if (err)
                 brcmf_err("probe after resume failed, err=%d\n", err);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 1db11b00001c..28fa25b509db 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -37,6 +37,7 @@
 #include "fwil.h"
 #include "proto.h"
 #include "vendor.h"
+#include "dhd_bus.h"
 
 #define BRCMF_SCAN_IE_LEN_MAX           2048
 #define BRCMF_PNO_VERSION               2
@@ -2429,7 +2430,7 @@ static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg)
         s32 err = 0;
         int i;
 
-        bss_list = cfg->bss_list;
+        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",
@@ -2605,6 +2606,7 @@ static void brcmf_cfg80211_escan_timeout_worker(struct work_struct *work)
                         container_of(work, struct brcmf_cfg80211_info,
                                      escan_timeout_work);
 
+        brcmf_inform_bss(cfg);
         brcmf_notify_escan_complete(cfg, cfg->escan_info.ifp, true, true);
 }
 
@@ -2743,12 +2745,9 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
                 if (brcmf_p2p_scan_finding_common_channel(cfg, NULL))
                         goto exit;
                 if (cfg->scan_request) {
-                        cfg->bss_list = (struct brcmf_scan_results *)
-                                cfg->escan_info.escan_buf;
                         brcmf_inform_bss(cfg);
                         aborted = status != BRCMF_E_STATUS_SUCCESS;
-                        brcmf_notify_escan_complete(cfg, ifp, aborted,
-                                                    false);
+                        brcmf_notify_escan_complete(cfg, ifp, aborted, false);
                 } else
                         brcmf_dbg(SCAN, "Ignored scan complete result 0x%x\n",
                                   status);
@@ -2782,50 +2781,91 @@ static __always_inline void brcmf_delay(u32 ms)
 
 static s32 brcmf_cfg80211_resume(struct wiphy *wiphy)
 {
+        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+        struct net_device *ndev = cfg_to_ndev(cfg);
+        struct brcmf_if *ifp = netdev_priv(ndev);
+
         brcmf_dbg(TRACE, "Enter\n");
 
+        if (cfg->wowl_enabled) {
+                brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM,
+                                      cfg->pre_wowl_pmmode);
+                brcmf_fil_iovar_data_set(ifp, "wowl_pattern", "clr", 4);
+                brcmf_fil_iovar_int_set(ifp, "wowl_clear", 0);
+                cfg->wowl_enabled = false;
+        }
         return 0;
 }
 
+static void brcmf_configure_wowl(struct brcmf_cfg80211_info *cfg,
+                                 struct brcmf_if *ifp,
+                                 struct cfg80211_wowlan *wowl)
+{
+        u32 wowl_config;
+
+        brcmf_dbg(TRACE, "Suspend, wowl config.\n");
+
+        brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_PM, &cfg->pre_wowl_pmmode);
+        brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, PM_MAX);
+
+        wowl_config = 0;
+        if (wowl->disconnect)
+                wowl_config |= WL_WOWL_DIS | WL_WOWL_BCN | WL_WOWL_RETR;
+                /* Note: if "wowl" target and not "wowlpf" then wowl_bcn_loss
+                 * should be configured. This paramater is not supported by
+                 * wowlpf.
+                 */
+        if (wowl->magic_pkt)
+                wowl_config |= WL_WOWL_MAGIC;
+        brcmf_fil_iovar_int_set(ifp, "wowl", wowl_config);
+        brcmf_fil_iovar_int_set(ifp, "wowl_activate", 1);
+        brcmf_bus_wowl_config(cfg->pub->bus_if, true);
+        cfg->wowl_enabled = true;
+}
+
 static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy,
-                                  struct cfg80211_wowlan *wow)
+                                  struct cfg80211_wowlan *wowl)
 {
         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_cfg80211_vif *vif;
 
         brcmf_dbg(TRACE, "Enter\n");
 
-        /*
-         * if the primary net_device is not READY there is nothing
+        /* if the primary net_device is not READY there is nothing
          * we can do but pray resume goes smoothly.
          */
-        vif = ((struct brcmf_if *)netdev_priv(ndev))->vif;
-        if (!check_vif_up(vif))
+        if (!check_vif_up(ifp->vif))
                 goto exit;
 
-        list_for_each_entry(vif, &cfg->vif_list, list) {
-                if (!test_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state))
-                        continue;
-                /*
-                 * While going to suspend if associated with AP disassociate
-                 * from AP to save power while system is in suspended state
-                 */
-                brcmf_link_down(vif);
-
-                /* Make sure WPA_Supplicant receives all the event
-                 * generated due to DISASSOC call to the fw to keep
-                 * the state fw and WPA_Supplicant state consistent
-                 */
-                brcmf_delay(500);
-        }
-
         /* end any scanning */
         if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status))
                 brcmf_abort_scanning(cfg);
 
-        /* Turn off watchdog timer */
-        brcmf_set_mpc(netdev_priv(ndev), 1);
+        if (wowl == NULL) {
+                brcmf_bus_wowl_config(cfg->pub->bus_if, false);
+                list_for_each_entry(vif, &cfg->vif_list, list) {
+                        if (!test_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state))
+                                continue;
+                        /* While going to suspend if associated with AP
+                         * disassociate from AP to save power while system is
+                         * in suspended state
+                         */
+                        brcmf_link_down(vif);
+                        /* Make sure WPA_Supplicant receives all the event
+                         * generated due to DISASSOC call to the fw to keep
+                         * the state fw and WPA_Supplicant state consistent
+                         */
+                        brcmf_delay(500);
+                }
+                /* Configure MPC */
+                brcmf_set_mpc(ifp, 1);
+
+        } else {
+                /* Configure WOWL paramaters */
+                brcmf_configure_wowl(cfg, ifp, wowl);
+        }
 
 exit:
         brcmf_dbg(TRACE, "Exit\n");
@@ -5400,6 +5440,21 @@ static void brcmf_wiphy_pno_params(struct wiphy *wiphy)
         wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
 }
 
+
+#ifdef CONFIG_PM
+static const struct wiphy_wowlan_support brcmf_wowlan_support = {
+        .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
+};
+#endif
+
+static void brcmf_wiphy_wowl_params(struct wiphy *wiphy)
+{
+#ifdef CONFIG_PM
+        /* wowl settings */
+        wiphy->wowlan = &brcmf_wowlan_support;
+#endif
+}
+
 static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)
 {
         struct ieee80211_iface_combination ifc_combo;
@@ -5437,6 +5492,9 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)
         wiphy->vendor_commands = brcmf_vendor_cmds;
         wiphy->n_vendor_commands = BRCMF_VNDR_CMDS_LAST - 1;
 
+        if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL))
+                brcmf_wiphy_wowl_params(wiphy);
+
         return brcmf_setup_wiphybands(wiphy);
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
index f9fb10998e79..6abf94e41d3d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -35,7 +35,7 @@
 #define WL_SCAN_PASSIVE_TIME            120
 
 #define WL_ESCAN_BUF_SIZE               (1024 * 64)
-#define WL_ESCAN_TIMER_INTERVAL_MS      8000 /* E-Scan timeout */
+#define WL_ESCAN_TIMER_INTERVAL_MS      10000 /* E-Scan timeout */
 
 #define WL_ESCAN_ACTION_START           1
 #define WL_ESCAN_ACTION_CONTINUE        2
@@ -363,6 +363,8 @@ struct brcmf_cfg80211_vif_event {
  * @vif_list: linked list of vif instances.
  * @vif_cnt: number of vif instances.
  * @vif_event: vif event signalling.
+ * @wowl_enabled; set during suspend, is wowl used.
+ * @pre_wowl_pmmode: intermediate storage of pm mode during wowl.
  */
 struct brcmf_cfg80211_info {
         struct wiphy *wiphy;
@@ -371,7 +373,6 @@ struct brcmf_cfg80211_info {
         struct brcmf_btcoex_info *btcoex;
         struct cfg80211_scan_request *scan_request;
         struct mutex usr_sync;
-        struct brcmf_scan_results *bss_list;
         struct brcmf_cfg80211_scan_req scan_req_int;
         struct wl_cfg80211_bss_info *bss_info;
         struct brcmf_cfg80211_ie ie;
@@ -397,6 +398,8 @@ struct brcmf_cfg80211_info {
         struct brcmf_cfg80211_vif_event vif_event;
         struct completion vif_disabled;
         struct brcmu_d11inf d11inf;
+        bool wowl_enabled;
+        u32 pre_wowl_pmmode;
 };
 
 /**
diff --git a/drivers/net/wireless/brcm80211/include/defs.h b/drivers/net/wireless/brcm80211/include/defs.h
index fb7cbcf81179..8d1e85e0ed51 100644
--- a/drivers/net/wireless/brcm80211/include/defs.h
+++ b/drivers/net/wireless/brcm80211/include/defs.h
@@ -74,10 +74,6 @@
 #define BRCM_BAND_2G            2       /* 2.4 Ghz */
 #define BRCM_BAND_ALL           3       /* all bands */
 
-/* Values for PM */
-#define PM_OFF  0
-#define PM_MAX  1
-
 /* Debug levels */
 #define BRCM_DL_INFO            0x00000001
 #define BRCM_DL_MAC80211        0x00000002
@@ -87,6 +83,7 @@
 #define BRCM_DL_DMA             0x00000020
 #define BRCM_DL_HT              0x00000040
 
+/* Values for PM */
 #define PM_OFF  0
 #define PM_MAX  1
 #define PM_FAST 2
diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c
index 4ae8ba6ccfff..e4351487ca72 100644
--- a/drivers/net/wireless/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-8000.c
@@ -81,7 +81,7 @@
 #define IWL8000_NVM_VERSION             0x0a1d
 #define IWL8000_TX_POWER_VERSION        0xffff /* meaningless */
 
-#define IWL8000_FW_PRE "iwlwifi-8000-"
+#define IWL8000_FW_PRE "iwlwifi-8000"
 #define IWL8000_MODULE_FIRMWARE(api) IWL8000_FW_PRE __stringify(api) ".ucode"
 
 #define NVM_HW_SECTION_NUM_FAMILY_8000          10
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index ed673baedfd7..0f1084f09caa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -69,6 +69,7 @@
 #include <linux/vmalloc.h>
 
 #include "iwl-drv.h"
+#include "iwl-csr.h"
 #include "iwl-debug.h"
 #include "iwl-trans.h"
 #include "iwl-op-mode.h"
@@ -244,6 +245,23 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
         snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
                  name_pre, tag);
 
+        /*
+         * Starting 8000B - FW name format has changed. This overwrites the
+         * previous name and uses the new format.
+         */
+        if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
+                char rev_step[2] = {
+                        'A' + CSR_HW_REV_STEP(drv->trans->hw_rev), 0
+                };
+
+                /* A-step doesn't have an indication */
+                if (CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_A_STEP)
+                        rev_step[0] = 0;
+
+                snprintf(drv->firmware_name, sizeof(drv->firmware_name),
+                         "%s%s-%s.ucode", name_pre, rev_step, tag);
+        }
+
         IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n",
                        (drv->fw_index == UCODE_EXPERIMENTAL_INDEX)
                                 ? "EXPERIMENTAL " : "",
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index 62c46eb8b99c..4f6e66892acc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -145,9 +145,24 @@ enum iwl_ucode_tlv_api {
 /**
  * enum iwl_ucode_tlv_capa - ucode capabilities
  * @IWL_UCODE_TLV_CAPA_D0I3_SUPPORT: supports D0i3
+ * @IWL_UCODE_TLV_CAPA_TXPOWER_INSERTION_SUPPORT: supports insertion of current
+ *      tx power value into TPC Report action frame and Link Measurement Report
+ *      action frame
+ * @IWL_UCODE_TLV_CAPA_DS_PARAM_SET_IE_SUPPORT: supports adding DS params
+ *      element in probe requests.
+ * @IWL_UCODE_TLV_CAPA_WFA_TPC_REP_IE_SUPPORT: supports adding TPC Report IE in
+ *      probe requests.
+ * @IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT: supports Quiet Period requests
+ * @IWL_UCODE_TLV_CAPA_DQA_SUPPORT: supports dynamic queue allocation (DQA),
+ *      which also implies support for the scheduler configuration command
  */
 enum iwl_ucode_tlv_capa {
-        IWL_UCODE_TLV_CAPA_D0I3_SUPPORT         = BIT(0),
+        IWL_UCODE_TLV_CAPA_D0I3_SUPPORT                 = BIT(0),
+        IWL_UCODE_TLV_CAPA_TXPOWER_INSERTION_SUPPORT    = BIT(8),
+        IWL_UCODE_TLV_CAPA_DS_PARAM_SET_IE_SUPPORT      = BIT(9),
+        IWL_UCODE_TLV_CAPA_WFA_TPC_REP_IE_SUPPORT       = BIT(10),
+        IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT         = BIT(11),
+        IWL_UCODE_TLV_CAPA_DQA_SUPPORT                  = BIT(12),
 };
 
 /* The default calibrate table size if not specified by firmware file */
diff --git a/drivers/net/wireless/iwlwifi/mvm/constants.h b/drivers/net/wireless/iwlwifi/mvm/constants.h
index a355788b1166..d4dfbe4cb66d 100644
--- a/drivers/net/wireless/iwlwifi/mvm/constants.h
+++ b/drivers/net/wireless/iwlwifi/mvm/constants.h
@@ -90,9 +90,10 @@
 #define IWL_MVM_BT_COEX_EN_RED_TXP_THRESH       62
 #define IWL_MVM_BT_COEX_DIS_RED_TXP_THRESH      65
 #define IWL_MVM_BT_COEX_SYNC2SCO                1
-#define IWL_MVM_BT_COEX_CORUNNING               1
+#define IWL_MVM_BT_COEX_CORUNNING               0
 #define IWL_MVM_BT_COEX_MPLUT                   1
 #define IWL_MVM_FW_MCAST_FILTER_PASS_ALL        0
 #define IWL_MVM_QUOTA_THRESHOLD                 8
+#define IWL_MVM_RS_RSSI_BASED_INIT_RATE         0
 
 #endif /* __MVM_CONSTANTS_H */
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index 95eb9a5ef693..50527a9bb267 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -326,6 +326,29 @@ out:
         return count;
 }
 
+static ssize_t iwl_dbgfs_nic_temp_read(struct file *file,
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos)
+{
+        struct iwl_mvm *mvm = file->private_data;
+        char buf[16];
+        int pos, temp;
+
+        if (!mvm->ucode_loaded)
+                return -EIO;
+
+        mutex_lock(&mvm->mutex);
+        temp = iwl_mvm_get_temp(mvm);
+        mutex_unlock(&mvm->mutex);
+
+        if (temp < 0)
+                return temp;
+
+        pos = scnprintf(buf , sizeof(buf), "%d\n", temp);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
 static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
                                        size_t count, loff_t *ppos)
 {
@@ -1378,6 +1401,7 @@ MVM_DEBUGFS_WRITE_FILE_OPS(tx_flush, 16);
 MVM_DEBUGFS_WRITE_FILE_OPS(sta_drain, 8);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(sram, 64);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(set_nic_temperature, 64);
+MVM_DEBUGFS_READ_FILE_OPS(nic_temp);
 MVM_DEBUGFS_READ_FILE_OPS(stations);
 MVM_DEBUGFS_READ_FILE_OPS(bt_notif);
 MVM_DEBUGFS_READ_FILE_OPS(bt_cmd);
@@ -1420,6 +1444,7 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
         MVM_DEBUGFS_ADD_FILE(sram, mvm->debugfs_dir, S_IWUSR | S_IRUSR);
         MVM_DEBUGFS_ADD_FILE(set_nic_temperature, mvm->debugfs_dir,
                              S_IWUSR | S_IRUSR);
+        MVM_DEBUGFS_ADD_FILE(nic_temp, dbgfs_dir, S_IRUSR);
         MVM_DEBUGFS_ADD_FILE(stations, dbgfs_dir, S_IRUSR);
         MVM_DEBUGFS_ADD_FILE(fw_error_dump, dbgfs_dir, S_IRUSR);
         MVM_DEBUGFS_ADD_FILE(bt_notif, dbgfs_dir, S_IRUSR);
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
index 8f2216694004..1354c68f6468 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
@@ -670,6 +670,8 @@ struct iwl_scan_channel_opt {
  * @IWL_MVM_LMAC_SCAN_FLAG_ITER_COMPLETE: send iteration complete notification
  * @IWL_MVM_LMAC_SCAN_FLAG_MULTIPLE_SSIDS multiple SSID matching
  * @IWL_MVM_LMAC_SCAN_FLAG_FRAGMENTED: all passive scans will be fragmented
+ * @IWL_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED: insert WFA vendor-specific TPC report
+ *      and DS parameter set IEs into probe requests.
  */
 enum iwl_mvm_lmac_scan_flags {
         IWL_MVM_LMAC_SCAN_FLAG_PASS_ALL         = BIT(0),
@@ -678,6 +680,7 @@ enum iwl_mvm_lmac_scan_flags {
         IWL_MVM_LMAC_SCAN_FLAG_ITER_COMPLETE    = BIT(3),
         IWL_MVM_LMAC_SCAN_FLAG_MULTIPLE_SSIDS   = BIT(4),
         IWL_MVM_LMAC_SCAN_FLAG_FRAGMENTED       = BIT(5),
+        IWL_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED     = BIT(6),
 };
 
 enum iwl_scan_priority {
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
index d6073f67b212..5bca1f8bfebf 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
@@ -66,6 +66,7 @@
 /**
  * enum iwl_tx_flags - bitmasks for tx_flags in TX command
  * @TX_CMD_FLG_PROT_REQUIRE: use RTS or CTS-to-self to protect the frame
+ * @TX_CMD_FLG_WRITE_TX_POWER: update current tx power value in the mgmt frame
  * @TX_CMD_FLG_ACK: expect ACK from receiving station
  * @TX_CMD_FLG_STA_RATE: use RS table with initial index from the TX command.
  *      Otherwise, use rate_n_flags from the TX command
@@ -97,6 +98,7 @@
  */
 enum iwl_tx_flags {
         TX_CMD_FLG_PROT_REQUIRE         = BIT(0),
+        TX_CMD_FLG_WRITE_TX_POWER       = BIT(1),
         TX_CMD_FLG_ACK                  = BIT(3),
         TX_CMD_FLG_STA_RATE             = BIT(4),
         TX_CMD_FLG_BAR                  = BIT(6),
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
index a2c662808a88..667a92274c87 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
@@ -116,6 +116,9 @@ enum {
         TXPATH_FLUSH = 0x1e,
         MGMT_MCAST_KEY = 0x1f,
 
+        /* scheduler config */
+        SCD_QUEUE_CFG = 0x1d,
+
         /* global key */
         WEP_KEY = 0x20,
 
@@ -1650,4 +1653,61 @@ struct iwl_dts_measurement_notif {
         __le32 voltage;
 } __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_NTFY_S */
 
+/**
+ * enum iwl_scd_control - scheduler config command control flags
+ * @IWL_SCD_CONTROL_RM_TID: remove TID from this queue
+ * @IWL_SCD_CONTROL_SET_SSN: use the SSN and program it into HW
+ */
+enum iwl_scd_control {
+        IWL_SCD_CONTROL_RM_TID  = BIT(4),
+        IWL_SCD_CONTROL_SET_SSN = BIT(5),
+};
+
+/**
+ * enum iwl_scd_flags - scheduler config command flags
+ * @IWL_SCD_FLAGS_SHARE_TID: multiple TIDs map to this queue
+ * @IWL_SCD_FLAGS_SHARE_RA: multiple RAs map to this queue
+ * @IWL_SCD_FLAGS_DQA_ENABLED: DQA is enabled
+ */
+enum iwl_scd_flags {
+        IWL_SCD_FLAGS_SHARE_TID         = BIT(0),
+        IWL_SCD_FLAGS_SHARE_RA          = BIT(1),
+        IWL_SCD_FLAGS_DQA_ENABLED       = BIT(2),
+};
+
+#define IWL_SCDQ_INVALID_STA    0xff
+
+/**
+ * struct iwl_scd_txq_cfg_cmd - New txq hw scheduler config command
+ * @token:      dialog token addba - unused legacy
+ * @sta_id:     station id 4-bit
+ * @tid:        TID 0..7
+ * @scd_queue:  TFD queue num 0 .. 31
+ * @enable:     1 queue enable, 0 queue disable
+ * @aggregate:  1 aggregated queue, 0 otherwise
+ * @tx_fifo:    tx fifo num 0..7
+ * @window:     up to 64
+ * @ssn:        starting seq num 12-bit
+ * @control:    command control flags
+ * @flags:      flags - see &enum iwl_scd_flags
+ *
+ * Note that every time the command is sent, all parameters must
+ * be filled with the exception of
+ *  - the SSN, which is only used with @IWL_SCD_CONTROL_SET_SSN
+ *  - the window, which is only relevant when starting aggregation
+ */
+struct iwl_scd_txq_cfg_cmd {
+        u8 token;
+        u8 sta_id;
+        u8 tid;
+        u8 scd_queue;
+        u8 enable;
+        u8 aggregate;
+        u8 tx_fifo;
+        u8 window;
+        __le16 ssn;
+        u8 control;
+        u8 flags;
+} __packed;
+
 #endif /* __fw_api_h__ */
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index 834267145929..0c5c0b0e23f5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -427,17 +427,17 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
         switch (vif->type) {
         case NL80211_IFTYPE_P2P_DEVICE:
-                iwl_trans_ac_txq_enable(mvm->trans, IWL_MVM_OFFCHANNEL_QUEUE,
-                                        IWL_MVM_TX_FIFO_VO);
+                iwl_mvm_enable_ac_txq(mvm, IWL_MVM_OFFCHANNEL_QUEUE,
+                                      IWL_MVM_TX_FIFO_VO);
                 break;
         case NL80211_IFTYPE_AP:
-                iwl_trans_ac_txq_enable(mvm->trans, vif->cab_queue,
-                                        IWL_MVM_TX_FIFO_MCAST);
+                iwl_mvm_enable_ac_txq(mvm, vif->cab_queue,
+                                      IWL_MVM_TX_FIFO_MCAST);
                 /* fall through */
         default:
                 for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
-                        iwl_trans_ac_txq_enable(mvm->trans, vif->hw_queue[ac],
-                                                iwl_mvm_ac_to_tx_fifo[ac]);
+                        iwl_mvm_enable_ac_txq(mvm, vif->hw_queue[ac],
+                                              iwl_mvm_ac_to_tx_fifo[ac]);
                 break;
         }
 
@@ -452,16 +452,14 @@ void iwl_mvm_mac_ctxt_release(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
         switch (vif->type) {
         case NL80211_IFTYPE_P2P_DEVICE:
-                iwl_trans_txq_disable(mvm->trans, IWL_MVM_OFFCHANNEL_QUEUE,
-                                      true);
+                iwl_mvm_disable_txq(mvm, IWL_MVM_OFFCHANNEL_QUEUE);
                 break;
         case NL80211_IFTYPE_AP:
-                iwl_trans_txq_disable(mvm->trans, vif->cab_queue, true);
+                iwl_mvm_disable_txq(mvm, vif->cab_queue);
                 /* fall through */
         default:
                 for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
-                        iwl_trans_txq_disable(mvm->trans, vif->hw_queue[ac],
-                                              true);
+                        iwl_mvm_disable_txq(mvm, vif->hw_queue[ac]);
         }
 }
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 4c2121094a0b..c7a73c68bdab 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -279,14 +279,6 @@ static void iwl_mvm_reset_phy_ctxts(struct iwl_mvm *mvm)
         }
 }
 
-static int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm)
-{
-        /* we create the 802.11 header and SSID element */
-        if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID)
-                return mvm->fw->ucode_capa.max_probe_length - 24 - 2;
-        return mvm->fw->ucode_capa.max_probe_length - 24 - 34;
-}
-
 int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 {
         struct ieee80211_hw *hw = mvm->hw;
@@ -303,7 +295,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                     IEEE80211_HW_AMPDU_AGGREGATION |
                     IEEE80211_HW_TIMING_BEACON_ONLY |
                     IEEE80211_HW_CONNECTION_MONITOR |
-                    IEEE80211_HW_CHANCTX_STA_CSA;
+                    IEEE80211_HW_CHANCTX_STA_CSA |
+                    IEEE80211_HW_SUPPORTS_CLONED_SKBS;
 
         hw->queues = mvm->first_agg_queue;
         hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;
@@ -378,7 +371,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 
         iwl_mvm_reset_phy_ctxts(mvm);
 
-        hw->wiphy->max_scan_ie_len = iwl_mvm_max_scan_ie_len(mvm);
+        hw->wiphy->max_scan_ie_len = iwl_mvm_max_scan_ie_len(mvm, false);
 
         hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX;
 
@@ -411,6 +404,22 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                                NL80211_FEATURE_DYNAMIC_SMPS |
                                NL80211_FEATURE_STATIC_SMPS;
 
+        if (mvm->fw->ucode_capa.capa[0] &
+            IWL_UCODE_TLV_CAPA_TXPOWER_INSERTION_SUPPORT)
+                hw->wiphy->features |= NL80211_FEATURE_TX_POWER_INSERTION;
+        if (mvm->fw->ucode_capa.capa[0] &
+            IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT)
+                hw->wiphy->features |= NL80211_FEATURE_QUIET;
+
+        if (mvm->fw->ucode_capa.capa[0] &
+            IWL_UCODE_TLV_CAPA_DS_PARAM_SET_IE_SUPPORT)
+                hw->wiphy->features |=
+                        NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES;
+
+        if (mvm->fw->ucode_capa.capa[0] &
+            IWL_UCODE_TLV_CAPA_WFA_TPC_REP_IE_SUPPORT)
+                hw->wiphy->features |= NL80211_FEATURE_WFA_TPC_IE_IN_PROBES;
+
         mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
 
         /* currently FW API supports only one optional cipher scheme */
@@ -2135,7 +2144,13 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
 
         mutex_lock(&mvm->mutex);
 
-        if (!iwl_mvm_is_idle(mvm)) {
+        /* Newest FW fixes sched scan while connected on another interface */
+        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) {
+                if (!vif->bss_conf.idle) {
+                        ret = -EBUSY;
+                        goto out;
+                }
+        } else if (!iwl_mvm_is_idle(mvm)) {
                 ret = -EBUSY;
                 goto out;
         }
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 552995810f9e..b153ced7015b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -779,6 +779,11 @@ static inline bool iwl_mvm_is_d0i3_supported(struct iwl_mvm *mvm)
                (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_D0I3_SUPPORT);
 }
 
+static inline bool iwl_mvm_is_dqa_supported(struct iwl_mvm *mvm)
+{
+        return mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_DQA_SUPPORT;
+}
+
 extern const u8 iwl_mvm_ac_to_tx_fifo[];
 
 struct iwl_rate_info {
@@ -930,6 +935,7 @@ int iwl_mvm_rx_scan_response(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
 int iwl_mvm_rx_scan_complete(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
                              struct iwl_device_cmd *cmd);
 int iwl_mvm_cancel_scan(struct iwl_mvm *mvm);
+int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm, bool is_sched_scan);
 
 /* Scheduled scan */
 int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
@@ -984,6 +990,9 @@ void iwl_mvm_update_frame_stats(struct iwl_mvm *mvm,
                                 struct iwl_mvm_frame_stats *stats,
                                 u32 rate, bool agg);
 int rs_pretty_print_rate(char *buf, const u32 rate);
+void rs_update_last_rssi(struct iwl_mvm *mvm,
+                         struct iwl_lq_sta *lq_sta,
+                         struct ieee80211_rx_status *rx_status);
 
 /* power management */
 int iwl_mvm_power_update_device(struct iwl_mvm *mvm);
@@ -1141,6 +1150,39 @@ static inline bool iwl_mvm_vif_low_latency(struct iwl_mvm_vif *mvmvif)
         return mvmvif->low_latency;
 }
 
+/* hw scheduler queue config */
+void iwl_mvm_enable_txq(struct iwl_mvm *mvm, int queue, u16 ssn,
+                        const struct iwl_trans_txq_scd_cfg *cfg);
+void iwl_mvm_disable_txq(struct iwl_mvm *mvm, int queue);
+
+static inline void iwl_mvm_enable_ac_txq(struct iwl_mvm *mvm, int queue,
+                                         u8 fifo)
+{
+        struct iwl_trans_txq_scd_cfg cfg = {
+                .fifo = fifo,
+                .tid = IWL_MAX_TID_COUNT,
+                .aggregate = false,
+                .frame_limit = IWL_FRAME_LIMIT,
+        };
+
+        iwl_mvm_enable_txq(mvm, queue, 0, &cfg);
+}
+
+static inline void iwl_mvm_enable_agg_txq(struct iwl_mvm *mvm, int queue,
+                                          int fifo, int sta_id, int tid,
+                                          int frame_limit, u16 ssn)
+{
+        struct iwl_trans_txq_scd_cfg cfg = {
+                .fifo = fifo,
+                .sta_id = sta_id,
+                .tid = tid,
+                .frame_limit = frame_limit,
+                .aggregate = true,
+        };
+
+        iwl_mvm_enable_txq(mvm, queue, ssn, &cfg);
+}
+
 /* Assoc status */
 bool iwl_mvm_is_idle(struct iwl_mvm *mvm);
 
@@ -1150,6 +1192,7 @@ void iwl_mvm_tt_handler(struct iwl_mvm *mvm);
 void iwl_mvm_tt_initialize(struct iwl_mvm *mvm, u32 min_backoff);
 void iwl_mvm_tt_exit(struct iwl_mvm *mvm);
 void iwl_mvm_set_hw_ctkill_state(struct iwl_mvm *mvm, bool state);
+int iwl_mvm_get_temp(struct iwl_mvm *mvm);
 
 /* smart fifo */
 int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index f887779717d5..15aa298ee79c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -342,6 +342,7 @@ static const char *const iwl_mvm_cmd_strings[REPLY_MAX] = {
         CMD(BT_COEX_UPDATE_REDUCED_TXP),
         CMD(PSM_UAPSD_AP_MISBEHAVING_NOTIFICATION),
         CMD(ANTENNA_COUPLING_NOTIFICATION),
+        CMD(SCD_QUEUE_CFG),
 };
 #undef CMD
 
@@ -421,7 +422,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
                 mvm->first_agg_queue = 12;
         }
         mvm->sf_state = SF_UNINIT;
-        mvm->low_latency_agg_frame_limit = 1;
+        mvm->low_latency_agg_frame_limit = 6;
 
         mutex_init(&mvm->mutex);
         mutex_init(&mvm->d0i3_suspend_mutex);
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index f77dfe4df074..18a539999580 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -377,9 +377,9 @@ static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)
 }
 
 static void rs_rate_scale_perform(struct iwl_mvm *mvm,
-                                   struct sk_buff *skb,
-                                   struct ieee80211_sta *sta,
-                                   struct iwl_lq_sta *lq_sta);
+                                  struct ieee80211_sta *sta,
+                                  struct iwl_lq_sta *lq_sta,
+                                  int tid);
 static void rs_fill_lq_cmd(struct iwl_mvm *mvm,
                            struct ieee80211_sta *sta,
                            struct iwl_lq_sta *lq_sta,
@@ -1007,27 +1007,35 @@ static u32 rs_ch_width_from_mac_flags(enum mac80211_rate_control_flags flags)
         return RATE_MCS_CHAN_WIDTH_20;
 }
 
-/*
- * mac80211 sends us Tx status
- */
-static void rs_tx_status(void *mvm_r, struct ieee80211_supported_band *sband,
-                         struct ieee80211_sta *sta, void *priv_sta,
-                         struct sk_buff *skb)
+static u8 rs_get_tid(struct ieee80211_hdr *hdr)
+{
+        u8 tid = IWL_MAX_TID_COUNT;
+
+        if (ieee80211_is_data_qos(hdr->frame_control)) {
+                u8 *qc = ieee80211_get_qos_ctl(hdr);
+                tid = qc[0] & 0xf;
+        }
+
+        if (unlikely(tid > IWL_MAX_TID_COUNT))
+                tid = IWL_MAX_TID_COUNT;
+
+        return tid;
+}
+
+void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
+                          int tid, struct ieee80211_tx_info *info)
 {
         int legacy_success;
         int retries;
         int mac_index, i;
-        struct iwl_lq_sta *lq_sta = priv_sta;
         struct iwl_lq_cmd *table;
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct iwl_op_mode *op_mode = (struct iwl_op_mode *)mvm_r;
-        struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         enum mac80211_rate_control_flags mac_flags;
         u32 ucode_rate;
         struct rs_rate rate;
         struct iwl_scale_tbl_info *curr_tbl, *other_tbl, *tmp_tbl;
         u8 reduced_txp = (uintptr_t)info->status.status_driver_data[0];
+        struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
+        struct iwl_lq_sta *lq_sta = &mvmsta->lq_sta;
 
         /* Treat uninitialized rate scaling data same as non-existing. */
         if (!lq_sta) {
@@ -1045,10 +1053,6 @@ static void rs_tx_status(void *mvm_r, struct ieee80211_supported_band *sband,
                 return;
         }
 #endif
-        if (!ieee80211_is_data(hdr->frame_control) ||
-            info->flags & IEEE80211_TX_CTL_NO_ACK)
-                return;
-
         /* This packet was aggregated but doesn't carry status info */
         if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
             !(info->flags & IEEE80211_TX_STAT_AMPDU))
@@ -1094,7 +1098,7 @@ static void rs_tx_status(void *mvm_r, struct ieee80211_supported_band *sband,
                 for (tid = 0; tid < IWL_MAX_TID_COUNT; tid++)
                         ieee80211_stop_tx_ba_session(sta, tid);
 
-                iwl_mvm_rs_rate_init(mvm, sta, sband->band, false);
+                iwl_mvm_rs_rate_init(mvm, sta, info->band, false);
                 return;
         }
         lq_sta->last_tx = jiffies;
@@ -1221,8 +1225,28 @@ static void rs_tx_status(void *mvm_r, struct ieee80211_supported_band *sband,
         IWL_DEBUG_RATE(mvm, "reduced txpower: %d\n", reduced_txp);
 done:
         /* See if there's a better rate or modulation mode to try. */
-        if (sta && sta->supp_rates[sband->band])
-                rs_rate_scale_perform(mvm, skb, sta, lq_sta);
+        if (sta && sta->supp_rates[info->band])
+                rs_rate_scale_perform(mvm, sta, lq_sta, tid);
+}
+
+/*
+ * mac80211 sends us Tx status
+ */
+static void rs_mac80211_tx_status(void *mvm_r,
+                                  struct ieee80211_supported_band *sband,
+                                  struct ieee80211_sta *sta, void *priv_sta,
+                                  struct sk_buff *skb)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        struct iwl_op_mode *op_mode = (struct iwl_op_mode *)mvm_r;
+        struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
+        if (!ieee80211_is_data(hdr->frame_control) ||
+            info->flags & IEEE80211_TX_CTL_NO_ACK)
+                return;
+
+        iwl_mvm_rs_tx_status(mvm, sta, rs_get_tid(hdr), info);
 }
 
 /*
@@ -1493,22 +1517,6 @@ static void rs_update_rate_tbl(struct iwl_mvm *mvm,
         iwl_mvm_send_lq_cmd(mvm, &lq_sta->lq, false);
 }
 
-static u8 rs_get_tid(struct iwl_lq_sta *lq_data,
-                     struct ieee80211_hdr *hdr)
-{
-        u8 tid = IWL_MAX_TID_COUNT;
-
-        if (ieee80211_is_data_qos(hdr->frame_control)) {
-                u8 *qc = ieee80211_get_qos_ctl(hdr);
-                tid = qc[0] & 0xf;
-        }
-
-        if (unlikely(tid > IWL_MAX_TID_COUNT))
-                tid = IWL_MAX_TID_COUNT;
-
-        return tid;
-}
-
 static enum rs_column rs_get_next_column(struct iwl_mvm *mvm,
                                          struct iwl_lq_sta *lq_sta,
                                          struct ieee80211_sta *sta,
@@ -1947,12 +1955,10 @@ static bool rs_tpc_perform(struct iwl_mvm *mvm,
  * Do rate scaling and search for new modulation mode.
  */
 static void rs_rate_scale_perform(struct iwl_mvm *mvm,
-                                  struct sk_buff *skb,
                                   struct ieee80211_sta *sta,
-                                  struct iwl_lq_sta *lq_sta)
+                                  struct iwl_lq_sta *lq_sta,
+                                  int tid)
 {
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         int low = IWL_RATE_INVALID;
         int high = IWL_RATE_INVALID;
         int index;
@@ -1969,29 +1975,12 @@ static void rs_rate_scale_perform(struct iwl_mvm *mvm,
         u8 done_search = 0;
         u16 high_low;
         s32 sr;
-        u8 tid = IWL_MAX_TID_COUNT;
         u8 prev_agg = lq_sta->is_agg;
         struct iwl_mvm_sta *sta_priv = (void *)sta->drv_priv;
         struct iwl_mvm_tid_data *tid_data;
         struct rs_rate *rate;
 
-        /* Send management frames and NO_ACK data using lowest rate. */
-        /* TODO: this could probably be improved.. */
-        if (!ieee80211_is_data(hdr->frame_control) ||
-            info->flags & IEEE80211_TX_CTL_NO_ACK)
-                return;
-
-        tid = rs_get_tid(lq_sta, hdr);
-        if ((tid != IWL_MAX_TID_COUNT) &&
-            (lq_sta->tx_agg_tid_en & (1 << tid))) {
-                tid_data = &sta_priv->tid_data[tid];
-                if (tid_data->state == IWL_AGG_OFF)
-                        lq_sta->is_agg = 0;
-                else
-                        lq_sta->is_agg = 1;
-        } else {
-                lq_sta->is_agg = 0;
-        }
+        lq_sta->is_agg = !!sta_priv->agg_tids;
 
         /*
          * Select rate-scale / modulation-mode table to work with in
@@ -2288,6 +2277,110 @@ out:
         lq_sta->last_txrate_idx = index;
 }
 
+struct rs_init_rate_info {
+        s8 rssi;
+        u8 rate_idx;
+};
+
+static const struct rs_init_rate_info rs_init_rates_24ghz[] = {
+        { -60, IWL_RATE_54M_INDEX },
+        { -64, IWL_RATE_48M_INDEX },
+        { -68, IWL_RATE_36M_INDEX },
+        { -80, IWL_RATE_24M_INDEX },
+        { -84, IWL_RATE_18M_INDEX },
+        { -85, IWL_RATE_12M_INDEX },
+        { -86, IWL_RATE_11M_INDEX },
+        { -88, IWL_RATE_5M_INDEX  },
+        { -90, IWL_RATE_2M_INDEX  },
+        { S8_MIN, IWL_RATE_1M_INDEX },
+};
+
+static const struct rs_init_rate_info rs_init_rates_5ghz[] = {
+        { -60, IWL_RATE_54M_INDEX },
+        { -64, IWL_RATE_48M_INDEX },
+        { -72, IWL_RATE_36M_INDEX },
+        { -80, IWL_RATE_24M_INDEX },
+        { -84, IWL_RATE_18M_INDEX },
+        { -85, IWL_RATE_12M_INDEX },
+        { -87, IWL_RATE_9M_INDEX  },
+        { S8_MIN, IWL_RATE_6M_INDEX },
+};
+
+/* Choose an initial legacy rate and antenna to use based on the RSSI
+ * of last Rx
+ */
+static void rs_get_initial_rate(struct iwl_mvm *mvm,
+                                struct iwl_lq_sta *lq_sta,
+                                enum ieee80211_band band,
+                                struct rs_rate *rate)
+{
+        int i, nentries;
+        s8 best_rssi = S8_MIN;
+        u8 best_ant = ANT_NONE;
+        u8 valid_tx_ant = mvm->fw->valid_tx_ant;
+        const struct rs_init_rate_info *initial_rates;
+
+        for (i = 0; i < ARRAY_SIZE(lq_sta->pers.chain_signal); i++) {
+                if (!(lq_sta->pers.chains & BIT(i)))
+                        continue;
+
+                if (lq_sta->pers.chain_signal[i] > best_rssi) {
+                        best_rssi = lq_sta->pers.chain_signal[i];
+                        best_ant = BIT(i);
+                }
+        }
+
+        IWL_DEBUG_RATE(mvm, "Best ANT: %s Best RSSI: %d\n",
+                       rs_pretty_ant(best_ant), best_rssi);
+
+        if (best_ant != ANT_A && best_ant != ANT_B)
+                rate->ant = first_antenna(valid_tx_ant);
+        else
+                rate->ant = best_ant;
+
+        rate->sgi = false;
+        rate->ldpc = false;
+        rate->bw = RATE_MCS_CHAN_WIDTH_20;
+
+        rate->index = find_first_bit(&lq_sta->active_legacy_rate,
+                                     BITS_PER_LONG);
+
+        if (band == IEEE80211_BAND_5GHZ) {
+                rate->type = LQ_LEGACY_A;
+                initial_rates = rs_init_rates_5ghz;
+                nentries = ARRAY_SIZE(rs_init_rates_5ghz);
+        } else {
+                rate->type = LQ_LEGACY_G;
+                initial_rates = rs_init_rates_24ghz;
+                nentries = ARRAY_SIZE(rs_init_rates_24ghz);
+        }
+
+        if (IWL_MVM_RS_RSSI_BASED_INIT_RATE) {
+                for (i = 0; i < nentries; i++) {
+                        int rate_idx = initial_rates[i].rate_idx;
+                        if ((best_rssi >= initial_rates[i].rssi) &&
+                            (BIT(rate_idx) & lq_sta->active_legacy_rate)) {
+                                rate->index = rate_idx;
+                                break;
+                        }
+                }
+        }
+
+        IWL_DEBUG_RATE(mvm, "rate_idx %d ANT %s\n", rate->index,
+                       rs_pretty_ant(rate->ant));
+}
+
+/* Save info about RSSI of last Rx */
+void rs_update_last_rssi(struct iwl_mvm *mvm,
+                         struct iwl_lq_sta *lq_sta,
+                         struct ieee80211_rx_status *rx_status)
+{
+        lq_sta->pers.chains = rx_status->chains;
+        lq_sta->pers.chain_signal[0] = rx_status->chain_signal[0];
+        lq_sta->pers.chain_signal[1] = rx_status->chain_signal[1];
+        lq_sta->pers.chain_signal[2] = rx_status->chain_signal[2];
+}
+
 /**
  * rs_initialize_lq - Initialize a station's hardware rate table
  *
@@ -2310,17 +2403,11 @@ static void rs_initialize_lq(struct iwl_mvm *mvm,
 {
         struct iwl_scale_tbl_info *tbl;
         struct rs_rate *rate;
-        int i;
         u8 active_tbl = 0;
-        u8 valid_tx_ant;
 
         if (!sta || !lq_sta)
                 return;
 
-        i = lq_sta->last_txrate_idx;
-
-        valid_tx_ant = mvm->fw->valid_tx_ant;
-
         if (!lq_sta->search_better_tbl)
                 active_tbl = lq_sta->active_tbl;
         else
@@ -2329,18 +2416,8 @@ static void rs_initialize_lq(struct iwl_mvm *mvm,
         tbl = &(lq_sta->lq_info[active_tbl]);
         rate = &tbl->rate;
 
-        if ((i < 0) || (i >= IWL_RATE_COUNT))
-                i = 0;
-
-        rate->index = i;
-        rate->ant = first_antenna(valid_tx_ant);
-        rate->sgi = false;
-        rate->ldpc = false;
-        rate->bw = RATE_MCS_CHAN_WIDTH_20;
-        if (band == IEEE80211_BAND_5GHZ)
-                rate->type = LQ_LEGACY_A;
-        else
-                rate->type = LQ_LEGACY_G;
+        rs_get_initial_rate(mvm, lq_sta, band, rate);
+        lq_sta->last_txrate_idx = rate->index;
 
         WARN_ON_ONCE(rate->ant != ANT_A && rate->ant != ANT_B);
         if (rate->ant == ANT_A)
@@ -2397,6 +2474,8 @@ static void *rs_alloc_sta(void *mvm_rate, struct ieee80211_sta *sta,
         lq_sta->pers.dbg_fixed_rate = 0;
         lq_sta->pers.dbg_fixed_txp_reduction = TPC_INVALID;
 #endif
+        lq_sta->pers.chains = 0;
+        memset(lq_sta->pers.chain_signal, 0, sizeof(lq_sta->pers.chain_signal));
 
         return &sta_priv->lq_sta;
 }
@@ -2630,11 +2709,6 @@ void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 
         /* as default allow aggregation for all tids */
         lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;
-
-        /* Set last_txrate_idx to lowest rate */
-        lq_sta->last_txrate_idx = rate_lowest_index(sband, sta);
-        if (sband->band == IEEE80211_BAND_5GHZ)
-                lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;
         lq_sta->is_agg = 0;
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         iwl_mvm_reset_frame_stats(mvm, &mvm->drv_rx_stats);
@@ -3238,7 +3312,7 @@ static void rs_rate_init_stub(void *mvm_r,
 
 static const struct rate_control_ops rs_mvm_ops = {
         .name = RS_NAME,
-        .tx_status = rs_tx_status,
+        .tx_status = rs_mac80211_tx_status,
         .get_rate = rs_get_rate,
         .rate_init = rs_rate_init_stub,
         .alloc = rs_alloc,
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.h b/drivers/net/wireless/iwlwifi/mvm/rs.h
index 95c4b960fd71..eb34c1209acc 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.h
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.h
@@ -376,6 +376,10 @@ struct iwl_lq_sta {
 void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                           enum ieee80211_band band, bool init);
 
+/* Notify RS about Tx status */
+void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
+                          int tid, struct ieee80211_tx_info *info);
+
 /**
  * iwl_rate_control_register - Register the rate control algorithm callbacks
  *
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index a6cb84ed653f..3cf40f3f58ec 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -246,6 +246,7 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
         struct iwl_rx_phy_info *phy_info;
         struct iwl_rx_mpdu_res_start *rx_res;
+        struct ieee80211_sta *sta;
         u32 len;
         u32 ampdu_status;
         u32 rate_n_flags;
@@ -261,23 +262,6 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
         memset(&rx_status, 0, sizeof(rx_status));
 
         /*
-         * We have tx blocked stations (with CS bit). If we heard frames from
-         * a blocked station on a new channel we can TX to it again.
-         */
-        if (unlikely(mvm->csa_tx_block_bcn_timeout)) {
-                struct ieee80211_sta *sta;
-
-                rcu_read_lock();
-
-                sta = ieee80211_find_sta(
-                        rcu_dereference(mvm->csa_tx_blocked_vif), hdr->addr2);
-                if (sta)
-                        iwl_mvm_sta_modify_disable_tx_ap(mvm, sta, false);
-
-                rcu_read_unlock();
-        }
-
-        /*
          * drop the packet if it has failed being decrypted by HW
          */
         if (iwl_mvm_set_mac80211_rx_flag(mvm, hdr, &rx_status, rx_pkt_status)) {
@@ -325,6 +309,29 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
         IWL_DEBUG_STATS_LIMIT(mvm, "Rssi %d, TSF %llu\n", rx_status.signal,
                               (unsigned long long)rx_status.mactime);
 
+        rcu_read_lock();
+        /*
+         * We have tx blocked stations (with CS bit). If we heard frames from
+         * a blocked station on a new channel we can TX to it again.
+         */
+        if (unlikely(mvm->csa_tx_block_bcn_timeout)) {
+                sta = ieee80211_find_sta(
+                        rcu_dereference(mvm->csa_tx_blocked_vif), hdr->addr2);
+                if (sta)
+                        iwl_mvm_sta_modify_disable_tx_ap(mvm, sta, false);
+        }
+
+        /* This is fine since we don't support multiple AP interfaces */
+        sta = ieee80211_find_sta_by_ifaddr(mvm->hw, hdr->addr2, NULL);
+        if (sta) {
+                struct iwl_mvm_sta *mvmsta;
+                mvmsta = iwl_mvm_sta_from_mac80211(sta);
+                rs_update_last_rssi(mvm, &mvmsta->lq_sta,
+                                    &rx_status);
+        }
+
+        rcu_read_unlock();
+
         /* set the preamble flag if appropriate */
         if (phy_info->phy_flags & cpu_to_le16(RX_RES_PHY_FLAGS_SHORT_PREAMBLE))
                 rx_status.flag |= RX_FLAG_SHORTPRE;
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 09545f23b24f..cb85e63c20aa 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -339,6 +339,55 @@ not_bound:
         }
 }
 
+static inline bool iwl_mvm_rrm_scan_needed(struct iwl_mvm *mvm)
+{
+        /* require rrm scan whenever the fw supports it */
+        return mvm->fw->ucode_capa.capa[0] &
+               IWL_UCODE_TLV_CAPA_DS_PARAM_SET_IE_SUPPORT;
+}
+
+static int iwl_mvm_max_scan_ie_fw_cmd_room(struct iwl_mvm *mvm,
+                                           bool is_sched_scan)
+{
+        int max_probe_len;
+
+        if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
+                max_probe_len = SCAN_OFFLOAD_PROBE_REQ_SIZE;
+        else
+                max_probe_len = mvm->fw->ucode_capa.max_probe_length;
+
+        /* we create the 802.11 header and SSID element */
+        max_probe_len -= 24 + 2;
+
+        /* basic ssid is added only for hw_scan with and old api */
+        if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID) &&
+            !(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) &&
+            !is_sched_scan)
+                max_probe_len -= 32;
+
+        return max_probe_len;
+}
+
+int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm, bool is_sched_scan)
+{
+        int max_ie_len = iwl_mvm_max_scan_ie_fw_cmd_room(mvm, is_sched_scan);
+
+        if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN))
+                return max_ie_len;
+
+        /* TODO: [BUG] This function should return the maximum allowed size of
+         * scan IEs, however the LMAC scan api contains both 2GHZ and 5GHZ IEs
+         * in the same command. So the correct implementation of this function
+         * is just iwl_mvm_max_scan_ie_fw_cmd_room() / 2. Currently the scan
+         * command has only 512 bytes and it would leave us with about 240
+         * bytes for scan IEs, which is clearly not enough. So meanwhile
+         * we will report an incorrect value. This may result in a failure to
+         * issue a scan in unified_scan_lmac and unified_sched_scan_lmac
+         * functions with -ENOBUFS, if a large enough probe will be provided.
+         */
+        return max_ie_len;
+}
+
 int iwl_mvm_scan_request(struct iwl_mvm *mvm,
                          struct ieee80211_vif *vif,
                          struct cfg80211_scan_request *req)
@@ -1153,6 +1202,10 @@ iwl_mvm_build_generic_unified_scan_cmd(struct iwl_mvm *mvm,
                                     IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |
                                     IWL_SCAN_CHANNEL_FLAG_CACHE_ADD);
         }
+
+        if (iwl_mvm_rrm_scan_needed(mvm))
+                cmd->scan_flags |=
+                        cpu_to_le32(IWL_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED);
 }
 
 int iwl_mvm_unified_scan_lmac(struct iwl_mvm *mvm,
@@ -1180,13 +1233,12 @@ int iwl_mvm_unified_scan_lmac(struct iwl_mvm *mvm,
         if (WARN_ON(mvm->scan_cmd == NULL))
                 return -ENOMEM;
 
-        if (WARN_ON_ONCE(req->req.n_ssids > PROBE_OPTION_MAX ||
-                         req->ies.common_ie_len + req->ies.len[0] +
-                                req->ies.len[1] + 24 + 2 >
-                                        SCAN_OFFLOAD_PROBE_REQ_SIZE ||
-                         req->req.n_channels >
-                                mvm->fw->ucode_capa.n_scan_channels))
-                return -1;
+        if (req->req.n_ssids > PROBE_OPTION_MAX ||
+            req->ies.common_ie_len + req->ies.len[NL80211_BAND_2GHZ] +
+            req->ies.len[NL80211_BAND_5GHZ] >
+                iwl_mvm_max_scan_ie_fw_cmd_room(mvm, false) ||
+            req->req.n_channels > mvm->fw->ucode_capa.n_scan_channels)
+                return -ENOBUFS;
 
         mvm->scan_status = IWL_MVM_SCAN_OS;
 
@@ -1208,7 +1260,7 @@ int iwl_mvm_unified_scan_lmac(struct iwl_mvm *mvm,
         if (req->req.n_ssids == 0)
                 flags |= IWL_MVM_LMAC_SCAN_FLAG_PASSIVE;
 
-        cmd->scan_flags = cpu_to_le32(flags);
+        cmd->scan_flags |= cpu_to_le32(flags);
 
         cmd->flags = iwl_mvm_scan_rxon_flags(req->req.channels[0]->band);
         cmd->filter_flags = cpu_to_le32(MAC_FILTER_ACCEPT_GRP |
@@ -1274,10 +1326,11 @@ int iwl_mvm_unified_sched_scan_lmac(struct iwl_mvm *mvm,
         if (WARN_ON(mvm->scan_cmd == NULL))
                 return -ENOMEM;
 
-        if (WARN_ON_ONCE(req->n_ssids > PROBE_OPTION_MAX ||
-                         ies->common_ie_len + ies->len[0] + ies->len[1] + 24 + 2
-                                > SCAN_OFFLOAD_PROBE_REQ_SIZE ||
-                         req->n_channels > mvm->fw->ucode_capa.n_scan_channels))
+        if (req->n_ssids > PROBE_OPTION_MAX ||
+            ies->common_ie_len + ies->len[NL80211_BAND_2GHZ] +
+            ies->len[NL80211_BAND_5GHZ] >
+                iwl_mvm_max_scan_ie_fw_cmd_room(mvm, true) ||
+            req->n_channels > mvm->fw->ucode_capa.n_scan_channels)
                 return -ENOBUFS;
 
         iwl_mvm_scan_calc_params(mvm, vif, req->n_ssids, 0, &params);
@@ -1305,7 +1358,7 @@ int iwl_mvm_unified_sched_scan_lmac(struct iwl_mvm *mvm,
         if (req->n_ssids == 0)
                 flags |= IWL_MVM_LMAC_SCAN_FLAG_PASSIVE;
 
-        cmd->scan_flags = cpu_to_le32(flags);
+        cmd->scan_flags |= cpu_to_le32(flags);
 
         cmd->flags = iwl_mvm_scan_rxon_flags(req->channels[0]->band);
         cmd->filter_flags = cpu_to_le32(MAC_FILTER_ACCEPT_GRP |
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c
index 666f16b4bed9..1731c205c81d 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -247,6 +247,7 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm,
                 memset(&mvm_sta->tid_data[i], 0, sizeof(mvm_sta->tid_data[i]));
                 mvm_sta->tid_data[i].seq_number = seq;
         }
+        mvm_sta->agg_tids = 0;
 
         ret = iwl_mvm_sta_send_to_fw(mvm, sta, false);
         if (ret)
@@ -535,8 +536,8 @@ int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm)
         lockdep_assert_held(&mvm->mutex);
 
         /* Map Aux queue to fifo - needs to happen before adding Aux station */
-        iwl_trans_ac_txq_enable(mvm->trans, mvm->aux_queue,
-                                IWL_MVM_TX_FIFO_MCAST);
+        iwl_mvm_enable_ac_txq(mvm, mvm->aux_queue,
+                              IWL_MVM_TX_FIFO_MCAST);
 
         /* Allocate aux station and assign to it the aux queue */
         ret = iwl_mvm_allocate_int_sta(mvm, &mvm->aux_sta, BIT(mvm->aux_queue),
@@ -872,12 +873,16 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         int queue, fifo, ret;
         u16 ssn;
 
+        BUILD_BUG_ON((sizeof(mvmsta->agg_tids) * BITS_PER_BYTE)
+                     != IWL_MAX_TID_COUNT);
+
         buf_size = min_t(int, buf_size, LINK_QUAL_AGG_FRAME_LIMIT_DEF);
 
         spin_lock_bh(&mvmsta->lock);
         ssn = tid_data->ssn;
         queue = tid_data->txq_id;
         tid_data->state = IWL_AGG_ON;
+        mvmsta->agg_tids |= BIT(tid);
         tid_data->ssn = 0xffff;
         spin_unlock_bh(&mvmsta->lock);
 
@@ -887,8 +892,8 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         if (ret)
                 return -EIO;
 
-        iwl_trans_txq_enable(mvm->trans, queue, fifo, mvmsta->sta_id, tid,
-                             buf_size, ssn);
+        iwl_mvm_enable_agg_txq(mvm, queue, fifo, mvmsta->sta_id, tid,
+                               buf_size, ssn);
 
         /*
          * Even though in theory the peer could have different
@@ -932,6 +937,8 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         IWL_DEBUG_TX_QUEUES(mvm, "Stop AGG: sta %d tid %d q %d state %d\n",
                             mvmsta->sta_id, tid, txq_id, tid_data->state);
 
+        mvmsta->agg_tids &= ~BIT(tid);
+
         switch (tid_data->state) {
         case IWL_AGG_ON:
                 tid_data->ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);
@@ -956,7 +963,7 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
                 iwl_mvm_sta_tx_agg(mvm, sta, tid, txq_id, false);
 
-                iwl_trans_txq_disable(mvm->trans, txq_id, true);
+                iwl_mvm_disable_txq(mvm, txq_id);
                 return 0;
         case IWL_AGG_STARTING:
         case IWL_EMPTYING_HW_QUEUE_ADDBA:
@@ -1005,6 +1012,7 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                             mvmsta->sta_id, tid, txq_id, tid_data->state);
         old_state = tid_data->state;
         tid_data->state = IWL_AGG_OFF;
+        mvmsta->agg_tids &= ~BIT(tid);
         spin_unlock_bh(&mvmsta->lock);
 
         if (old_state >= IWL_AGG_ON) {
@@ -1013,7 +1021,7 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
                 iwl_mvm_sta_tx_agg(mvm, sta, tid, txq_id, false);
 
-                iwl_trans_txq_disable(mvm->trans, tid_data->txq_id, true);
+                iwl_mvm_disable_txq(mvm, tid_data->txq_id);
         }
 
         mvm->queue_to_mac80211[tid_data->txq_id] =
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.h b/drivers/net/wireless/iwlwifi/mvm/sta.h
index aeb3a7f80ceb..d9c0d7b0e9d4 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.h
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.h
@@ -299,6 +299,7 @@ static inline u16 iwl_mvm_tid_queued(struct iwl_mvm_tid_data *tid_data)
  * @tx_protection: reference counter for controlling the Tx protection.
  * @tt_tx_protection: is thermal throttling enable Tx protection?
  * @disable_tx: is tx to this STA disabled?
+ * @agg_tids: bitmap of tids whose status is operational aggregated (IWL_AGG_ON)
  *
  * When mac80211 creates a station it reserves some space (hw->sta_data_size)
  * in the structure for use by driver. This structure is placed in that
@@ -323,6 +324,7 @@ struct iwl_mvm_sta {
         bool tt_tx_protection;
 
         bool disable_tx;
+        u8 agg_tids;
 };
 
 static inline struct iwl_mvm_sta *
diff --git a/drivers/net/wireless/iwlwifi/mvm/tt.c b/drivers/net/wireless/iwlwifi/mvm/tt.c
index c750ca7b8269..acca44a45086 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tt.c
@@ -135,7 +135,7 @@ static int iwl_mvm_get_temp_cmd(struct iwl_mvm *mvm)
                                     sizeof(cmd), &cmd);
 }
 
-static int iwl_mvm_get_temp(struct iwl_mvm *mvm)
+int iwl_mvm_get_temp(struct iwl_mvm *mvm)
 {
         struct iwl_notification_wait wait_temp_notif;
         static const u8 temp_notif[] = { DTS_MEASUREMENT_NOTIFICATION };
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index c67296efa04d..1cb793a498ac 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -133,6 +133,11 @@ static void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
             !is_multicast_ether_addr(ieee80211_get_DA(hdr)))
                 tx_flags |= TX_CMD_FLG_PROT_REQUIRE;
 
+        if ((mvm->fw->ucode_capa.capa[0] &
+             IWL_UCODE_TLV_CAPA_TXPOWER_INSERTION_SUPPORT) &&
+            ieee80211_action_contains_tpc(skb))
+                tx_flags |= TX_CMD_FLG_WRITE_TX_POWER;
+
         tx_cmd->tx_flags = cpu_to_le32(tx_flags);
         /* Total # bytes to be transmitted */
         tx_cmd->len = cpu_to_le16((u16)skb->len);
@@ -488,11 +493,11 @@ static void iwl_mvm_check_ratid_empty(struct iwl_mvm *mvm,
                 IWL_DEBUG_TX_QUEUES(mvm,
                                     "Can continue DELBA flow ssn = next_recl = %d\n",
                                     tid_data->next_reclaimed);
-                iwl_trans_txq_disable(mvm->trans, tid_data->txq_id, true);
+                iwl_mvm_disable_txq(mvm, tid_data->txq_id);
                 tid_data->state = IWL_AGG_OFF;
                 /*
                  * we can't hold the mutex - but since we are after a sequence
-                 * point (call to iwl_trans_txq_disable), so we don't even need
+                 * point (call to iwl_mvm_disable_txq(), so we don't even need
                  * a memory barrier.
                  */
                 mvm->queue_to_mac80211[tid_data->txq_id] =
@@ -868,6 +873,19 @@ int iwl_mvm_rx_tx_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
         return 0;
 }
 
+static void iwl_mvm_tx_info_from_ba_notif(struct ieee80211_tx_info *info,
+                                          struct iwl_mvm_ba_notif *ba_notif,
+                                          struct iwl_mvm_tid_data *tid_data)
+{
+        info->flags |= IEEE80211_TX_STAT_AMPDU;
+        info->status.ampdu_ack_len = ba_notif->txed_2_done;
+        info->status.ampdu_len = ba_notif->txed;
+        iwl_mvm_hwrate_to_tx_status(tid_data->rate_n_flags,
+                                    info);
+        info->status.status_driver_data[0] =
+                (void *)(uintptr_t)tid_data->reduced_tpc;
+}
+
 int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
                         struct iwl_device_cmd *cmd)
 {
@@ -954,21 +972,37 @@ int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
                  */
                 info->flags |= IEEE80211_TX_STAT_ACK;
 
-                if (freed == 1) {
-                        /* this is the first skb we deliver in this batch */
-                        /* put the rate scaling data there */
-                        info->flags |= IEEE80211_TX_STAT_AMPDU;
-                        info->status.ampdu_ack_len = ba_notif->txed_2_done;
-                        info->status.ampdu_len = ba_notif->txed;
-                        iwl_mvm_hwrate_to_tx_status(tid_data->rate_n_flags,
-                                                    info);
-                        info->status.status_driver_data[0] =
-                                (void *)(uintptr_t)tid_data->reduced_tpc;
-                }
+                /* this is the first skb we deliver in this batch */
+                /* put the rate scaling data there */
+                if (freed == 1)
+                        iwl_mvm_tx_info_from_ba_notif(info, ba_notif, tid_data);
         }
 
         spin_unlock_bh(&mvmsta->lock);
 
+        /* We got a BA notif with 0 acked or scd_ssn didn't progress which is
+         * possible (i.e. first MPDU in the aggregation wasn't acked)
+         * Still it's important to update RS about sent vs. acked.
+         */
+        if (skb_queue_empty(&reclaimed_skbs)) {
+                struct ieee80211_tx_info ba_info = {};
+                struct ieee80211_chanctx_conf *chanctx_conf = NULL;
+
+                if (mvmsta->vif)
+                        chanctx_conf =
+                                rcu_dereference(mvmsta->vif->chanctx_conf);
+
+                if (WARN_ON_ONCE(!chanctx_conf))
+                        goto out;
+
+                ba_info.band = chanctx_conf->def.chan->band;
+                iwl_mvm_tx_info_from_ba_notif(&ba_info, ba_notif, tid_data);
+
+                IWL_DEBUG_TX_REPLY(mvm, "No reclaim. Update rs directly\n");
+                iwl_mvm_rs_tx_status(mvm, sta, tid, &ba_info);
+        }
+
+out:
         rcu_read_unlock();
 
         while (!skb_queue_empty(&reclaimed_skbs)) {
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index 1958f298ac8b..8021f6eec27f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -530,6 +530,52 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
                 iwl_mvm_dump_umac_error_log(mvm);
 }
 
+void iwl_mvm_enable_txq(struct iwl_mvm *mvm, int queue, u16 ssn,
+                        const struct iwl_trans_txq_scd_cfg *cfg)
+{
+        if (iwl_mvm_is_dqa_supported(mvm)) {
+                struct iwl_scd_txq_cfg_cmd cmd = {
+                        .scd_queue = queue,
+                        .enable = 1,
+                        .window = cfg->frame_limit,
+                        .sta_id = cfg->sta_id,
+                        .ssn = cpu_to_le16(ssn),
+                        .tx_fifo = cfg->fifo,
+                        .aggregate = cfg->aggregate,
+                        .flags = IWL_SCD_FLAGS_DQA_ENABLED,
+                        .tid = cfg->tid,
+                        .control = IWL_SCD_CONTROL_SET_SSN,
+                };
+                int ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0,
+                                               sizeof(cmd), &cmd);
+                if (ret)
+                        IWL_ERR(mvm,
+                                "Failed to configure queue %d on FIFO %d\n",
+                                queue, cfg->fifo);
+        }
+
+        iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn,
+                                 iwl_mvm_is_dqa_supported(mvm) ? NULL : cfg);
+}
+
+void iwl_mvm_disable_txq(struct iwl_mvm *mvm, int queue)
+{
+        iwl_trans_txq_disable(mvm->trans, queue,
+                              !iwl_mvm_is_dqa_supported(mvm));
+
+        if (iwl_mvm_is_dqa_supported(mvm)) {
+                struct iwl_scd_txq_cfg_cmd cmd = {
+                        .scd_queue = queue,
+                        .enable = 0,
+                };
+                int ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, CMD_ASYNC,
+                                               sizeof(cmd), &cmd);
+                if (ret)
+                        IWL_ERR(mvm, "Failed to disable queue %d (ret=%d)\n",
+                                queue, ret);
+        }
+}
+
 /**
  * iwl_mvm_send_lq_cmd() - Send link quality command
  * @init: This command is sent as part of station initialization right
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index ca68c3ccf633..6ced8549eb3a 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -275,6 +275,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x4C60, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x4C70, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
@@ -318,6 +320,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xCC70, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xCC60, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7260_n_cfg)},
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index ae99240dcde4..1393bac0025c 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -2190,7 +2190,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
          */
         if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
                 trans->hw_rev = (trans->hw_rev & 0xfff0) |
-                                (CSR_HW_REV_STEP(trans->hw_rev << 2));
+                                (CSR_HW_REV_STEP(trans->hw_rev << 2) << 2);
 
         trans->hw_id = (pdev->device << 16) + pdev->subsystem_device;
         snprintf(trans->hw_id_str, sizeof(trans->hw_id_str),
diff --git a/drivers/net/wireless/mwifiex/Kconfig b/drivers/net/wireless/mwifiex/Kconfig
index ecdf34505b54..e70d0df9b0da 100644
--- a/drivers/net/wireless/mwifiex/Kconfig
+++ b/drivers/net/wireless/mwifiex/Kconfig
@@ -9,12 +9,12 @@ config MWIFIEX
           mwifiex.
 
 config MWIFIEX_SDIO
-        tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8897"
+        tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897"
         depends on MWIFIEX && MMC
         select FW_LOADER
         ---help---
           This adds support for wireless adapters based on Marvell
-          8786/8787/8797 chipsets with SDIO interface.
+          8786/8787/8797/8887/8897 chipsets with SDIO interface.
 
           If you choose to build it as a module, it will be called
           mwifiex_sdio.
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index f7c97cf3840b..580aa45ec4bc 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -447,7 +447,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
         spin_lock_init(&adapter->cmd_free_q_lock);
         spin_lock_init(&adapter->cmd_pending_q_lock);
         spin_lock_init(&adapter->scan_pending_q_lock);
-        spin_lock_init(&adapter->rx_q_lock);
         spin_lock_init(&adapter->rx_proc_lock);
 
         skb_queue_head_init(&adapter->usb_rx_data_q);
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index b522f7c36901..d5070c444fe1 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -130,7 +130,6 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
 {
         unsigned long flags;
         struct sk_buff *skb;
-        bool delay_main_work = adapter->delay_main_work;
 
         spin_lock_irqsave(&adapter->rx_proc_lock, flags);
         if (adapter->rx_processing || adapter->rx_locked) {
@@ -145,10 +144,9 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
         while ((skb = skb_dequeue(&adapter->rx_data_q))) {
                 atomic_dec(&adapter->rx_pending);
                 if (adapter->delay_main_work &&
-                    (atomic_dec_return(&adapter->rx_pending) <
-                     LOW_RX_PENDING)) {
+                    (atomic_read(&adapter->rx_pending) < LOW_RX_PENDING)) {
                         adapter->delay_main_work = false;
-                        queue_work(adapter->rx_workqueue, &adapter->rx_work);
+                        queue_work(adapter->workqueue, &adapter->main_work);
                 }
                 mwifiex_handle_rx_packet(adapter, skb);
         }
@@ -156,8 +154,6 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
         adapter->rx_processing = false;
         spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
 
-        if (delay_main_work)
-                queue_work(adapter->workqueue, &adapter->main_work);
 exit_rx_proc:
         return 0;
 }
@@ -330,7 +326,8 @@ process_start:
         } while (true);
 
         spin_lock_irqsave(&adapter->main_proc_lock, flags);
-        if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) {
+        if (!adapter->delay_main_work &&
+            (adapter->int_status || IS_CARD_RX_RCVD(adapter))) {
                 spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
                 goto process_start;
         }
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 1a999999b391..e2635747d966 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -413,6 +413,7 @@ struct mwifiex_roc_cfg {
 #define FW_DUMP_MAX_NAME_LEN            8
 #define FW_DUMP_HOST_READY              0xEE
 #define FW_DUMP_DONE                    0xFF
+#define FW_DUMP_READ_DONE               0xFE
 
 struct memory_type_mapping {
         u8 mem_name[FW_DUMP_MAX_NAME_LEN];
@@ -763,8 +764,6 @@ struct mwifiex_adapter {
         struct list_head scan_pending_q;
         /* spin lock for scan_pending_q */
         spinlock_t scan_pending_q_lock;
-        /* spin lock for RX queue */
-        spinlock_t rx_q_lock;
         /* spin lock for RX processing routine */
         spinlock_t rx_proc_lock;
         struct sk_buff_head usb_rx_data_q;
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 1504b16e248e..c3a20f94f3c9 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -42,6 +42,10 @@ static struct memory_type_mapping mem_type_mapping_tbl[] = {
         {"DTCM", NULL, 0, 0xF1},
         {"SQRAM", NULL, 0, 0xF2},
         {"IRAM", NULL, 0, 0xF3},
+        {"APU", NULL, 0, 0xF4},
+        {"CIU", NULL, 0, 0xF5},
+        {"ICU", NULL, 0, 0xF6},
+        {"MAC", NULL, 0, 0xF7},
 };
 
 static int
@@ -1233,7 +1237,6 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
         struct sk_buff *skb_tmp = NULL;
         struct mwifiex_pcie_buf_desc *desc;
         struct mwifiex_pfu_buf_desc *desc2;
-        unsigned long flags;
 
         if (!mwifiex_pcie_ok_to_access_hw(adapter))
                 mwifiex_pm_wakeup_card(adapter);
@@ -1285,10 +1288,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
                                 card->rxbd_rdptr, wrptr, rx_len);
                         skb_pull(skb_data, INTF_HEADER_LEN);
                         if (adapter->rx_work_enabled) {
-                                spin_lock_irqsave(&adapter->rx_q_lock, flags);
                                 skb_queue_tail(&adapter->rx_data_q, skb_data);
-                                spin_unlock_irqrestore(&adapter->rx_q_lock,
-                                                       flags);
                                 adapter->data_received = true;
                                 atomic_inc(&adapter->rx_pending);
                         } else {
@@ -2243,8 +2243,8 @@ mwifiex_pcie_rdwr_firmware(struct mwifiex_adapter *adapter, u8 doneflag)
                 if (ctrl_data != FW_DUMP_HOST_READY) {
                         dev_info(adapter->dev,
                                  "The ctrl reg was changed, re-try again!\n");
-                        mwifiex_write_reg(adapter, reg->fw_dump_ctrl,
-                                          FW_DUMP_HOST_READY);
+                        ret = mwifiex_write_reg(adapter, reg->fw_dump_ctrl,
+                                                FW_DUMP_HOST_READY);
                         if (ret) {
                                 dev_err(adapter->dev, "PCIE write err\n");
                                 return RDWR_STATUS_FAILURE;
@@ -2266,6 +2266,7 @@ static void mwifiex_pcie_fw_dump_work(struct mwifiex_adapter *adapter)
         u8 *dbg_ptr, *end_ptr, dump_num, idx, i, read_reg, doneflag = 0;
         enum rdwr_status stat;
         u32 memory_size;
+        int ret;
         static char *env[] = { "DRIVER=mwifiex_pcie", "EVENT=fw_dump", NULL };
 
         if (!card->pcie.supports_fw_dump)
@@ -2309,6 +2310,12 @@ static void mwifiex_pcie_fw_dump_work(struct mwifiex_adapter *adapter)
 
                 if (memory_size == 0) {
                         dev_info(adapter->dev, "Firmware dump Finished!\n");
+                        ret = mwifiex_write_reg(adapter, creg->fw_dump_ctrl,
+                                                FW_DUMP_READ_DONE);
+                        if (ret) {
+                                dev_err(adapter->dev, "PCIE write err\n");
+                                goto done;
+                        }
                         break;
                 }
 
@@ -2337,11 +2344,13 @@ static void mwifiex_pcie_fw_dump_work(struct mwifiex_adapter *adapter)
                         reg_end = creg->fw_dump_end;
                         for (reg = reg_start; reg <= reg_end; reg++) {
                                 mwifiex_read_reg_byte(adapter, reg, dbg_ptr);
-                                if (dbg_ptr < end_ptr)
+                                if (dbg_ptr < end_ptr) {
                                         dbg_ptr++;
-                                else
+                                } else {
                                         dev_err(adapter->dev,
                                                 "Allocated buf not enough\n");
+                                        goto done;
+                                }
                         }
 
                         if (stat != RDWR_STATUS_DONE)
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index c09ebeee6ddf..ca64d4c94112 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -926,6 +926,23 @@ mwifiex_config_scan(struct mwifiex_private *priv,
                 if ((i && ssid_filter) ||
                     !is_zero_ether_addr(scan_cfg_out->specific_bssid))
                         *filtered_scan = true;
+
+                if (user_scan_in->scan_chan_gap) {
+                        dev_dbg(adapter->dev, "info: scan: channel gap = %d\n",
+                                user_scan_in->scan_chan_gap);
+                        *max_chan_per_scan =
+                                        MWIFIEX_MAX_CHANNELS_PER_SPECIFIC_SCAN;
+
+                        chan_gap_tlv = (void *)tlv_pos;
+                        chan_gap_tlv->header.type =
+                                         cpu_to_le16(TLV_TYPE_SCAN_CHANNEL_GAP);
+                        chan_gap_tlv->header.len =
+                                    cpu_to_le16(sizeof(chan_gap_tlv->chan_gap));
+                        chan_gap_tlv->chan_gap =
+                                     cpu_to_le16((user_scan_in->scan_chan_gap));
+                        tlv_pos +=
+                                  sizeof(struct mwifiex_ie_types_scan_chan_gap);
+                }
         } else {
                 scan_cfg_out->bss_mode = (u8) adapter->scan_mode;
                 num_probes = adapter->scan_probes;
@@ -940,22 +957,6 @@ mwifiex_config_scan(struct mwifiex_private *priv,
         else
                 *max_chan_per_scan = MWIFIEX_DEF_CHANNELS_PER_SCAN_CMD;
 
-        if (user_scan_in->scan_chan_gap) {
-                *max_chan_per_scan = MWIFIEX_MAX_CHANNELS_PER_SPECIFIC_SCAN;
-                dev_dbg(adapter->dev, "info: scan: channel gap = %d\n",
-                        user_scan_in->scan_chan_gap);
-
-                chan_gap_tlv = (void *)tlv_pos;
-                chan_gap_tlv->header.type =
-                                         cpu_to_le16(TLV_TYPE_SCAN_CHANNEL_GAP);
-                chan_gap_tlv->header.len =
-                        cpu_to_le16(sizeof(chan_gap_tlv->chan_gap));
-                chan_gap_tlv->chan_gap =
-                                     cpu_to_le16((user_scan_in->scan_chan_gap));
-
-                tlv_pos += sizeof(struct mwifiex_ie_types_scan_chan_gap);
-        }
-
         /* If the input config or adapter has the number of Probes set,
            add tlv */
         if (num_probes) {
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index ea8fc587e90f..b25766b43b9f 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -279,6 +279,8 @@ static int mwifiex_sdio_suspend(struct device *dev)
 #define SDIO_DEVICE_ID_MARVELL_8797   (0x9129)
 /* Device ID for SD8897 */
 #define SDIO_DEVICE_ID_MARVELL_8897   (0x912d)
+/* Device ID for SD8887 */
+#define SDIO_DEVICE_ID_MARVELL_8887   (0x9135)
 
 /* WLAN IDs */
 static const struct sdio_device_id mwifiex_ids[] = {
@@ -290,6 +292,8 @@ static const struct sdio_device_id mwifiex_ids[] = {
                 .driver_data = (unsigned long) &mwifiex_sdio_sd8797},
         {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897),
                 .driver_data = (unsigned long) &mwifiex_sdio_sd8897},
+        {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887),
+                .driver_data = (unsigned long)&mwifiex_sdio_sd8887},
         {},
 };
 
@@ -448,28 +452,31 @@ static int mwifiex_pm_wakeup_card_complete(struct mwifiex_adapter *adapter)
 static int mwifiex_init_sdio_new_mode(struct mwifiex_adapter *adapter)
 {
         u8 reg;
+        struct sdio_mmc_card *card = adapter->card;
 
         adapter->ioport = MEM_PORT;
 
         /* enable sdio new mode */
-        if (mwifiex_read_reg(adapter, CARD_CONFIG_2_1_REG, &reg))
+        if (mwifiex_read_reg(adapter, card->reg->card_cfg_2_1_reg, &reg))
                 return -1;
-        if (mwifiex_write_reg(adapter, CARD_CONFIG_2_1_REG,
+        if (mwifiex_write_reg(adapter, card->reg->card_cfg_2_1_reg,
                               reg | CMD53_NEW_MODE))
                 return -1;
 
         /* Configure cmd port and enable reading rx length from the register */
-        if (mwifiex_read_reg(adapter, CMD_CONFIG_0, &reg))
+        if (mwifiex_read_reg(adapter, card->reg->cmd_cfg_0, &reg))
                 return -1;
-        if (mwifiex_write_reg(adapter, CMD_CONFIG_0, reg | CMD_PORT_RD_LEN_EN))
+        if (mwifiex_write_reg(adapter, card->reg->cmd_cfg_0,
+                              reg | CMD_PORT_RD_LEN_EN))
                 return -1;
 
         /* Enable Dnld/Upld ready auto reset for cmd port after cmd53 is
          * completed
          */
-        if (mwifiex_read_reg(adapter, CMD_CONFIG_1, &reg))
+        if (mwifiex_read_reg(adapter, card->reg->cmd_cfg_1, &reg))
                 return -1;
-        if (mwifiex_write_reg(adapter, CMD_CONFIG_1, reg | CMD_PORT_AUTO_EN))
+        if (mwifiex_write_reg(adapter, card->reg->cmd_cfg_1,
+                              reg | CMD_PORT_AUTO_EN))
                 return -1;
 
         return 0;
@@ -496,17 +503,17 @@ static int mwifiex_init_sdio_ioport(struct mwifiex_adapter *adapter)
         }
 
         /* Read the IO port */
-        if (!mwifiex_read_reg(adapter, IO_PORT_0_REG, &reg))
+        if (!mwifiex_read_reg(adapter, card->reg->io_port_0_reg, &reg))
                 adapter->ioport |= (reg & 0xff);
         else
                 return -1;
 
-        if (!mwifiex_read_reg(adapter, IO_PORT_1_REG, &reg))
+        if (!mwifiex_read_reg(adapter, card->reg->io_port_1_reg, &reg))
                 adapter->ioport |= ((reg & 0xff) << 8);
         else
                 return -1;
 
-        if (!mwifiex_read_reg(adapter, IO_PORT_2_REG, &reg))
+        if (!mwifiex_read_reg(adapter, card->reg->io_port_2_reg, &reg))
                 adapter->ioport |= ((reg & 0xff) << 16);
         else
                 return -1;
@@ -514,8 +521,8 @@ cont:
         pr_debug("info: SDIO FUNC1 IO port: %#x\n", adapter->ioport);
 
         /* Set Host interrupt reset to read to clear */
-        if (!mwifiex_read_reg(adapter, HOST_INT_RSR_REG, &reg))
-                mwifiex_write_reg(adapter, HOST_INT_RSR_REG,
+        if (!mwifiex_read_reg(adapter, card->reg->host_int_rsr_reg, &reg))
+                mwifiex_write_reg(adapter, card->reg->host_int_rsr_reg,
                                   reg | card->reg->sdio_int_mask);
         else
                 return -1;
@@ -708,7 +715,7 @@ static void mwifiex_sdio_disable_host_int(struct mwifiex_adapter *adapter)
         struct sdio_func *func = card->func;
 
         sdio_claim_host(func);
-        mwifiex_write_reg_locked(func, HOST_INT_MASK_REG, 0);
+        mwifiex_write_reg_locked(func, card->reg->host_int_mask_reg, 0);
         sdio_release_irq(func);
         sdio_release_host(func);
 }
@@ -729,7 +736,7 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter)
                 return;
         }
 
-        sdio_ireg = card->mp_regs[HOST_INTSTATUS_REG];
+        sdio_ireg = card->mp_regs[card->reg->host_int_status_reg];
         if (sdio_ireg) {
                 /*
                  * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS
@@ -794,7 +801,7 @@ static int mwifiex_sdio_enable_host_int(struct mwifiex_adapter *adapter)
         }
 
         /* Simply write the mask to the register */
-        ret = mwifiex_write_reg_locked(func, HOST_INT_MASK_REG,
+        ret = mwifiex_write_reg_locked(func, card->reg->host_int_mask_reg,
                                        card->reg->host_int_enable);
         if (ret) {
                 dev_err(adapter->dev, "enable host interrupt failed\n");
@@ -1039,7 +1046,6 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
                                     struct sk_buff *skb, u32 upld_typ)
 {
         u8 *cmd_buf;
-        unsigned long flags;
         __le16 *curr_ptr = (__le16 *)skb->data;
         u16 pkt_len = le16_to_cpu(*curr_ptr);
 
@@ -1050,9 +1056,7 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
         case MWIFIEX_TYPE_DATA:
                 dev_dbg(adapter->dev, "info: --- Rx: Data packet ---\n");
                 if (adapter->rx_work_enabled) {
-                        spin_lock_irqsave(&adapter->rx_q_lock, flags);
                         skb_queue_tail(&adapter->rx_data_q, skb);
-                        spin_unlock_irqrestore(&adapter->rx_q_lock, flags);
                         adapter->data_received = true;
                         atomic_inc(&adapter->rx_pending);
                 } else {
@@ -1337,8 +1341,8 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
                 u32 pkt_type;
 
                 /* read the len of control packet */
-                rx_len = card->mp_regs[CMD_RD_LEN_1] << 8;
-                rx_len |= (u16) card->mp_regs[CMD_RD_LEN_0];
+                rx_len = card->mp_regs[reg->cmd_rd_len_1] << 8;
+                rx_len |= (u16)card->mp_regs[reg->cmd_rd_len_0];
                 rx_blocks = DIV_ROUND_UP(rx_len, MWIFIEX_SDIO_BLOCK_SIZE);
                 if (rx_len <= INTF_HEADER_LEN ||
                     (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE) >
@@ -1826,11 +1830,11 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
         sdio_set_drvdata(card->func, card);
 
         /*
-         * Read the HOST_INT_STATUS_REG for ACK the first interrupt got
+         * Read the host_int_status_reg for ACK the first interrupt got
          * from the bootloader. If we don't do this we get a interrupt
          * as soon as we register the irq.
          */
-        mwifiex_read_reg(adapter, HOST_INTSTATUS_REG, &sdio_ireg);
+        mwifiex_read_reg(adapter, card->reg->host_int_status_reg, &sdio_ireg);
 
         /* Get SDIO ioport */
         mwifiex_init_sdio_ioport(adapter);
@@ -2233,3 +2237,4 @@ MODULE_FIRMWARE(SD8786_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8897_DEFAULT_FW_NAME);
+MODULE_FIRMWARE(SD8887_DEFAULT_FW_NAME);
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index 6b8835ec88f1..20cd9adc98d3 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
@@ -33,6 +33,7 @@
 #define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"
 #define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin"
 #define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin"
+#define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin"
 
 #define BLOCK_MODE      1
 #define BYTE_MODE       0
@@ -52,13 +53,9 @@
 #define HOST_TERM_CMD53                 (0x1U << 2)
 #define REG_PORT                        0
 #define MEM_PORT                        0x10000
-#define CMD_RD_LEN_0                    0xB4
-#define CMD_RD_LEN_1                    0xB5
-#define CARD_CONFIG_2_1_REG             0xCD
+
 #define CMD53_NEW_MODE                  (0x1U << 0)
-#define CMD_CONFIG_0                    0xB8
 #define CMD_PORT_RD_LEN_EN              (0x1U << 2)
-#define CMD_CONFIG_1                    0xB9
 #define CMD_PORT_AUTO_EN                (0x1U << 0)
 #define CMD_PORT_SLCT                   0x8000
 #define UP_LD_CMD_PORT_HOST_INT_STATUS  (0x40U)
@@ -70,38 +67,23 @@
 /* Misc. Config Register : Auto Re-enable interrupts */
 #define AUTO_RE_ENABLE_INT              BIT(4)
 
-/* Host Control Registers */
-/* Host Control Registers : I/O port 0 */
-#define IO_PORT_0_REG                   0x78
-/* Host Control Registers : I/O port 1 */
-#define IO_PORT_1_REG                   0x79
-/* Host Control Registers : I/O port 2 */
-#define IO_PORT_2_REG                   0x7A
-
 /* Host Control Registers : Configuration */
 #define CONFIGURATION_REG               0x00
 /* Host Control Registers : Host power up */
 #define HOST_POWER_UP                   (0x1U << 1)
 
-/* Host Control Registers : Host interrupt mask */
-#define HOST_INT_MASK_REG               0x02
 /* Host Control Registers : Upload host interrupt mask */
 #define UP_LD_HOST_INT_MASK             (0x1U)
 /* Host Control Registers : Download host interrupt mask */
 #define DN_LD_HOST_INT_MASK             (0x2U)
 
-/* Host Control Registers : Host interrupt status */
-#define HOST_INTSTATUS_REG              0x03
 /* Host Control Registers : Upload host interrupt status */
 #define UP_LD_HOST_INT_STATUS           (0x1U)
 /* Host Control Registers : Download host interrupt status */
 #define DN_LD_HOST_INT_STATUS           (0x2U)
 
-/* Host Control Registers : Host interrupt RSR */
-#define HOST_INT_RSR_REG                0x01
-
 /* Host Control Registers : Host interrupt status */
-#define HOST_INT_STATUS_REG             0x28
+#define CARD_INT_STATUS_REG             0x28
 
 /* Card Control Registers : Card I/O ready */
 #define CARD_IO_READY                   (0x1U << 3)
@@ -203,10 +185,16 @@ struct mwifiex_sdio_card_reg {
         u8 base_1_reg;
         u8 poll_reg;
         u8 host_int_enable;
+        u8 host_int_rsr_reg;
+        u8 host_int_status_reg;
+        u8 host_int_mask_reg;
         u8 status_reg_0;
         u8 status_reg_1;
         u8 sdio_int_mask;
         u32 data_port_mask;
+        u8 io_port_0_reg;
+        u8 io_port_1_reg;
+        u8 io_port_2_reg;
         u8 max_mp_regs;
         u8 rd_bitmap_l;
         u8 rd_bitmap_u;
@@ -219,6 +207,15 @@ struct mwifiex_sdio_card_reg {
         u8 rd_len_p0_l;
         u8 rd_len_p0_u;
         u8 card_misc_cfg_reg;
+        u8 card_cfg_2_1_reg;
+        u8 cmd_rd_len_0;
+        u8 cmd_rd_len_1;
+        u8 cmd_rd_len_2;
+        u8 cmd_rd_len_3;
+        u8 cmd_cfg_0;
+        u8 cmd_cfg_1;
+        u8 cmd_cfg_2;
+        u8 cmd_cfg_3;
         u8 fw_dump_ctrl;
         u8 fw_dump_start;
         u8 fw_dump_end;
@@ -274,10 +271,16 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd87xx = {
         .base_1_reg = 0x0041,
         .poll_reg = 0x30,
         .host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK,
+        .host_int_rsr_reg = 0x1,
+        .host_int_mask_reg = 0x02,
+        .host_int_status_reg = 0x03,
         .status_reg_0 = 0x60,
         .status_reg_1 = 0x61,
         .sdio_int_mask = 0x3f,
         .data_port_mask = 0x0000fffe,
+        .io_port_0_reg = 0x78,
+        .io_port_1_reg = 0x79,
+        .io_port_2_reg = 0x7A,
         .max_mp_regs = 64,
         .rd_bitmap_l = 0x04,
         .rd_bitmap_u = 0x05,
@@ -296,10 +299,16 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8897 = {
         .poll_reg = 0x50,
         .host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK |
                         CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK,
+        .host_int_rsr_reg = 0x1,
+        .host_int_status_reg = 0x03,
+        .host_int_mask_reg = 0x02,
         .status_reg_0 = 0xc0,
         .status_reg_1 = 0xc1,
         .sdio_int_mask = 0xff,
         .data_port_mask = 0xffffffff,
+        .io_port_0_reg = 0xD8,
+        .io_port_1_reg = 0xD9,
+        .io_port_2_reg = 0xDA,
         .max_mp_regs = 184,
         .rd_bitmap_l = 0x04,
         .rd_bitmap_u = 0x05,
@@ -312,11 +321,61 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8897 = {
         .rd_len_p0_l = 0x0c,
         .rd_len_p0_u = 0x0d,
         .card_misc_cfg_reg = 0xcc,
+        .card_cfg_2_1_reg = 0xcd,
+        .cmd_rd_len_0 = 0xb4,
+        .cmd_rd_len_1 = 0xb5,
+        .cmd_rd_len_2 = 0xb6,
+        .cmd_rd_len_3 = 0xb7,
+        .cmd_cfg_0 = 0xb8,
+        .cmd_cfg_1 = 0xb9,
+        .cmd_cfg_2 = 0xba,
+        .cmd_cfg_3 = 0xbb,
         .fw_dump_ctrl = 0xe2,
         .fw_dump_start = 0xe3,
         .fw_dump_end = 0xea,
 };
 
+static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8887 = {
+        .start_rd_port = 0,
+        .start_wr_port = 0,
+        .base_0_reg = 0x6C,
+        .base_1_reg = 0x6D,
+        .poll_reg = 0x5C,
+        .host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK |
+                        CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK,
+        .host_int_rsr_reg = 0x4,
+        .host_int_status_reg = 0x0C,
+        .host_int_mask_reg = 0x08,
+        .status_reg_0 = 0x90,
+        .status_reg_1 = 0x91,
+        .sdio_int_mask = 0xff,
+        .data_port_mask = 0xffffffff,
+        .io_port_0_reg = 0xE4,
+        .io_port_1_reg = 0xE5,
+        .io_port_2_reg = 0xE6,
+        .max_mp_regs = 196,
+        .rd_bitmap_l = 0x10,
+        .rd_bitmap_u = 0x11,
+        .rd_bitmap_1l = 0x12,
+        .rd_bitmap_1u = 0x13,
+        .wr_bitmap_l = 0x14,
+        .wr_bitmap_u = 0x15,
+        .wr_bitmap_1l = 0x16,
+        .wr_bitmap_1u = 0x17,
+        .rd_len_p0_l = 0x18,
+        .rd_len_p0_u = 0x19,
+        .card_misc_cfg_reg = 0xd8,
+        .card_cfg_2_1_reg = 0xd9,
+        .cmd_rd_len_0 = 0xc0,
+        .cmd_rd_len_1 = 0xc1,
+        .cmd_rd_len_2 = 0xc2,
+        .cmd_rd_len_3 = 0xc3,
+        .cmd_cfg_0 = 0xc4,
+        .cmd_cfg_1 = 0xc5,
+        .cmd_cfg_2 = 0xc6,
+        .cmd_cfg_3 = 0xc7,
+};
+
 static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = {
         .firmware = SD8786_DEFAULT_FW_NAME,
         .reg = &mwifiex_reg_sd87xx,
@@ -369,6 +428,19 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {
         .supports_fw_dump = true,
 };
 
+static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {
+        .firmware = SD8887_DEFAULT_FW_NAME,
+        .reg = &mwifiex_reg_sd8887,
+        .max_ports = 32,
+        .mp_agg_pkt_limit = 16,
+        .supports_sdio_new_mode = true,
+        .has_control_mask = false,
+        .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
+        .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
+        .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
+        .supports_fw_dump = false,
+};
+
 /*
  * .cmdrsp_complete handler
  */
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 225f7498048b..1c2ca291d1f5 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -938,7 +938,7 @@ mwifiex_cmd_802_11_key_material_v1(struct mwifiex_private *priv,
                 cmd->size = cpu_to_le16(sizeof(key_material->action) + S_DS_GEN
                                         + key_param_len);
 
-                if (priv->bss_type == MWIFIEX_BSS_TYPE_UAP) {
+                if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {
                         tlv_mac = (void *)((u8 *)&key_material->key_param_set +
                                            key_param_len);
                         tlv_mac->header.type =
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index b7434df51e7c..ebd5625d13f1 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -2041,7 +2041,7 @@ struct mac_iveiv_entry {
  * 2 - drop tx power by 12dBm,
  * 3 - increase tx power by 6dBm
  */
-#define BBP1_TX_POWER_CTRL              FIELD8(0x07)
+#define BBP1_TX_POWER_CTRL              FIELD8(0x03)
 #define BBP1_TX_ANTENNA                 FIELD8(0x18)
 
 /*
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 026d912f516b..ded967aa6ecb 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -189,6 +189,9 @@ static const int rtl8187se_queues_map[RTL8187SE_NR_TX_QUEUES] = {5, 4, 3, 2, 7};
 
 static const int rtl8180_queues_map[RTL8180_NR_TX_QUEUES] = {4, 7};
 
+/* LNA gain table for rtl8187se */
+static const u8 rtl8187se_lna_gain[4] = {02, 17, 29, 39};
+
 void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data)
 {
         struct rtl8180_priv *priv = dev->priv;
@@ -210,13 +213,14 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
         struct rtl8180_priv *priv = dev->priv;
         struct rtl818x_rx_cmd_desc *cmd_desc;
         unsigned int count = 32;
-        u8 agc, sq, signal = 1;
+        u8 agc, sq;
+        s8 signal = 1;
         dma_addr_t mapping;
 
         while (count--) {
                 void *entry = priv->rx_ring + priv->rx_idx * priv->rx_ring_sz;
                 struct sk_buff *skb = priv->rx_buf[priv->rx_idx];
-                u32 flags, flags2;
+                u32 flags, flags2, flags3 = 0;
                 u64 tsft;
 
                 if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8187SE) {
@@ -229,6 +233,7 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
                          * the ownership flag
                          */
                         rmb();
+                        flags3 = le32_to_cpu(desc->flags3);
                         flags2 = le32_to_cpu(desc->flags2);
                         tsft = le64_to_cpu(desc->tsft);
                 } else {
@@ -287,8 +292,21 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
                                 signal = priv->rf->calc_rssi(agc, sq);
                                 break;
                         case RTL818X_CHIP_FAMILY_RTL8187SE:
-                                /* TODO: rtl8187se rssi */
-                                signal = 10;
+                                /* OFDM measure reported by HW is signed,
+                                 * in 0.5dBm unit, with zero centered @ -41dBm
+                                 * input signal.
+                                 */
+                                if (rx_status.rate_idx > 3) {
+                                        signal = (s8)((flags3 >> 16) & 0xff);
+                                        signal = signal / 2 - 41;
+                                } else {
+                                        int idx, bb;
+
+                                        idx = (agc & 0x60) >> 5;
+                                        bb = (agc & 0x1F) * 2;
+                                        /* bias + BB gain + LNA gain */
+                                        signal = 4 - bb - rtl8187se_lna_gain[idx];
+                                }
                                 break;
                         }
                         rx_status.signal = signal;
@@ -1835,7 +1853,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
                 pci_try_set_mwi(pdev);
         }
 
-        if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8185)
+        if (priv->chip_family != RTL818X_CHIP_FAMILY_RTL8180)
                 dev->flags |= IEEE80211_HW_SIGNAL_DBM;
         else
                 dev->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index bf3cf124e4ea..5cf509d346e8 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -5,7 +5,8 @@ menuconfig RTL_CARDS
         ---help---
           This option will enable support for the Realtek mac80211-based
           wireless drivers. Drivers rtl8192ce, rtl8192cu, rtl8192se, rtl8192de,
-          rtl8723ae, rtl8723be, and rtl8188ae share some common code.
+          rtl8723ae, rtl8723be, rtl8188ee, rtl8192ee, and rtl8821ae share
+          some common code.
 
 if RTL_CARDS
 
@@ -80,6 +81,30 @@ config RTL8188EE
 
         If you choose to build it as a module, it will be called rtl8188ee
 
+config RTL8192EE
+        tristate "Realtek RTL8192EE Wireless Network Adapter"
+        depends on PCI
+        select RTLWIFI
+        select RTLWIFI_PCI
+        select RTLBTCOEXIST
+        ---help---
+        This is the driver for Realtek RTL8192EE 802.11n PCIe
+        wireless network adapters.
+
+        If you choose to build it as a module, it will be called rtl8192ee
+
+config RTL8821AE
+        tristate "Realtek RTL8821AE/RTL8812AE Wireless Network Adapter"
+        depends on PCI
+        select RTLWIFI
+        select RTLWIFI_PCI
+        select RTLBTCOEXIST
+        ---help---
+        This is the driver for Realtek RTL8i821AE/RTL8812AE 802.11av PCIe
+        wireless network adapters.
+
+        If you choose to build it as a module, it will be called rtl8821ae
+
 config RTL8192CU
         tristate "Realtek RTL8192CU/RTL8188CU USB Wireless Network Adapter"
         depends on USB
@@ -123,7 +148,7 @@ config RTL8723_COMMON
 
 config RTLBTCOEXIST
         tristate
-        depends on RTL8723AE || RTL8723BE
+        depends on RTL8723AE || RTL8723BE || RTL8821AE || RTL8192EE
         default y
 
 endif
diff --git a/drivers/net/wireless/rtlwifi/Makefile b/drivers/net/wireless/rtlwifi/Makefile
index bba36a06abcc..ad6d3c52ec57 100644
--- a/drivers/net/wireless/rtlwifi/Makefile
+++ b/drivers/net/wireless/rtlwifi/Makefile
@@ -28,5 +28,7 @@ obj-$(CONFIG_RTL8723BE)		+= rtl8723be/
 obj-$(CONFIG_RTL8188EE)         += rtl8188ee/
 obj-$(CONFIG_RTLBTCOEXIST)      += btcoexist/
 obj-$(CONFIG_RTL8723_COMMON)    += rtl8723com/
+obj-$(CONFIG_RTL8821AE)         += rtl8821ae/
+obj-$(CONFIG_RTL8192EE)         += rtl8192ee/
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 93bb384eb001..58ba71830886 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -34,7 +30,7 @@
 #include "cam.h"
 #include "ps.h"
 #include "regd.h"
-
+#include "pci.h"
 #include <linux/ip.h>
 #include <linux/module.h>
 #include <linux/udp.h>
@@ -211,7 +207,6 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,
          *highest supported RX rate
          */
         if (rtlpriv->dm.supp_phymode_switch) {
-
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
                          "Support phy mode switch\n");
 
@@ -244,6 +239,83 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,
         }
 }
 
+static void _rtl_init_hw_vht_capab(struct ieee80211_hw *hw,
+                                   struct ieee80211_sta_vht_cap *vht_cap)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                u16 mcs_map;
+
+                vht_cap->vht_supported = true;
+                vht_cap->cap =
+                        IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 |
+                        IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
+                        IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
+                        IEEE80211_VHT_CAP_SHORT_GI_80 |
+                        IEEE80211_VHT_CAP_TXSTBC |
+                        IEEE80211_VHT_CAP_RXSTBC_1 |
+                        IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |
+                        IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
+                        IEEE80211_VHT_CAP_HTC_VHT |
+                        IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |
+                        IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |
+                        IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |
+                        0;
+
+                mcs_map = IEEE80211_VHT_MCS_SUPPORT_0_9 << 0 |
+                        IEEE80211_VHT_MCS_SUPPORT_0_9 << 2 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 4 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 6 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 8 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 10 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 14;
+
+                vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
+                vht_cap->vht_mcs.rx_highest =
+                        cpu_to_le16(MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS9);
+                vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
+                vht_cap->vht_mcs.tx_highest =
+                        cpu_to_le16(MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS9);
+        } else if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                u16 mcs_map;
+
+                vht_cap->vht_supported = true;
+                vht_cap->cap =
+                        IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 |
+                        IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
+                        IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
+                        IEEE80211_VHT_CAP_SHORT_GI_80 |
+                        IEEE80211_VHT_CAP_TXSTBC |
+                        IEEE80211_VHT_CAP_RXSTBC_1 |
+                        IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |
+                        IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
+                        IEEE80211_VHT_CAP_HTC_VHT |
+                        IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |
+                        IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |
+                        IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |
+                        0;
+
+                mcs_map = IEEE80211_VHT_MCS_SUPPORT_0_9 << 0 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 2 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 4 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 6 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 8 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 10 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 |
+                        IEEE80211_VHT_MCS_NOT_SUPPORTED << 14;
+
+                vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
+                vht_cap->vht_mcs.rx_highest =
+                        cpu_to_le16(MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS9);
+                vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
+                vht_cap->vht_mcs.tx_highest =
+                        cpu_to_le16(MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS9);
+        }
+}
+
 static void _rtl_init_mac80211(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -252,9 +324,8 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct ieee80211_supported_band *sband;
 
-
-        if (rtlhal->macphymode == SINGLEMAC_SINGLEPHY && rtlhal->bandset ==
-            BAND_ON_BOTH) {
+        if (rtlhal->macphymode == SINGLEMAC_SINGLEPHY &&
+            rtlhal->bandset == BAND_ON_BOTH) {
                 /* 1: 2.4 G bands */
                 /* <1> use  mac->bands as mem for hw->wiphy->bands */
                 sband = &(rtlmac->bands[IEEE80211_BAND_2GHZ]);
@@ -282,6 +353,7 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                 /* <3> init ht cap base on ant_num */
                 _rtl_init_hw_ht_capab(hw, &sband->ht_cap);
 
+                _rtl_init_hw_vht_capab(hw, &sband->vht_cap);
                 /* <4> set mac->sband to wiphy->sband */
                 hw->wiphy->bands[IEEE80211_BAND_5GHZ] = sband;
         } else {
@@ -292,8 +364,8 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                         /* <2> set hw->wiphy->bands[IEEE80211_BAND_2GHZ]
                          * to default value(1T1R) */
                         memcpy(&(rtlmac->bands[IEEE80211_BAND_2GHZ]),
-                                 &rtl_band_2ghz,
-                                 sizeof(struct ieee80211_supported_band));
+                               &rtl_band_2ghz,
+                               sizeof(struct ieee80211_supported_band));
 
                         /* <3> init ht cap base on ant_num */
                         _rtl_init_hw_ht_capab(hw, &sband->ht_cap);
@@ -307,12 +379,13 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                         /* <2> set hw->wiphy->bands[IEEE80211_BAND_5GHZ]
                          * to default value(1T1R) */
                         memcpy(&(rtlmac->bands[IEEE80211_BAND_5GHZ]),
-                                 &rtl_band_5ghz,
-                                 sizeof(struct ieee80211_supported_band));
+                               &rtl_band_5ghz,
+                               sizeof(struct ieee80211_supported_band));
 
                         /* <3> init ht cap base on ant_num */
                         _rtl_init_hw_ht_capab(hw, &sband->ht_cap);
 
+                        _rtl_init_hw_vht_capab(hw, &sband->vht_cap);
                         /* <4> set mac->sband to wiphy->sband */
                         hw->wiphy->bands[IEEE80211_BAND_5GHZ] = sband;
                 } else {
@@ -326,7 +399,6 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
             IEEE80211_HW_AMPDU_AGGREGATION |
             IEEE80211_HW_CONNECTION_MONITOR |
             /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */
-            IEEE80211_HW_CONNECTION_MONITOR |
             IEEE80211_HW_MFP_CAPABLE |
             IEEE80211_HW_REPORTS_TX_ACK_STATUS | 0;
 
@@ -336,7 +408,6 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                         IEEE80211_HW_PS_NULLFUNC_STACK |
                         /* IEEE80211_HW_SUPPORTS_DYNAMIC_PS | */
                         0;
-
         hw->wiphy->interface_modes =
             BIT(NL80211_IFTYPE_AP) |
             BIT(NL80211_IFTYPE_STATION) |
@@ -344,8 +415,10 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
             BIT(NL80211_IFTYPE_MESH_POINT) |
             BIT(NL80211_IFTYPE_P2P_CLIENT) |
             BIT(NL80211_IFTYPE_P2P_GO);
-
         hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
+        hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
+
         hw->wiphy->rts_threshold = 2347;
 
         hw->queues = AC_MAX;
@@ -358,6 +431,21 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
         /* hw->max_rates = 1; */
         hw->sta_data_size = sizeof(struct rtl_sta_info);
 
+/* wowlan is not supported by kernel if CONFIG_PM is not defined */
+#ifdef CONFIG_PM
+        if (rtlpriv->psc.wo_wlan_mode) {
+                if (rtlpriv->psc.wo_wlan_mode & WAKE_ON_MAGIC_PACKET)
+                        rtlpriv->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT;
+                if (rtlpriv->psc.wo_wlan_mode & WAKE_ON_PATTERN_MATCH) {
+                        rtlpriv->wowlan.n_patterns =
+                                MAX_SUPPORT_WOL_PATTERN_NUM;
+                        rtlpriv->wowlan.pattern_min_len = MIN_WOL_PATTERN_SIZE;
+                        rtlpriv->wowlan.pattern_max_len = MAX_WOL_PATTERN_SIZE;
+                }
+                hw->wiphy->wowlan = &rtlpriv->wowlan;
+        }
+#endif
+
         /* <6> mac address */
         if (is_valid_ether_addr(rtlefuse->dev_addr)) {
                 SET_IEEE80211_PERM_ADDR(hw, rtlefuse->dev_addr);
@@ -366,7 +454,6 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                 get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1);
                 SET_IEEE80211_PERM_ADDR(hw, rtlmac1);
         }
-
 }
 
 static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
@@ -378,10 +465,9 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
                     rtl_watch_dog_timer_callback, (unsigned long)hw);
         setup_timer(&rtlpriv->works.dualmac_easyconcurrent_retrytimer,
                     rtl_easy_concurrent_retrytimer_callback, (unsigned long)hw);
-
         /* <2> work queue */
         rtlpriv->works.hw = hw;
-        rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
+        rtlpriv->works.rtl_wq = alloc_workqueue(rtlpriv->cfg->name, 0, 0);
         INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,
                           (void *)rtl_watchdog_wq_callback);
         INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
@@ -424,7 +510,7 @@ void rtl_init_rfkill(struct ieee80211_hw *hw)
         radio_state = rtlpriv->cfg->ops->radio_onoff_checking(hw, &valid);
 
         if (valid) {
-                pr_info("wireless switch is %s\n",
+                pr_info("rtlwifi: wireless switch is %s\n",
                         rtlpriv->rfkill.rfkill_state ? "on" : "off");
 
                 rtlpriv->rfkill.rfkill_state = radio_state;
@@ -466,22 +552,18 @@ int rtl_init_core(struct ieee80211_hw *hw)
 
         /* <4> locks */
         mutex_init(&rtlpriv->locks.conf_mutex);
-        mutex_init(&rtlpriv->locks.ps_mutex);
         spin_lock_init(&rtlpriv->locks.ips_lock);
         spin_lock_init(&rtlpriv->locks.irq_th_lock);
-        spin_lock_init(&rtlpriv->locks.irq_pci_lock);
-        spin_lock_init(&rtlpriv->locks.tx_lock);
         spin_lock_init(&rtlpriv->locks.h2c_lock);
         spin_lock_init(&rtlpriv->locks.rf_ps_lock);
         spin_lock_init(&rtlpriv->locks.rf_lock);
         spin_lock_init(&rtlpriv->locks.waitq_lock);
         spin_lock_init(&rtlpriv->locks.entry_list_lock);
-        spin_lock_init(&rtlpriv->locks.fw_ps_lock);
         spin_lock_init(&rtlpriv->locks.cck_and_rw_pagea_lock);
         spin_lock_init(&rtlpriv->locks.check_sendpkt_lock);
         spin_lock_init(&rtlpriv->locks.fw_ps_lock);
         spin_lock_init(&rtlpriv->locks.lps_lock);
-
+        spin_lock_init(&rtlpriv->locks.iqk_lock);
         /* <5> init list */
         INIT_LIST_HEAD(&rtlpriv->entry_list);
 
@@ -539,6 +621,7 @@ static void _rtl_query_shortgi(struct ieee80211_hw *hw,
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u8 rate_flag = info->control.rates[0].flags;
         u8 sgi_40 = 0, sgi_20 = 0, bw_40 = 0;
+        u8 sgi_80 = 0, bw_80 = 0;
         tcb_desc->use_shortgi = false;
 
         if (sta == NULL)
@@ -546,24 +629,35 @@ static void _rtl_query_shortgi(struct ieee80211_hw *hw,
 
         sgi_40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40;
         sgi_20 = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20;
+        sgi_80 = sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80;
 
-        if (!(sta->ht_cap.ht_supported))
+        if ((!sta->ht_cap.ht_supported) && (!sta->vht_cap.vht_supported))
                 return;
 
         if (!sgi_40 && !sgi_20)
                 return;
 
-        if (mac->opmode == NL80211_IFTYPE_STATION)
+        if (mac->opmode == NL80211_IFTYPE_STATION) {
                 bw_40 = mac->bw_40;
-        else if (mac->opmode == NL80211_IFTYPE_AP ||
+                bw_80 = mac->bw_80;
+        } else if (mac->opmode == NL80211_IFTYPE_AP ||
                  mac->opmode == NL80211_IFTYPE_ADHOC ||
-                 mac->opmode == NL80211_IFTYPE_MESH_POINT)
-                bw_40 = sta->bandwidth >= IEEE80211_STA_RX_BW_40;
+                 mac->opmode == NL80211_IFTYPE_MESH_POINT) {
+                bw_40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                bw_80 = sta->vht_cap.vht_supported;
+        }
 
-        if (bw_40 && sgi_40)
-                tcb_desc->use_shortgi = true;
-        else if ((bw_40 == false) && sgi_20)
-                tcb_desc->use_shortgi = true;
+        if (bw_80) {
+                if (sgi_80)
+                        tcb_desc->use_shortgi = true;
+                else
+                        tcb_desc->use_shortgi = false;
+        } else {
+                if (bw_40 && sgi_40)
+                        tcb_desc->use_shortgi = true;
+                else if (!bw_40 && sgi_20)
+                        tcb_desc->use_shortgi = true;
+        }
 
         if (!(rate_flag & IEEE80211_TX_RC_SHORT_GI))
                 tcb_desc->use_shortgi = false;
@@ -613,7 +707,7 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
                 if (mac->opmode == NL80211_IFTYPE_STATION) {
                         tcb_desc->ratr_index = 0;
                 } else if (mac->opmode == NL80211_IFTYPE_ADHOC ||
-                           mac->opmode == NL80211_IFTYPE_MESH_POINT) {
+                                mac->opmode == NL80211_IFTYPE_MESH_POINT) {
                         if (tcb_desc->multicast || tcb_desc->broadcast) {
                                 tcb_desc->hw_rate =
                                     rtlpriv->cfg->maps[RTL_RC_CCK_RATE2M];
@@ -634,7 +728,13 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
                     mac->opmode == NL80211_IFTYPE_MESH_POINT) {
                         tcb_desc->mac_id = 0;
 
-                        if (mac->mode == WIRELESS_MODE_N_24G)
+                        if (mac->mode == WIRELESS_MODE_AC_5G)
+                                tcb_desc->ratr_index =
+                                        RATR_INX_WIRELESS_AC_5N;
+                        else if (mac->mode == WIRELESS_MODE_AC_24G)
+                                tcb_desc->ratr_index =
+                                        RATR_INX_WIRELESS_AC_24N;
+                        else if (mac->mode == WIRELESS_MODE_N_24G)
                                 tcb_desc->ratr_index = RATR_INX_WIRELESS_NGB;
                         else if (mac->mode == WIRELESS_MODE_N_5G)
                                 tcb_desc->ratr_index = RATR_INX_WIRELESS_NG;
@@ -644,8 +744,9 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
                                 tcb_desc->ratr_index = RATR_INX_WIRELESS_B;
                         else if (mac->mode & WIRELESS_MODE_A)
                                 tcb_desc->ratr_index = RATR_INX_WIRELESS_G;
+
                 } else if (mac->opmode == NL80211_IFTYPE_AP ||
-                           mac->opmode == NL80211_IFTYPE_ADHOC) {
+                        mac->opmode == NL80211_IFTYPE_ADHOC) {
                         if (NULL != sta) {
                                 if (sta->aid > 0)
                                         tcb_desc->mac_id = sta->aid + 1;
@@ -671,7 +772,8 @@ static void _rtl_query_bandwidth_mode(struct ieee80211_hw *hw,
         if (mac->opmode == NL80211_IFTYPE_AP ||
             mac->opmode == NL80211_IFTYPE_ADHOC ||
             mac->opmode == NL80211_IFTYPE_MESH_POINT) {
-                if (sta->bandwidth == IEEE80211_STA_RX_BW_20)
+                if (!(sta->ht_cap.ht_supported) ||
+                    !(sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40))
                         return;
         } else if (mac->opmode == NL80211_IFTYPE_STATION) {
                 if (!mac->bw_40 || !(sta->ht_cap.ht_supported))
@@ -684,16 +786,74 @@ static void _rtl_query_bandwidth_mode(struct ieee80211_hw *hw,
         if (tcb_desc->hw_rate <= rtlpriv->cfg->maps[RTL_RC_OFDM_RATE54M])
                 return;
 
-        tcb_desc->packet_bw = true;
+        tcb_desc->packet_bw = HT_CHANNEL_WIDTH_20_40;
+
+        if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE ||
+            rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8821AE) {
+                if (mac->opmode == NL80211_IFTYPE_AP ||
+                    mac->opmode == NL80211_IFTYPE_ADHOC ||
+                    mac->opmode == NL80211_IFTYPE_MESH_POINT) {
+                        if (!(sta->vht_cap.vht_supported))
+                                return;
+                } else if (mac->opmode == NL80211_IFTYPE_STATION) {
+                        if (!mac->bw_80 ||
+                            !(sta->vht_cap.vht_supported))
+                                return;
+                }
+                if (tcb_desc->hw_rate <=
+                        rtlpriv->cfg->maps[RTL_RC_HT_RATEMCS15])
+                        return;
+                tcb_desc->packet_bw = HT_CHANNEL_WIDTH_80;
+        }
 }
 
-static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw)
+static u8 _rtl_get_vht_highest_n_rate(struct ieee80211_hw *hw,
+                                      struct ieee80211_sta *sta)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         u8 hw_rate;
+        u16 tx_mcs_map = le16_to_cpu(sta->vht_cap.vht_mcs.tx_mcs_map);
+
+        if ((get_rf_type(rtlphy) == RF_2T2R) &&
+            (tx_mcs_map & 0x000c) != 0x000c) {
+                if ((tx_mcs_map & 0x000c) >> 2 ==
+                        IEEE80211_VHT_MCS_SUPPORT_0_7)
+                        hw_rate =
+                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_2SS_MCS7];
+                else if ((tx_mcs_map  & 0x000c) >> 2 ==
+                        IEEE80211_VHT_MCS_SUPPORT_0_8)
+                        hw_rate =
+                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_2SS_MCS9];
+                else
+                        hw_rate =
+                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_2SS_MCS9];
+        } else {
+                if ((tx_mcs_map  & 0x0003) ==
+                        IEEE80211_VHT_MCS_SUPPORT_0_7)
+                        hw_rate =
+                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_1SS_MCS7];
+                else if ((tx_mcs_map  & 0x0003) ==
+                        IEEE80211_VHT_MCS_SUPPORT_0_8)
+                        hw_rate =
+                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_1SS_MCS9];
+                else
+                        hw_rate =
+                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_1SS_MCS9];
+        }
 
-        if (get_rf_type(rtlphy) == RF_2T2R)
+        return hw_rate;
+}
+
+static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw,
+                                  struct ieee80211_sta *sta)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 hw_rate;
+
+        if ((get_rf_type(rtlphy) == RF_2T2R) &&
+            (sta->ht_cap.mcs.rx_mask[1] != 0))
                 hw_rate = rtlpriv->cfg->maps[RTL_RC_HT_RATEMCS15];
         else
                 hw_rate = rtlpriv->cfg->maps[RTL_RC_HT_RATEMCS7];
@@ -801,9 +961,7 @@ int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
                                 break;
                         }
                 }
-
         } else {
-
                 switch (desc_rate) {
                 case DESC92_RATEMCS0:
                         rate_idx = 0;
@@ -862,31 +1020,6 @@ int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(rtlwifi_rate_mapping);
 
-bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        __le16 fc = rtl_get_fc(skb);
-
-        if (rtlpriv->dm.supp_phymode_switch &&
-            mac->link_state < MAC80211_LINKED &&
-            (ieee80211_is_auth(fc) || ieee80211_is_probe_req(fc))) {
-                if (rtlpriv->cfg->ops->chk_switch_dmdp)
-                        rtlpriv->cfg->ops->chk_switch_dmdp(hw);
-        }
-        if (ieee80211_is_auth(fc)) {
-                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
-                rtl_ips_nic_on(hw);
-
-                mac->link_state = MAC80211_LINKING;
-                /* Dual mac */
-                rtlpriv->phy.need_iqk = true;
-        }
-
-        return true;
-}
-EXPORT_SYMBOL_GPL(rtl_tx_mgmt_proc);
-
 void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                       struct ieee80211_tx_info *info,
                       struct ieee80211_sta *sta,
@@ -896,13 +1029,11 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
         struct rtl_mac *rtlmac = rtl_mac(rtl_priv(hw));
         struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
         struct ieee80211_rate *txrate;
-        __le16 fc = hdr->frame_control;
+        __le16 fc = rtl_get_fc(skb);
 
         txrate = ieee80211_get_tx_rate(hw, info);
         if (txrate)
                 tcb_desc->hw_rate = txrate->hw_value;
-        else
-                tcb_desc->hw_rate = 0;
 
         if (ieee80211_is_data(fc)) {
                 /*
@@ -929,15 +1060,21 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                          *and N rate will all be controlled by FW
                          *when tcb_desc->use_driver_rate = false
                          */
-                        if (sta && (sta->ht_cap.ht_supported)) {
-                                tcb_desc->hw_rate = _rtl_get_highest_n_rate(hw);
+                        if (sta && sta->vht_cap.vht_supported) {
+                                tcb_desc->hw_rate =
+                                _rtl_get_vht_highest_n_rate(hw, sta);
                         } else {
-                                if (rtlmac->mode == WIRELESS_MODE_B) {
+                                if (sta && (sta->ht_cap.ht_supported)) {
                                         tcb_desc->hw_rate =
-                                           rtlpriv->cfg->maps[RTL_RC_CCK_RATE11M];
+                                                _rtl_get_highest_n_rate(hw, sta);
                                 } else {
-                                        tcb_desc->hw_rate =
-                                           rtlpriv->cfg->maps[RTL_RC_OFDM_RATE54M];
+                                        if (rtlmac->mode == WIRELESS_MODE_B) {
+                                                tcb_desc->hw_rate =
+                                                    rtlpriv->cfg->maps[RTL_RC_CCK_RATE11M];
+                                        } else {
+                                                tcb_desc->hw_rate =
+                                                    rtlpriv->cfg->maps[RTL_RC_OFDM_RATE54M];
+                                        }
                                 }
                         }
                 }
@@ -962,54 +1099,58 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(rtl_get_tcb_desc);
 
-static bool addbareq_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
+bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct ieee80211_sta *sta = NULL;
-        struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
-        struct rtl_sta_info *sta_entry = NULL;
-        struct ieee80211_mgmt *mgmt = (void *)skb->data;
-        u16 capab = 0, tid = 0;
-        struct rtl_tid_data *tid_data;
-        struct sk_buff *skb_delba = NULL;
-        struct ieee80211_rx_status rx_status = { 0 };
+        __le16 fc = rtl_get_fc(skb);
 
-        rcu_read_lock();
-        sta = rtl_find_sta(hw, hdr->addr3);
-        if (sta == NULL) {
-                RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_EMERG,
-                         "sta is NULL\n");
-                rcu_read_unlock();
-                return true;
+        if (rtlpriv->dm.supp_phymode_switch &&
+            mac->link_state < MAC80211_LINKED &&
+            (ieee80211_is_auth(fc) || ieee80211_is_probe_req(fc))) {
+                if (rtlpriv->cfg->ops->chk_switch_dmdp)
+                        rtlpriv->cfg->ops->chk_switch_dmdp(hw);
         }
+        if (ieee80211_is_auth(fc)) {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
+                rtl_ips_nic_on(hw);
+
+                mac->link_state = MAC80211_LINKING;
+                /* Dul mac */
+                rtlpriv->phy.need_iqk = true;
 
-        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
-        if (!sta_entry) {
-                rcu_read_unlock();
-                return true;
         }
-        capab = le16_to_cpu(mgmt->u.action.u.addba_req.capab);
-        tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;
-        tid_data = &sta_entry->tids[tid];
-        if (tid_data->agg.rx_agg_state == RTL_RX_AGG_START) {
-                skb_delba = rtl_make_del_ba(hw, hdr->addr2, hdr->addr3, tid);
-                if (skb_delba) {
-                        rx_status.freq = hw->conf.chandef.chan->center_freq;
-                        rx_status.band = hw->conf.chandef.chan->band;
-                        rx_status.flag |= RX_FLAG_DECRYPTED;
-                        rx_status.flag |= RX_FLAG_MACTIME_END;
-                        rx_status.rate_idx = 0;
-                        rx_status.signal = 50 + 10;
-                        memcpy(IEEE80211_SKB_RXCB(skb_delba), &rx_status,
-                               sizeof(rx_status));
-                        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG,
-                                      "fake del\n", skb_delba->data,
-                                      skb_delba->len);
-                        ieee80211_rx_irqsafe(hw, skb_delba);
-                }
+
+        return true;
+}
+EXPORT_SYMBOL_GPL(rtl_tx_mgmt_proc);
+
+struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw, u8 *sa,
+                                u8 *bssid, u16 tid);
+
+static void process_agg_start(struct ieee80211_hw *hw,
+                              struct ieee80211_hdr *hdr, u16 tid)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ieee80211_rx_status rx_status = { 0 };
+        struct sk_buff *skb_delba = NULL;
+
+        skb_delba = rtl_make_del_ba(hw, hdr->addr2, hdr->addr3, tid);
+        if (skb_delba) {
+                rx_status.freq = hw->conf.chandef.chan->center_freq;
+                rx_status.band = hw->conf.chandef.chan->band;
+                rx_status.flag |= RX_FLAG_DECRYPTED;
+                rx_status.flag |= RX_FLAG_MACTIME_START;
+                rx_status.rate_idx = 0;
+                rx_status.signal = 50 + 10;
+                memcpy(IEEE80211_SKB_RXCB(skb_delba),
+                       &rx_status, sizeof(rx_status));
+                RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG,
+                              "fake del\n",
+                              skb_delba->data,
+                              skb_delba->len);
+                ieee80211_rx_irqsafe(hw, skb_delba);
         }
-        rcu_read_unlock();
-        return false;
 }
 
 bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
@@ -1017,8 +1158,8 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        __le16 fc = hdr->frame_control;
-        u8 *act = (u8 *)skb->data + MAC80211_3ADDR_LEN;
+        __le16 fc = rtl_get_fc(skb);
+        u8 *act = (u8 *)(((u8 *)skb->data + MAC80211_3ADDR_LEN));
         u8 category;
 
         if (!ieee80211_is_action(fc))
@@ -1034,18 +1175,47 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                                 return false;
 
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                                 "%s ACT_ADDBAREQ From :%pM\n",
-                                 is_tx ? "Tx" : "Rx", hdr->addr2);
+                                "%s ACT_ADDBAREQ From :%pM\n",
+                                is_tx ? "Tx" : "Rx", hdr->addr2);
                         RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",
-                                      skb->data, skb->len);
-                        if (!is_tx)
-                                if (addbareq_rx(hw, skb))
+                                skb->data, skb->len);
+                        if (!is_tx) {
+                                struct ieee80211_sta *sta = NULL;
+                                struct rtl_sta_info *sta_entry = NULL;
+                                struct rtl_tid_data *tid_data;
+                                struct ieee80211_mgmt *mgmt = (void *)skb->data;
+                                u16 capab = 0, tid = 0;
+
+                                rcu_read_lock();
+                                sta = rtl_find_sta(hw, hdr->addr3);
+                                if (sta == NULL) {
+                                        RT_TRACE(rtlpriv, COMP_SEND | COMP_RECV,
+                                                 DBG_DMESG, "sta is NULL\n");
+                                        rcu_read_unlock();
+                                        return true;
+                                }
+
+                                sta_entry =
+                                        (struct rtl_sta_info *)sta->drv_priv;
+                                if (!sta_entry) {
+                                        rcu_read_unlock();
                                         return true;
+                                }
+                                capab =
+                                  le16_to_cpu(mgmt->u.action.u.addba_req.capab);
+                                tid = (capab &
+                                       IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;
+                                tid_data = &sta_entry->tids[tid];
+                                if (tid_data->agg.rx_agg_state ==
+                                    RTL_RX_AGG_START)
+                                        process_agg_start(hw, hdr, tid);
+                                rcu_read_unlock();
+                        }
                         break;
                 case ACT_ADDBARSP:
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
                                  "%s ACT_ADDBARSP From :%pM\n",
-                                 is_tx ? "Tx" : "Rx", hdr->addr2);
+                                  is_tx ? "Tx" : "Rx", hdr->addr2);
                         break;
                 case ACT_DELBA:
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
@@ -1061,6 +1231,17 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
 }
 EXPORT_SYMBOL_GPL(rtl_action_proc);
 
+static void setup_arp_tx(struct rtl_priv *rtlpriv, struct rtl_ps_ctl *ppsc)
+{
+        rtlpriv->ra.is_special_data = true;
+        if (rtlpriv->cfg->ops->get_btc_status())
+                rtlpriv->btcoexist.btc_ops->btc_special_packet_notify(
+                                        rtlpriv, 1);
+        rtlpriv->enter_ps = false;
+        schedule_work(&rtlpriv->works.lps_change_work);
+        ppsc->last_delaylps_stamp_jiffies = jiffies;
+}
+
 /*should call before software enc*/
 u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
 {
@@ -1069,57 +1250,77 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
         __le16 fc = rtl_get_fc(skb);
         u16 ether_type;
         u8 mac_hdr_len = ieee80211_get_hdrlen_from_skb(skb);
+        u8 encrypt_header_len = 0;
+        u8 offset;
         const struct iphdr *ip;
 
         if (!ieee80211_is_data(fc))
-                return false;
-
-        ip = (const struct iphdr *)(skb->data + mac_hdr_len +
-                                    SNAP_SIZE + PROTOC_TYPE_SIZE);
-        ether_type = be16_to_cpup((__be16 *)
-                                  (skb->data + mac_hdr_len + SNAP_SIZE));
-
-        switch (ether_type) {
-        case ETH_P_IP: {
-                struct udphdr *udp;
-                u16 src;
-                u16 dst;
+                goto end;
 
-                if (ip->protocol != IPPROTO_UDP)
-                        return false;
-                udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2));
-                src = be16_to_cpu(udp->source);
-                dst = be16_to_cpu(udp->dest);
-
-                /* If this case involves port 68 (UDP BOOTP client) connecting
-                 * with port 67 (UDP BOOTP server), then return true so that
-                 * the lowest speed is used.
-                 */
-                if (!((src == 68 && dst == 67) || (src == 67 && dst == 68)))
-                        return false;
-
-                RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                         "dhcp %s !!\n", is_tx ? "Tx" : "Rx");
+        switch (rtlpriv->sec.pairwise_enc_algorithm) {
+        case WEP40_ENCRYPTION:
+        case WEP104_ENCRYPTION:
+                encrypt_header_len = 4;/*WEP_IV_LEN*/
                 break;
-        }
-        case ETH_P_ARP:
+        case TKIP_ENCRYPTION:
+                encrypt_header_len = 8;/*TKIP_IV_LEN*/
                 break;
-        case ETH_P_PAE:
-                RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                         "802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx");
+        case AESCCMP_ENCRYPTION:
+                encrypt_header_len = 8;/*CCMP_HDR_LEN;*/
                 break;
-        case ETH_P_IPV6:
-                /* TODO: Is this right? */
-                return false;
         default:
-                return false;
+                break;
         }
-        if (is_tx) {
-                rtlpriv->enter_ps = false;
-                schedule_work(&rtlpriv->works.lps_change_work);
-                ppsc->last_delaylps_stamp_jiffies = jiffies;
+
+        offset = mac_hdr_len + SNAP_SIZE + encrypt_header_len;
+        ether_type = be16_to_cpup((__be16 *)(skb->data + offset));
+
+        if (ETH_P_IP == ether_type) {
+                ip = (struct iphdr *)((u8 *)skb->data + offset +
+                     PROTOC_TYPE_SIZE);
+                if (IPPROTO_UDP == ip->protocol) {
+                        struct udphdr *udp = (struct udphdr *)((u8 *)ip +
+                                                               (ip->ihl << 2));
+                        if (((((u8 *)udp)[1] == 68) &&
+                             (((u8 *)udp)[3] == 67)) ||
+                            ((((u8 *)udp)[1] == 67) &&
+                             (((u8 *)udp)[3] == 68))) {
+                                /* 68 : UDP BOOTP client
+                                 * 67 : UDP BOOTP server
+                                 */
+                                RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV),
+                                         DBG_DMESG, "dhcp %s !!\n",
+                                         (is_tx) ? "Tx" : "Rx");
+
+                                if (is_tx)
+                                        setup_arp_tx(rtlpriv, ppsc);
+                                return true;
+                        }
+                }
+        } else if (ETH_P_ARP == ether_type) {
+                if (is_tx)
+                        setup_arp_tx(rtlpriv, ppsc);
+
+                return true;
+        } else if (ETH_P_PAE == ether_type) {
+                RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
+                         "802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx");
+
+                if (is_tx) {
+                        rtlpriv->ra.is_special_data = true;
+                        rtlpriv->enter_ps = false;
+                        schedule_work(&rtlpriv->works.lps_change_work);
+                        ppsc->last_delaylps_stamp_jiffies = jiffies;
+                }
+
+                return true;
+        } else if (0x86DD == ether_type) {
+                return true;
         }
-        return true;
+
+end:
+        rtlpriv->ra.is_special_data = false;
+        return false;
 }
 EXPORT_SYMBOL_GPL(rtl_is_special_data);
 
@@ -1128,12 +1329,11 @@ EXPORT_SYMBOL_GPL(rtl_is_special_data);
  * functions called by core.c
  *
  *********************************************************/
-int rtl_tx_agg_start(struct ieee80211_hw *hw,
-                struct ieee80211_sta *sta, u16 tid, u16 *ssn)
+int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                     struct ieee80211_sta *sta, u16 tid, u16 *ssn)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_tid_data *tid_data;
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_sta_info *sta_entry = NULL;
 
         if (sta == NULL)
@@ -1147,43 +1347,38 @@ int rtl_tx_agg_start(struct ieee80211_hw *hw,
                 return -ENXIO;
         tid_data = &sta_entry->tids[tid];
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d seq:%d\n",
-                 sta->addr, tid, tid_data->seq_number);
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
+                 "on ra = %pM tid = %d seq:%d\n", sta->addr, tid,
+                 tid_data->seq_number);
 
         *ssn = tid_data->seq_number;
         tid_data->agg.agg_state = RTL_AGG_START;
 
-        ieee80211_start_tx_ba_cb_irqsafe(mac->vif, sta->addr, tid);
-
+        ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
         return 0;
 }
 
-int rtl_tx_agg_stop(struct ieee80211_hw *hw,
-                struct ieee80211_sta *sta, u16 tid)
+int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                    struct ieee80211_sta *sta, u16 tid)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_tid_data *tid_data;
         struct rtl_sta_info *sta_entry = NULL;
 
         if (sta == NULL)
                 return -EINVAL;
 
-        if (!sta->addr) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");
-                return -EINVAL;
-        }
-
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d\n",
-                 sta->addr, tid);
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
+                 "on ra = %pM tid = %d\n", sta->addr, tid);
 
         if (unlikely(tid >= MAX_TID_COUNT))
                 return -EINVAL;
 
         sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+        tid_data = &sta_entry->tids[tid];
         sta_entry->tids[tid].agg.agg_state = RTL_AGG_STOP;
 
-        ieee80211_stop_tx_ba_cb_irqsafe(mac->vif, sta->addr, tid);
-
+        ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
         return 0;
 }
 
@@ -1222,11 +1417,6 @@ int rtl_rx_agg_stop(struct ieee80211_hw *hw,
         if (sta == NULL)
                 return -EINVAL;
 
-        if (!sta->addr) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");
-                return -EINVAL;
-        }
-
         RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
                  "on ra = %pM tid = %d\n", sta->addr, tid);
 
@@ -1238,7 +1428,6 @@ int rtl_rx_agg_stop(struct ieee80211_hw *hw,
 
         return 0;
 }
-
 int rtl_tx_agg_oper(struct ieee80211_hw *hw,
                 struct ieee80211_sta *sta, u16 tid)
 {
@@ -1248,13 +1437,8 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw,
         if (sta == NULL)
                 return -EINVAL;
 
-        if (!sta->addr) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");
-                return -EINVAL;
-        }
-
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d\n",
-                 sta->addr, tid);
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
+                 "on ra = %pM tid = %d\n", sta->addr, tid);
 
         if (unlikely(tid >= MAX_TID_COUNT))
                 return -EINVAL;
@@ -1292,7 +1476,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         rtlpriv->link_info.bcn_rx_inperiod++;
@@ -1332,8 +1516,7 @@ void rtl_watchdog_wq_callback(void *data)
                 mac->cnt_after_linked = 0;
         }
 
-        /*
-         *<2> to check if traffic busy, if
+        /* <2> to check if traffic busy, if
          * busytraffic we don't change channel
          */
         if (mac->link_state >= MAC80211_LINKED) {
@@ -1381,32 +1564,29 @@ void rtl_watchdog_wq_callback(void *data)
                 for (tid = 0; tid <= 7; tid++) {
                         for (idx = 0; idx <= 2; idx++)
                                 rtlpriv->link_info.tidtx_in4period[tid][idx] =
-                                  rtlpriv->link_info.tidtx_in4period[tid]
-                                  [idx + 1];
+                                        rtlpriv->link_info.tidtx_in4period[tid]
+                                        [idx + 1];
                         rtlpriv->link_info.tidtx_in4period[tid][3] =
                                 rtlpriv->link_info.tidtx_inperiod[tid];
 
                         for (idx = 0; idx <= 3; idx++)
                                 tidtx_inp4eriod[tid] +=
-                                  rtlpriv->link_info.tidtx_in4period[tid][idx];
+                                   rtlpriv->link_info.tidtx_in4period[tid][idx];
                         aver_tidtx_inperiod[tid] = tidtx_inp4eriod[tid] / 4;
                         if (aver_tidtx_inperiod[tid] > 5000)
                                 rtlpriv->link_info.higher_busytxtraffic[tid] =
-                                                   true;
+                                                                        true;
                         else
                                 rtlpriv->link_info.higher_busytxtraffic[tid] =
-                                                   false;
+                                                                        false;
                 }
 
                 if (((rtlpriv->link_info.num_rx_inperiod +
                       rtlpriv->link_info.num_tx_inperiod) > 8) ||
                     (rtlpriv->link_info.num_rx_inperiod > 2))
-                        rtlpriv->enter_ps = true;
+                        rtl_lps_enter(hw);
                 else
-                        rtlpriv->enter_ps = false;
-
-                /* LeisurePS only work in infra mode. */
-                schedule_work(&rtlpriv->works.lps_change_work);
+                        rtl_lps_leave(hw);
         }
 
         rtlpriv->link_info.num_rx_inperiod = 0;
@@ -1421,32 +1601,37 @@ void rtl_watchdog_wq_callback(void *data)
         rtlpriv->link_info.higher_busyrxtraffic = higher_busyrxtraffic;
 
         /* <3> DM */
-        rtlpriv->cfg->ops->dm_watchdog(hw);
+        if (!rtlpriv->cfg->mod_params->disable_watchdog)
+                rtlpriv->cfg->ops->dm_watchdog(hw);
 
         /* <4> roaming */
         if (mac->link_state == MAC80211_LINKED &&
             mac->opmode == NL80211_IFTYPE_STATION) {
                 if ((rtlpriv->link_info.bcn_rx_inperiod +
-                     rtlpriv->link_info.num_rx_inperiod) == 0) {
+                    rtlpriv->link_info.num_rx_inperiod) == 0) {
                         rtlpriv->link_info.roam_times++;
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
                                  "AP off for %d s\n",
-                                 (rtlpriv->link_info.roam_times * 2));
+                                (rtlpriv->link_info.roam_times * 2));
 
-                        /* if we can't recv beacon for 6s, we should
-                         * reconnect this AP
+                        /* if we can't recv beacon for 10s,
+                         * we should reconnect this AP
                          */
-                        if ((rtlpriv->link_info.roam_times >= 3) &&
-                            !is_zero_ether_addr(rtlpriv->mac80211.bssid)) {
+                        if (rtlpriv->link_info.roam_times >= 5) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                                          "AP off, try to reconnect now\n");
                                 rtlpriv->link_info.roam_times = 0;
-                                ieee80211_connection_loss(rtlpriv->mac80211.vif);
+                                ieee80211_connection_loss(
+                                        rtlpriv->mac80211.vif);
                         }
                 } else {
                         rtlpriv->link_info.roam_times = 0;
                 }
         }
+
+        if (rtlpriv->cfg->ops->get_btc_status())
+                rtlpriv->btcoexist.btc_ops->btc_periodical(rtlpriv);
+
         rtlpriv->link_info.bcn_rx_inperiod = 0;
 }
 
@@ -1461,7 +1646,6 @@ void rtl_watch_dog_timer_callback(unsigned long data)
         mod_timer(&rtlpriv->works.watchdog_timer,
                   jiffies + MSECS(RTL_WATCH_DOG_TIME));
 }
-
 void rtl_fwevt_wq_callback(void *data)
 {
         struct rtl_works *rtlworks =
@@ -1471,7 +1655,6 @@ void rtl_fwevt_wq_callback(void *data)
 
         rtlpriv->cfg->ops->c2h_command_handle(hw);
 }
-
 void rtl_easy_concurrent_retrytimer_callback(unsigned long data)
 {
         struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
@@ -1483,7 +1666,6 @@ void rtl_easy_concurrent_retrytimer_callback(unsigned long data)
 
         rtlpriv->cfg->ops->dualmac_easy_concurrent(hw);
 }
-
 /*********************************************************
  *
  * frame process functions
@@ -1511,7 +1693,8 @@ u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie)
 /* when we use 2 rx ants we send IEEE80211_SMPS_OFF */
 /* when we use 1 rx ant we send IEEE80211_SMPS_STATIC */
 static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,
-                enum ieee80211_smps_mode smps, u8 *da, u8 *bssid)
+                                     enum ieee80211_smps_mode smps,
+                                     u8 *da, u8 *bssid)
 {
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct sk_buff *skb;
@@ -1536,6 +1719,9 @@ static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,
         case IEEE80211_SMPS_AUTOMATIC:/* 0 */
         case IEEE80211_SMPS_NUM_MODES:/* 4 */
                 WARN_ON(1);
+        /* Here will get a 'MISSING_BREAK' in Coverity Test, just ignore it.
+         * According to Kernel Code, here is right.
+         */
         case IEEE80211_SMPS_OFF:/* 1 */ /*MIMO_PS_NOLIMIT*/
                 action_frame->u.action.u.ht_smps.smps_control =
                                 WLAN_HT_SMPS_CONTROL_DISABLED;/* 0 */
@@ -1554,8 +1740,8 @@ static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,
 }
 
 int rtl_send_smps_action(struct ieee80211_hw *hw,
-                struct ieee80211_sta *sta,
-                enum ieee80211_smps_mode smps)
+                         struct ieee80211_sta *sta,
+                         enum ieee80211_smps_mode smps)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -1590,6 +1776,7 @@ int rtl_send_smps_action(struct ieee80211_hw *hw,
                 struct rtl_sta_info *sta_entry =
                         (struct rtl_sta_info *) sta->drv_priv;
                 sta_entry->mimo_ps = smps;
+                /* rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0); */
 
                 info->control.rates[0].idx = 0;
                 info->band = hw->conf.chandef.chan->band;
@@ -1631,10 +1818,10 @@ void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
 }
 EXPORT_SYMBOL(rtl_phy_scan_operation_backup);
 
-/* There seem to be issues in mac80211 regarding when del ba frames can be
- * received. As a work around, we make a fake del_ba if we receive a ba_req;
- * however, rx_agg was opened to let mac80211 release some ba related
- * resources. This del_ba is for tx only.
+/* because mac80211 have issues when can receive del ba
+ * so here we just make a fake del_ba if we receive a ba_req
+ * but rx_agg was opened to let mac80211 release some ba
+ * related resources, so please this del_ba for tx
  */
 struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
                                 u8 *sa, u8 *bssid, u16 tid)
@@ -1660,7 +1847,7 @@ struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
         action_frame->u.action.category = WLAN_CATEGORY_BACK;
         action_frame->u.action.u.delba.action_code = WLAN_ACTION_DELBA;
         params = (u16)(1 << 11);        /* bit 11 initiator */
-        params |= (u16)(tid << 12);             /* bit 15:12 TID number */
+        params |= (u16)(tid << 12);     /* bit 15:12 TID number */
 
         action_frame->u.action.u.delba.params = cpu_to_le16(params);
         action_frame->u.action.u.delba.reason_code =
@@ -1675,7 +1862,7 @@ struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
  *
  *********************************************************/
 static bool rtl_chk_vendor_ouisub(struct ieee80211_hw *hw,
-                struct octet_string vendor_ie)
+                                  struct octet_string vendor_ie)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         bool matched = false;
@@ -1848,11 +2035,13 @@ static ssize_t rtl_store_debug_level(struct device *d,
 
         ret = kstrtoul(buf, 0, &val);
         if (ret) {
-                printk(KERN_DEBUG "%s is not in hex or decimal form.\n", buf);
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
+                         "%s is not in hex or decimal form.\n", buf);
         } else {
                 rtlpriv->dbg.global_debuglevel = val;
-                printk(KERN_DEBUG "debuglevel:%x\n",
-                       rtlpriv->dbg.global_debuglevel);
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
+                         "debuglevel:%x\n",
+                         rtlpriv->dbg.global_debuglevel);
         }
 
         return strnlen(buf, count);
@@ -1892,7 +2081,7 @@ EXPORT_SYMBOL_GPL(rtl_global_var);
 static int __init rtl_core_module_init(void)
 {
         if (rtl_rate_control_register())
-                pr_err("Unable to register rtl_rc, use default RC !!\n");
+                pr_err("rtl: Unable to register rtl_rc, use default RC !!\n");
 
         /* init some global vars */
         INIT_LIST_HEAD(&rtl_global_var.glb_priv_list);
diff --git a/drivers/net/wireless/rtlwifi/base.h b/drivers/net/wireless/rtlwifi/base.h
index 0cd07420777a..982f2450feea 100644
--- a/drivers/net/wireless/rtlwifi/base.h
+++ b/drivers/net/wireless/rtlwifi/base.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -41,7 +37,7 @@ enum ap_peer {
         PEER_MARV = 7,
         PEER_AIRGO = 9,
         PEER_MAX = 10,
-} ;
+};
 
 #define RTL_DUMMY_OFFSET        0
 #define RTL_DUMMY_UNIT          8
@@ -55,6 +51,16 @@ enum ap_peer {
 #define MAX_BIT_RATE_40MHZ_MCS15        300     /* Mbps */
 #define MAX_BIT_RATE_40MHZ_MCS7         150     /* Mbps */
 
+#define MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS9   867     /* Mbps */
+#define MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS7   650     /* Mbps */
+#define MAX_BIT_RATE_LONG_GI_2NSS_80MHZ_MCS9    780     /* Mbps */
+#define MAX_BIT_RATE_LONG_GI_2NSS_80MHZ_MCS7    585     /* Mbps */
+
+#define MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS9   434     /* Mbps */
+#define MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS7   325     /* Mbps */
+#define MAX_BIT_RATE_LONG_GI_1NSS_80MHZ_MCS9    390     /* Mbps */
+#define MAX_BIT_RATE_LONG_GI_1NSS_80MHZ_MCS7    293     /* Mbps */
+
 #define RTL_RATE_COUNT_LEGACY           12
 #define RTL_CHANNEL_COUNT               14
 
@@ -78,9 +84,9 @@ enum ap_peer {
 #define SET_80211_PS_POLL_AID(_hdr, _val)               \
         (*(u16 *)((u8 *)(_hdr) + 2) = _val)
 #define SET_80211_PS_POLL_BSSID(_hdr, _val)             \
-        memcpy(((u8 *)(_hdr)) + 4, (u8 *)(_val), ETH_ALEN)
+        ether_addr_copy(((u8 *)(_hdr)) + 4, (u8 *)(_val))
 #define SET_80211_PS_POLL_TA(_hdr, _val)                \
-        memcpy(((u8 *)(_hdr)) + 10, (u8 *)(_val), ETH_ALEN)
+        ether_addr_copy(((u8 *)(_hdr))+10, (u8 *)(_val))
 
 #define SET_80211_HDR_DURATION(_hdr, _val)      \
         (*(u16 *)((u8 *)(_hdr) + FRAME_OFFSET_DURATION) = le16_to_cpu(_val))
@@ -113,23 +119,27 @@ void rtl_init_rx_config(struct ieee80211_hw *hw);
 void rtl_init_rfkill(struct ieee80211_hw *hw);
 void rtl_deinit_rfkill(struct ieee80211_hw *hw);
 
-void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb);
+void rtl_watch_dog_timer_callback(unsigned long data);
 void rtl_deinit_deferred_work(struct ieee80211_hw *hw);
 
 bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);
+int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
+                         bool isht, u8 desc_rate, bool first_ampdu);
+bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);
 u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);
 
+void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb);
 void rtl_watch_dog_timer_callback(unsigned long data);
-int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
-                     u16 tid, u16 *ssn);
-int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
-                    u16 tid);
-int rtl_tx_agg_oper(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
-                    u16 tid);
-int rtl_rx_agg_start(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
-                     u16 tid);
-int rtl_rx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
-                    u16 tid);
+int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+        struct ieee80211_sta *sta, u16 tid, u16 *ssn);
+int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+        struct ieee80211_sta *sta, u16 tid);
+int rtl_tx_agg_oper(struct ieee80211_hw *hw,
+                    struct ieee80211_sta *sta, u16 tid);
+int rtl_rx_agg_start(struct ieee80211_hw *hw,
+                     struct ieee80211_sta *sta, u16 tid);
+int rtl_rx_agg_stop(struct ieee80211_hw *hw,
+                    struct ieee80211_sta *sta, u16 tid);
 void rtl_watchdog_wq_callback(void *data);
 void rtl_fwevt_wq_callback(void *data);
 
@@ -139,19 +149,14 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                       struct sk_buff *skb, struct rtl_tcb_desc *tcb_desc);
 
 int rtl_send_smps_action(struct ieee80211_hw *hw,
-                         struct ieee80211_sta *sta,
-                         enum ieee80211_smps_mode smps);
+                struct ieee80211_sta *sta,
+                enum ieee80211_smps_mode smps);
 u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);
 void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);
 u8 rtl_tid_to_ac(u8 tid);
 extern struct attribute_group rtl_attribute_group;
 void rtl_easy_concurrent_retrytimer_callback(unsigned long data);
 extern struct rtl_global_var rtl_global_var;
-int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
-                         bool isht, u8 desc_rate, bool first_ampdu);
-bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);
-struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
-                                u8 *sa, u8 *bssid, u16 tid);
 void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
index fcf7459b5d66..b2791c893417 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -505,7 +505,7 @@ static void halbtc_write_1byte(void *bt_context, u32 reg_addr, u32 data)
 }
 
 static void halbtc_bitmask_write_1byte(void *bt_context, u32 reg_addr,
-                                       u8 bit_mask, u8 data)
+                                       u32 bit_mask, u8 data)
 {
         struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;
         struct rtl_priv *rtlpriv = btcoexist->adapter;
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
index 1345545f66bc..0a903ea179ef 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -359,7 +359,7 @@ typedef u32 (*bfp_btc_r4)(void *btc_context, u32 reg_addr);
 typedef void (*bfp_btc_w1)(void *btc_context, u32 reg_addr, u32 data);
 
 typedef void (*bfp_btc_w1_bit_mak)(void *btc_context, u32 reg_addr,
-                                   u8 bit_mask, u8 data1b);
+                                   u32 bit_mask, u8 data1b);
 
 typedef void (*bfp_btc_w2)(void *btc_context, u32 reg_addr, u16 data);
 
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 0276153c72cc..8fe8b4cfae6c 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -26,10 +22,9 @@
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
  *****************************************************************************/
-
-#include <linux/export.h>
 #include "wifi.h"
 #include "cam.h"
+#include <linux/export.h>
 
 void rtl_cam_reset_sec_info(struct ieee80211_hw *hw)
 {
@@ -52,8 +47,8 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
         u32 target_content = 0;
         u8 entry_i;
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "key_cont_128: %6phC\n",
-                 key_cont_128);
+        RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_DMESG, "Key content :",
+                      key_cont_128, 16);
 
         for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
                 target_command = entry_i + CAM_CONTENT_COUNT * entry_no;
@@ -68,11 +63,13 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
                                         target_command);
 
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE %x: %x\n",
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                                 "WRITE %x: %x\n",
                                  rtlpriv->cfg->maps[WCAMI], target_content);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
                                  "The Key ID is %d\n", entry_no);
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE %x: %x\n",
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                                 "WRITE %x: %x\n",
                                  rtlpriv->cfg->maps[RWCAM], target_command);
 
                 } else if (entry_i == 1) {
@@ -87,10 +84,10 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
                                         target_command);
 
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n",
-                                 target_content);
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A0: %x\n",
-                                 target_command);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                                 "WRITE A4: %x\n", target_content);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                                 "WRITE A0: %x\n", target_command);
 
                 } else {
 
@@ -107,15 +104,15 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                                         target_command);
                         udelay(100);
 
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n",
-                                 target_content);
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A0: %x\n",
-                                 target_command);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                                 "WRITE A4: %x\n", target_content);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                                 "WRITE A0: %x\n", target_command);
                 }
         }
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "after set key, usconfig:%x\n",
-                 us_config);
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                 "after set key, usconfig:%x\n", us_config);
 }
 
 u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
@@ -125,27 +122,26 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
         u32 us_config;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                  "EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",
                  ul_entry_idx, ul_key_id, ul_enc_alg,
                  ul_default_key, mac_addr);
 
         if (ul_key_id == TOTAL_CAM_ENTRY) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         "<=== ulKeyId exceed!\n");
+                         "ulKeyId exceed!\n");
                 return 0;
         }
 
-        if (ul_default_key == 1) {
+        if (ul_default_key == 1)
                 us_config = CFG_VALID | ((u16) (ul_enc_alg) << 2);
-        } else {
+        else
                 us_config = CFG_VALID | ((ul_enc_alg) << 2) | ul_key_id;
-        }
 
         rtl_cam_program_entry(hw, ul_entry_idx, mac_addr,
-                              key_content, us_config);
+                              (u8 *)key_content, us_config);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "<===\n");
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "end\n");
 
         return 1;
 
@@ -289,7 +285,8 @@ u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr)
         u8 i, *addr;
 
         if (NULL == sta_addr) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
+                         "sta_addr is NULL.\n");
                 return TOTAL_CAM_ENTRY;
         }
         /* Does STA already exist? */
@@ -322,7 +319,9 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
         u8 i, *addr;
 
         if (NULL == sta_addr) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
+                         "sta_addr is NULL.\n");
+                return;
         }
 
         if (is_zero_ether_addr(sta_addr)) {
@@ -339,8 +338,8 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
                         /* Remove from HW Security CAM */
                         eth_zero_addr(rtlpriv->sec.hwsec_cam_sta_addr[i]);
                         rtlpriv->sec.hwsec_cam_bitmap &= ~(BIT(0) << i);
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 "del CAM entry %d\n", i);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                 "&&&&&&&&&del entry %d\n", i);
                 }
         }
         return;
diff --git a/drivers/net/wireless/rtlwifi/cam.h b/drivers/net/wireless/rtlwifi/cam.h
index 0105e6c1901e..35508087c0c5 100644
--- a/drivers/net/wireless/rtlwifi/cam.h
+++ b/drivers/net/wireless/rtlwifi/cam.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -36,15 +32,15 @@
 #define CFG_VALID                                       BIT(15)
 
 #define PAIRWISE_KEYIDX                                 0
-#define CAM_PAIRWISE_KEY_POSITION               4
+#define CAM_PAIRWISE_KEY_POSITION                       4
 
 #define CAM_CONFIG_USEDK                                1
 #define CAM_CONFIG_NO_USEDK                             0
 
 void rtl_cam_reset_all_entry(struct ieee80211_hw *hw);
 u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
-                         u32 ul_key_id, u32 ul_entry_idx, u32 ul_enc_alg,
-                         u32 ul_default_key, u8 *key_content);
+                                u32 ul_key_id, u32 ul_entry_idx, u32 ul_enc_alg,
+                                u32 ul_default_key, u8 *key_content);
 int rtl_cam_delete_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
                              u32 ul_key_id);
 void rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index);
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 56e218e0469c..f6179bc06086 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -31,10 +27,13 @@
 #include "core.h"
 #include "cam.h"
 #include "base.h"
-#include "pci.h"
 #include "ps.h"
+#include "pwrseqcmd.h"
 
+#include "btcoexist/rtl_btc.h"
+#include <linux/firmware.h>
 #include <linux/export.h>
+#include <net/cfg80211.h>
 
 void rtl_addr_delay(u32 addr)
 {
@@ -103,7 +102,7 @@ void rtl_fw_cb(const struct firmware *firmware, void *context)
         int err;
 
         RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                         "Firmware callback routine entered!\n");
+                 "Firmware callback routine entered!\n");
         complete(&rtlpriv->firmware_loading_complete);
         if (!firmware) {
                 if (rtlpriv->cfg->alt_fw_name) {
@@ -129,26 +128,13 @@ found_alt:
         memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
         rtlpriv->rtlhal.fwsize = firmware->size;
         release_firmware(firmware);
-
-        err = ieee80211_register_hw(hw);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "Can't register mac80211 hw\n");
-                return;
-        } else {
-                rtlpriv->mac80211.mac80211_registered = 1;
-        }
-        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
-
-        /*init rfkill */
-        rtl_init_rfkill(hw);
 }
 EXPORT_SYMBOL(rtl_fw_cb);
 
 /*mutex for start & stop is must here. */
 static int rtl_op_start(struct ieee80211_hw *hw)
 {
-        int err;
+        int err = 0;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
@@ -170,28 +156,33 @@ static void rtl_op_stop(struct ieee80211_hw *hw)
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        bool support_remote_wakeup = false;
 
         if (is_hal_stop(rtlhal))
                 return;
 
+        rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
+                                      (u8 *)(&support_remote_wakeup));
         /* here is must, because adhoc do stop and start,
          * but stop with RFOFF may cause something wrong,
          * like adhoc TP
          */
-        if (unlikely(ppsc->rfpwr_state == ERFOFF)) {
+        if (unlikely(ppsc->rfpwr_state == ERFOFF))
                 rtl_ips_nic_on(hw);
-        }
 
         mutex_lock(&rtlpriv->locks.conf_mutex);
+        /* if wowlan supported, DON'T clear connected info */
+        if (!(support_remote_wakeup &&
+              rtlhal->enter_pnp_sleep)) {
+                mac->link_state = MAC80211_NOLINK;
+                memset(mac->bssid, 0, 6);
+                mac->vendor = PEER_UNKNOWN;
 
-        mac->link_state = MAC80211_NOLINK;
-        memset(mac->bssid, 0, ETH_ALEN);
-        mac->vendor = PEER_UNKNOWN;
-
-        /*reset sec info */
-        rtl_cam_reset_sec_info(hw);
+                /* reset sec info */
+                rtl_cam_reset_sec_info(hw);
 
-        rtl_deinit_deferred_work(hw);
+                rtl_deinit_deferred_work(hw);
+        }
         rtlpriv->intf_ops->adapter_stop(hw);
 
         mutex_unlock(&rtlpriv->locks.conf_mutex);
@@ -215,7 +206,6 @@ static void rtl_op_tx(struct ieee80211_hw *hw,
 
         if (!rtlpriv->intf_ops->waitq_insert(hw, control->sta, skb))
                 rtlpriv->intf_ops->adapter_tx(hw, control->sta, skb, &tcb_desc);
-
         return;
 
 err_free:
@@ -229,18 +219,17 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         int err = 0;
 
-        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;
-
         if (mac->vif) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "vif has been set!! mac->vif = 0x%p\n", mac->vif);
                 return -EOPNOTSUPP;
         }
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;
+
         rtl_ips_nic_on(hw);
 
         mutex_lock(&rtlpriv->locks.conf_mutex);
-
         switch (ieee80211_vif_type_p2p(vif)) {
         case NL80211_IFTYPE_P2P_CLIENT:
                 mac->p2p = P2P_ROLE_CLIENT;
@@ -251,10 +240,8 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                                  "NL80211_IFTYPE_STATION\n");
                         mac->beacon_enabled = 0;
                         rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
-                                        rtlpriv->cfg->maps
-                                        [RTL_IBSS_INT_MASKS]);
+                                        rtlpriv->cfg->maps[RTL_IBSS_INT_MASKS]);
                 }
-                mac->link_state = MAC80211_LINKED;
                 break;
         case NL80211_IFTYPE_ADHOC:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
@@ -267,7 +254,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 else
                         mac->basic_rates = 0xff0;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BASIC_RATE,
-                                (u8 *) (&mac->basic_rates));
+                                (u8 *)(&mac->basic_rates));
 
                 break;
         case NL80211_IFTYPE_P2P_GO:
@@ -284,7 +271,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 else
                         mac->basic_rates = 0xff0;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BASIC_RATE,
-                                (u8 *) (&mac->basic_rates));
+                                              (u8 *)(&mac->basic_rates));
                 break;
         case NL80211_IFTYPE_MESH_POINT:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
@@ -301,7 +288,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "operation mode %d is not supported!\n", vif->type);
+                         "operation mode %d is not support!\n", vif->type);
                 err = -EOPNOTSUPP;
                 goto out;
         }
@@ -339,8 +326,7 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw,
                 if (mac->beacon_enabled == 1) {
                         mac->beacon_enabled = 0;
                         rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
-                                        rtlpriv->cfg->maps
-                                        [RTL_IBSS_INT_MASKS]);
+                                        rtlpriv->cfg->maps[RTL_IBSS_INT_MASKS]);
                 }
         }
 
@@ -355,12 +341,12 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw,
         mac->vendor = PEER_UNKNOWN;
         mac->opmode = NL80211_IFTYPE_UNSPECIFIED;
         rtlpriv->cfg->ops->set_network_type(hw, mac->opmode);
+
         mutex_unlock(&rtlpriv->locks.conf_mutex);
 }
-
 static int rtl_op_change_interface(struct ieee80211_hw *hw,
-                                      struct ieee80211_vif *vif,
-                                      enum nl80211_iftype new_type, bool p2p)
+                                   struct ieee80211_vif *vif,
+                                   enum nl80211_iftype new_type, bool p2p)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         int ret;
@@ -370,10 +356,221 @@ static int rtl_op_change_interface(struct ieee80211_hw *hw,
         vif->p2p = p2p;
         ret = rtl_op_add_interface(hw, vif);
         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                 "p2p %x\n", p2p);
+                 "p2p  %x\n", p2p);
         return ret;
 }
 
+#ifdef CONFIG_PM
+static u16 crc16_ccitt(u8 data, u16 crc)
+{
+        u8 shift_in, data_bit, crc_bit11, crc_bit4, crc_bit15;
+        u8 i;
+        u16 result;
+
+        for (i = 0; i < 8; i++) {
+                crc_bit15 = ((crc & BIT(15)) ? 1 : 0);
+                data_bit  = (data & (BIT(0) << i) ? 1 : 0);
+                shift_in = crc_bit15 ^ data_bit;
+
+                result = crc << 1;
+                if (shift_in == 0)
+                        result &= (~BIT(0));
+                else
+                        result |= BIT(0);
+
+                crc_bit11 = ((crc & BIT(11)) ? 1 : 0) ^ shift_in;
+                if (crc_bit11 == 0)
+                        result &= (~BIT(12));
+                else
+                        result |= BIT(12);
+
+                crc_bit4 = ((crc & BIT(4)) ? 1 : 0) ^ shift_in;
+                if (crc_bit4 == 0)
+                        result &= (~BIT(5));
+                else
+                        result |= BIT(5);
+
+                crc = result;
+        }
+
+        return crc;
+}
+
+static u16 _calculate_wol_pattern_crc(u8 *pattern, u16 len)
+{
+        u16 crc = 0xffff;
+        u32 i;
+
+        for (i = 0; i < len; i++)
+                crc = crc16_ccitt(pattern[i], crc);
+
+        crc = ~crc;
+
+        return crc;
+}
+
+static void _rtl_add_wowlan_patterns(struct ieee80211_hw *hw,
+                                     struct cfg80211_wowlan *wow)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = &rtlpriv->mac80211;
+        struct cfg80211_pkt_pattern *patterns = wow->patterns;
+        struct rtl_wow_pattern rtl_pattern;
+        const u8 *pattern_os, *mask_os;
+        u8 mask[MAX_WOL_BIT_MASK_SIZE] = {0};
+        u8 content[MAX_WOL_PATTERN_SIZE] = {0};
+        u8 broadcast_addr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+        u8 multicast_addr1[2] = {0x33, 0x33};
+        u8 multicast_addr2[3] = {0x01, 0x00, 0x5e};
+        u8 i, mask_len;
+        u16 j, len;
+
+        for (i = 0; i < wow->n_patterns; i++) {
+                memset(&rtl_pattern, 0, sizeof(struct rtl_wow_pattern));
+                memset(mask, 0, MAX_WOL_BIT_MASK_SIZE);
+                if (patterns[i].pattern_len > MAX_WOL_PATTERN_SIZE) {
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_WARNING,
+                                 "Pattern[%d] is too long\n", i);
+                        continue;
+                }
+                pattern_os = patterns[i].pattern;
+                mask_len = DIV_ROUND_UP(patterns[i].pattern_len, 8);
+                mask_os = patterns[i].mask;
+                RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,
+                              "pattern content\n", pattern_os,
+                               patterns[i].pattern_len);
+                RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,
+                              "mask content\n", mask_os, mask_len);
+                /* 1. unicast? multicast? or broadcast? */
+                if (memcmp(pattern_os, broadcast_addr, 6) == 0)
+                        rtl_pattern.type = BROADCAST_PATTERN;
+                else if (memcmp(pattern_os, multicast_addr1, 2) == 0 ||
+                         memcmp(pattern_os, multicast_addr2, 3) == 0)
+                        rtl_pattern.type = MULTICAST_PATTERN;
+                else if  (memcmp(pattern_os, mac->mac_addr, 6) == 0)
+                        rtl_pattern.type = UNICAST_PATTERN;
+                else
+                        rtl_pattern.type = UNKNOWN_TYPE;
+
+                /* 2. translate mask_from_os to mask_for_hw */
+
+/******************************************************************************
+ * pattern from OS uses 'ethenet frame', like this:
+
+                   |    6   |    6   |   2  |     20    |  Variable  |  4  |
+                   |--------+--------+------+-----------+------------+-----|
+                   |    802.3 Mac Header    | IP Header | TCP Packet | FCS |
+                   |   DA   |   SA   | Type |
+
+ * BUT, packet catched by our HW is in '802.11 frame', begin from LLC,
+
+        |     24 or 30      |    6   |   2  |     20    |  Variable  |  4  |
+        |-------------------+--------+------+-----------+------------+-----|
+        | 802.11 MAC Header |       LLC     | IP Header | TCP Packet | FCS |
+                            | Others | Tpye |
+
+ * Therefore, we need translate mask_from_OS to mask_to_hw.
+ * We should left-shift mask by 6 bits, then set the new bit[0~5] = 0,
+ * because new mask[0~5] means 'SA', but our HW packet begins from LLC,
+ * bit[0~5] corresponds to first 6 Bytes in LLC, they just don't match.
+ ******************************************************************************/
+
+                /* Shift 6 bits */
+                for (j = 0; j < mask_len - 1; j++) {
+                        mask[j] = mask_os[j] >> 6;
+                        mask[j] |= (mask_os[j + 1] & 0x3F) << 2;
+                }
+                mask[j] = (mask_os[j] >> 6) & 0x3F;
+                /* Set bit 0-5 to zero */
+                mask[0] &= 0xC0;
+
+                RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,
+                              "mask to hw\n", mask, mask_len);
+                for (j = 0; j < (MAX_WOL_BIT_MASK_SIZE + 1) / 4; j++) {
+                        rtl_pattern.mask[j] = mask[j * 4];
+                        rtl_pattern.mask[j] |= (mask[j * 4 + 1] << 8);
+                        rtl_pattern.mask[j] |= (mask[j * 4 + 2] << 16);
+                        rtl_pattern.mask[j] |= (mask[j * 4 + 3] << 24);
+                }
+
+                /* To get the wake up pattern from the mask.
+                 * We do not count first 12 bits which means
+                 * DA[6] and SA[6] in the pattern to match HW design.
+                 */
+                len = 0;
+                for (j = 12; j < patterns[i].pattern_len; j++) {
+                        if ((mask_os[j / 8] >> (j % 8)) & 0x01) {
+                                content[len] = pattern_os[j];
+                                len++;
+                        }
+                }
+
+                RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,
+                              "pattern to hw\n", content, len);
+                /* 3. calculate crc */
+                rtl_pattern.crc = _calculate_wol_pattern_crc(content, len);
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
+                         "CRC_Remainder = 0x%x", rtl_pattern.crc);
+
+                /* 4. write crc & mask_for_hw to hw */
+                rtlpriv->cfg->ops->add_wowlan_pattern(hw, &rtl_pattern, i);
+        }
+        rtl_write_byte(rtlpriv, 0x698, wow->n_patterns);
+}
+
+static int rtl_op_suspend(struct ieee80211_hw *hw,
+                          struct cfg80211_wowlan *wow)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct timeval ts;
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n");
+        if (WARN_ON(!wow))
+                return -EINVAL;
+
+        /* to resolve s4 can not wake up*/
+        do_gettimeofday(&ts);
+        rtlhal->last_suspend_sec = ts.tv_sec;
+
+        if ((ppsc->wo_wlan_mode & WAKE_ON_PATTERN_MATCH) && wow->n_patterns)
+                _rtl_add_wowlan_patterns(hw, wow);
+
+        rtlhal->driver_is_goingto_unload = true;
+        rtlhal->enter_pnp_sleep = true;
+
+        rtl_lps_leave(hw);
+        rtl_op_stop(hw);
+        device_set_wakeup_enable(wiphy_dev(hw->wiphy), true);
+        return 0;
+}
+
+static int rtl_op_resume(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct timeval ts;
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n");
+        rtlhal->driver_is_goingto_unload = false;
+        rtlhal->enter_pnp_sleep = false;
+        rtlhal->wake_from_pnp_sleep = true;
+
+        /* to resovle s4 can not wake up*/
+        do_gettimeofday(&ts);
+        if (ts.tv_sec - rtlhal->last_suspend_sec < 5)
+                return -1;
+
+        rtl_op_start(hw);
+        device_set_wakeup_enable(wiphy_dev(hw->wiphy), false);
+        ieee80211_resume_disconnect(mac->vif);
+        rtlhal->wake_from_pnp_sleep = false;
+        return 0;
+}
+#endif
+
 static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -386,7 +583,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                 return 1;
 
         mutex_lock(&rtlpriv->locks.conf_mutex);
-        if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {  /*BIT(2)*/
+        if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {  /* BIT(2)*/
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                          "IEEE80211_CONF_CHANGE_LISTEN_INTERVAL\n");
         }
@@ -421,8 +618,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                          * is worked very well */
                         if (!rtlpriv->psc.multi_buffered)
                                 queue_delayed_work(rtlpriv->works.rtl_wq,
-                                                &rtlpriv->works.ps_work,
-                                                MSECS(5));
+                                                   &rtlpriv->works.ps_work,
+                                                   MSECS(5));
                 } else {
                         rtl_swlps_rf_awake(hw);
                         rtlpriv->psc.sw_ps_enabled = false;
@@ -436,20 +633,26 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                 mac->retry_long = hw->conf.long_frame_max_tx_count;
                 mac->retry_short = hw->conf.long_frame_max_tx_count;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RETRY_LIMIT,
-                                              (u8 *) (&hw->conf.
-                                                      long_frame_max_tx_count));
+                                (u8 *)(&hw->conf.long_frame_max_tx_count));
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+        if (changed & IEEE80211_CONF_CHANGE_CHANNEL &&
+            !rtlpriv->proximity.proxim_on) {
                 struct ieee80211_channel *channel = hw->conf.chandef.chan;
+                enum nl80211_chan_width width = hw->conf.chandef.width;
+                enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
                 u8 wide_chan = (u8) channel->hw_value;
 
+                /* channel_type is for 20&40M */
+                if (width < NL80211_CHAN_WIDTH_80)
+                        channel_type =
+                                cfg80211_get_chandef_type(&hw->conf.chandef);
                 if (mac->act_scanning)
                         mac->n_channels++;
 
                 if (rtlpriv->dm.supp_phymode_switch &&
-                    mac->link_state < MAC80211_LINKED &&
-                    !mac->act_scanning) {
+                        mac->link_state < MAC80211_LINKED &&
+                        !mac->act_scanning) {
                         if (rtlpriv->cfg->ops->chk_switch_dmdp)
                                 rtlpriv->cfg->ops->chk_switch_dmdp(hw);
                 }
@@ -463,48 +666,98 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                  *info for cisco1253 bw20, so we modify
                  *it here based on UPPER & LOWER
                  */
-                switch (cfg80211_get_chandef_type(&hw->conf.chandef)) {
-                case NL80211_CHAN_HT20:
-                case NL80211_CHAN_NO_HT:
-                        /* SC */
-                        mac->cur_40_prime_sc =
-                                PRIME_CHNL_OFFSET_DONT_CARE;
-                        rtlphy->current_chan_bw = HT_CHANNEL_WIDTH_20;
-                        mac->bw_40 = false;
-                        break;
-                case NL80211_CHAN_HT40MINUS:
-                        /* SC */
-                        mac->cur_40_prime_sc = PRIME_CHNL_OFFSET_UPPER;
-                        rtlphy->current_chan_bw =
-                                HT_CHANNEL_WIDTH_20_40;
-                        mac->bw_40 = true;
-
-                        /*wide channel */
-                        wide_chan -= 2;
-
-                        break;
-                case NL80211_CHAN_HT40PLUS:
-                        /* SC */
-                        mac->cur_40_prime_sc = PRIME_CHNL_OFFSET_LOWER;
-                        rtlphy->current_chan_bw =
-                                HT_CHANNEL_WIDTH_20_40;
-                        mac->bw_40 = true;
-
-                        /*wide channel */
-                        wide_chan += 2;
-
-                        break;
-                default:
-                        mac->bw_40 = false;
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
-                        break;
+
+                if (width >= NL80211_CHAN_WIDTH_80) {
+                        if (width == NL80211_CHAN_WIDTH_80) {
+                                u32 center = hw->conf.chandef.center_freq1;
+                                u32 primary =
+                                (u32)hw->conf.chandef.chan->center_freq;
+
+                                rtlphy->current_chan_bw =
+                                        HT_CHANNEL_WIDTH_80;
+                                mac->bw_80 = true;
+                                mac->bw_40 = true;
+                                if (center > primary) {
+                                        mac->cur_80_prime_sc =
+                                        PRIME_CHNL_OFFSET_LOWER;
+                                        if (center - primary == 10) {
+                                                mac->cur_40_prime_sc =
+                                                PRIME_CHNL_OFFSET_UPPER;
+
+                                                wide_chan += 2;
+                                        } else if (center - primary == 30) {
+                                                mac->cur_40_prime_sc =
+                                                PRIME_CHNL_OFFSET_LOWER;
+
+                                                wide_chan += 6;
+                                        }
+                                } else {
+                                        mac->cur_80_prime_sc =
+                                        PRIME_CHNL_OFFSET_UPPER;
+                                        if (primary - center == 10) {
+                                                mac->cur_40_prime_sc =
+                                                PRIME_CHNL_OFFSET_LOWER;
+
+                                                wide_chan -= 2;
+                                        } else if (primary - center == 30) {
+                                                mac->cur_40_prime_sc =
+                                                PRIME_CHNL_OFFSET_UPPER;
+
+                                                wide_chan -= 6;
+                                        }
+                                }
+                        }
+                } else {
+                        switch (channel_type) {
+                        case NL80211_CHAN_HT20:
+                        case NL80211_CHAN_NO_HT:
+                                        /* SC */
+                                        mac->cur_40_prime_sc =
+                                                PRIME_CHNL_OFFSET_DONT_CARE;
+                                        rtlphy->current_chan_bw =
+                                                HT_CHANNEL_WIDTH_20;
+                                        mac->bw_40 = false;
+                                        mac->bw_80 = false;
+                                        break;
+                        case NL80211_CHAN_HT40MINUS:
+                                        /* SC */
+                                        mac->cur_40_prime_sc =
+                                                PRIME_CHNL_OFFSET_UPPER;
+                                        rtlphy->current_chan_bw =
+                                                HT_CHANNEL_WIDTH_20_40;
+                                        mac->bw_40 = true;
+                                        mac->bw_80 = false;
+
+                                        /*wide channel */
+                                        wide_chan -= 2;
+
+                                        break;
+                        case NL80211_CHAN_HT40PLUS:
+                                        /* SC */
+                                        mac->cur_40_prime_sc =
+                                                PRIME_CHNL_OFFSET_LOWER;
+                                        rtlphy->current_chan_bw =
+                                                HT_CHANNEL_WIDTH_20_40;
+                                        mac->bw_40 = true;
+                                        mac->bw_80 = false;
+
+                                        /*wide channel */
+                                        wide_chan += 2;
+
+                                        break;
+                        default:
+                                        mac->bw_40 = false;
+                                        mac->bw_80 = false;
+                                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                                 "switch case not processed\n");
+                                        break;
+                        }
                 }
 
                 if (wide_chan <= 0)
                         wide_chan = 1;
 
-                /* In scanning, before we go offchannel we may send a ps = 1
+                /* In scanning, when before we offchannel we may send a ps=1
                  * null to AP, and then we may send a ps = 0 null to AP quickly,
                  * but first null may have caused AP to put lots of packet to
                  * hw tx buffer. These packets must be tx'd before we go off
@@ -516,12 +769,12 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                         rtlpriv->mac80211.offchan_delay = false;
                         mdelay(50);
                 }
+
                 rtlphy->current_channel = wide_chan;
 
                 rtlpriv->cfg->ops->switch_channel(hw);
                 rtlpriv->cfg->ops->set_channel_access(hw);
-                rtlpriv->cfg->ops->set_bw_mode(hw,
-                                cfg80211_get_chandef_type(&hw->conf.chandef));
+                rtlpriv->cfg->ops->set_bw_mode(hw, channel_type);
         }
 
         mutex_unlock(&rtlpriv->locks.conf_mutex);
@@ -530,45 +783,25 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
 }
 
 static void rtl_op_configure_filter(struct ieee80211_hw *hw,
-                             unsigned int changed_flags,
-                             unsigned int *new_flags, u64 multicast)
+                                    unsigned int changed_flags,
+                                    unsigned int *new_flags, u64 multicast)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        u32 rx_conf;
 
         *new_flags &= RTL_SUPPORTED_FILTERS;
-        if (!changed_flags)
+        if (0 == changed_flags)
                 return;
 
-        /* if ssid not set to hw don't check bssid
-         * here just used for linked scanning, & linked
-         * and nolink check bssid is set in set network_type */
-        if ((changed_flags & FIF_BCN_PRBRESP_PROMISC) &&
-                (mac->link_state >= MAC80211_LINKED)) {
-                if (mac->opmode != NL80211_IFTYPE_AP &&
-                    mac->opmode != NL80211_IFTYPE_MESH_POINT) {
-                        if (*new_flags & FIF_BCN_PRBRESP_PROMISC) {
-                                rtlpriv->cfg->ops->set_chk_bssid(hw, false);
-                        } else {
-                                rtlpriv->cfg->ops->set_chk_bssid(hw, true);
-                        }
-                }
-        }
-
-        /* must be called after set_chk_bssid since that function modifies the
-         * RCR register too. */
-        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&rx_conf));
-
         /*TODO: we disable broadcase now, so enable here */
         if (changed_flags & FIF_ALLMULTI) {
                 if (*new_flags & FIF_ALLMULTI) {
-                        rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AM] |
+                        mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AM] |
                             rtlpriv->cfg->maps[MAC_RCR_AB];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Enable receive multicast frame\n");
                 } else {
-                        rx_conf &= ~(rtlpriv->cfg->maps[MAC_RCR_AM] |
+                        mac->rx_conf &= ~(rtlpriv->cfg->maps[MAC_RCR_AM] |
                                           rtlpriv->cfg->maps[MAC_RCR_AB]);
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Disable receive multicast frame\n");
@@ -577,43 +810,55 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
 
         if (changed_flags & FIF_FCSFAIL) {
                 if (*new_flags & FIF_FCSFAIL) {
-                        rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACRC32];
+                        mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACRC32];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Enable receive FCS error frame\n");
                 } else {
-                        rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACRC32];
+                        mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACRC32];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Disable receive FCS error frame\n");
                 }
         }
 
+        /* if ssid not set to hw don't check bssid
+         * here just used for linked scanning, & linked
+         * and nolink check bssid is set in set network_type
+         */
+        if ((changed_flags & FIF_BCN_PRBRESP_PROMISC) &&
+            (mac->link_state >= MAC80211_LINKED)) {
+                if (mac->opmode != NL80211_IFTYPE_AP &&
+                    mac->opmode != NL80211_IFTYPE_MESH_POINT) {
+                        if (*new_flags & FIF_BCN_PRBRESP_PROMISC)
+                                rtlpriv->cfg->ops->set_chk_bssid(hw, false);
+                        else
+                                rtlpriv->cfg->ops->set_chk_bssid(hw, true);
+                }
+        }
 
         if (changed_flags & FIF_CONTROL) {
                 if (*new_flags & FIF_CONTROL) {
-                        rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACF];
+                        mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACF];
 
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 "Enable receive control frame\n");
+                                 "Enable receive control frame.\n");
                 } else {
-                        rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACF];
+                        mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACF];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 "Disable receive control frame\n");
+                                 "Disable receive control frame.\n");
                 }
         }
 
         if (changed_flags & FIF_OTHER_BSS) {
                 if (*new_flags & FIF_OTHER_BSS) {
-                        rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AAP];
+                        mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AAP];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 "Enable receive other BSS's frame\n");
+                                 "Enable receive other BSS's frame.\n");
                 } else {
-                        rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_AAP];
+                        mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_AAP];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 "Disable receive other BSS's frame\n");
+                                 "Disable receive other BSS's frame.\n");
                 }
         }
-
-        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&rx_conf));
 }
 static int rtl_op_sta_add(struct ieee80211_hw *hw,
                          struct ieee80211_vif *vif,
@@ -625,7 +870,7 @@ static int rtl_op_sta_add(struct ieee80211_hw *hw,
         struct rtl_sta_info *sta_entry;
 
         if (sta) {
-                sta_entry = (struct rtl_sta_info *) sta->drv_priv;
+                sta_entry = (struct rtl_sta_info *)sta->drv_priv;
                 spin_lock_bh(&rtlpriv->locks.entry_list_lock);
                 list_add_tail(&sta_entry->list, &rtlpriv->entry_list);
                 spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
@@ -633,15 +878,17 @@ static int rtl_op_sta_add(struct ieee80211_hw *hw,
                         sta_entry->wireless_mode = WIRELESS_MODE_G;
                         if (sta->supp_rates[0] <= 0xf)
                                 sta_entry->wireless_mode = WIRELESS_MODE_B;
-                        if (sta->ht_cap.ht_supported == true)
+                        if (sta->ht_cap.ht_supported)
                                 sta_entry->wireless_mode = WIRELESS_MODE_N_24G;
 
                         if (vif->type == NL80211_IFTYPE_ADHOC)
                                 sta_entry->wireless_mode = WIRELESS_MODE_G;
                 } else if (rtlhal->current_bandtype == BAND_ON_5G) {
                         sta_entry->wireless_mode = WIRELESS_MODE_A;
-                        if (sta->ht_cap.ht_supported == true)
-                                sta_entry->wireless_mode = WIRELESS_MODE_N_24G;
+                        if (sta->ht_cap.ht_supported)
+                                sta_entry->wireless_mode = WIRELESS_MODE_N_5G;
+                        if (sta->vht_cap.vht_supported)
+                                sta_entry->wireless_mode = WIRELESS_MODE_AC_5G;
 
                         if (vif->type == NL80211_IFTYPE_ADHOC)
                                 sta_entry->wireless_mode = WIRELESS_MODE_A;
@@ -652,9 +899,10 @@ static int rtl_op_sta_add(struct ieee80211_hw *hw,
 
                 memcpy(sta_entry->mac_addr, sta->addr, ETH_ALEN);
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                         "Add sta addr is %pM\n", sta->addr);
+                        "Add sta addr is %pM\n", sta->addr);
                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
         }
+
         return 0;
 }
 
@@ -667,17 +915,15 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw,
         if (sta) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
                          "Remove sta addr is %pM\n", sta->addr);
-                sta_entry = (struct rtl_sta_info *) sta->drv_priv;
+                sta_entry = (struct rtl_sta_info *)sta->drv_priv;
                 sta_entry->wireless_mode = 0;
                 sta_entry->ratr_index = 0;
-
                 spin_lock_bh(&rtlpriv->locks.entry_list_lock);
                 list_del(&sta_entry->list);
                 spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
         }
         return 0;
 }
-
 static int _rtl_get_hal_qnum(u16 queue)
 {
         int qnum;
@@ -707,8 +953,8 @@ static int _rtl_get_hal_qnum(u16 queue)
  *for rtl819x  BE = 0, BK = 1, VI = 2, VO = 3
  */
 static int rtl_op_conf_tx(struct ieee80211_hw *hw,
-                   struct ieee80211_vif *vif, u16 queue,
-                   const struct ieee80211_tx_queue_params *param)
+                          struct ieee80211_vif *vif, u16 queue,
+                          const struct ieee80211_tx_queue_params *param)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -731,14 +977,14 @@ static int rtl_op_conf_tx(struct ieee80211_hw *hw,
 }
 
 static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
-                             struct ieee80211_vif *vif,
-                             struct ieee80211_bss_conf *bss_conf, u32 changed)
+                                    struct ieee80211_vif *vif,
+                                    struct ieee80211_bss_conf *bss_conf,
+                                    u32 changed)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        struct ieee80211_sta *sta = NULL;
 
         mutex_lock(&rtlpriv->locks.conf_mutex);
         if ((vif->type == NL80211_IFTYPE_ADHOC) ||
@@ -756,15 +1002,14 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                                 mac->beacon_enabled = 1;
                                 rtlpriv->cfg->ops->update_interrupt_mask(hw,
                                                 rtlpriv->cfg->maps
-                                                [RTL_IBSS_INT_MASKS],
-                                                0);
+                                                [RTL_IBSS_INT_MASKS], 0);
 
                                 if (rtlpriv->cfg->ops->linked_set_reg)
                                         rtlpriv->cfg->ops->linked_set_reg(hw);
                         }
                 }
                 if ((changed & BSS_CHANGED_BEACON_ENABLED &&
-                        !bss_conf->enable_beacon)) {
+                    !bss_conf->enable_beacon)) {
                         if (mac->beacon_enabled == 1) {
                                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
                                          "ADHOC DISABLE BEACON\n");
@@ -785,8 +1030,12 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
 
         /*TODO: reference to enum ieee80211_bss_change */
         if (changed & BSS_CHANGED_ASSOC) {
+                u8 mstatus;
                 if (bss_conf->assoc) {
                         struct ieee80211_sta *sta = NULL;
+                        u8 keep_alive = 10;
+
+                        mstatus = RT_MEDIA_CONNECT;
                         /* we should reset all sec info & cam
                          * before set cam after linked, we should not
                          * reset in disassoc, that will cause tkip->wep
@@ -804,47 +1053,89 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
 
                         if (rtlpriv->cfg->ops->linked_set_reg)
                                 rtlpriv->cfg->ops->linked_set_reg(hw);
+
                         rcu_read_lock();
                         sta = ieee80211_find_sta(vif, (u8 *)bss_conf->bssid);
                         if (!sta) {
-                                pr_err("ieee80211_find_sta returned NULL\n");
                                 rcu_read_unlock();
                                 goto out;
                         }
-
-                        if (vif->type == NL80211_IFTYPE_STATION && sta)
-                                rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
                         RT_TRACE(rtlpriv, COMP_EASY_CONCURRENT, DBG_LOUD,
                                  "send PS STATIC frame\n");
                         if (rtlpriv->dm.supp_phymode_switch) {
                                 if (sta->ht_cap.ht_supported)
                                         rtl_send_smps_action(hw, sta,
-                                                 IEEE80211_SMPS_STATIC);
+                                                        IEEE80211_SMPS_STATIC);
+                        }
+
+                        if (rtlhal->current_bandtype == BAND_ON_5G) {
+                                mac->mode = WIRELESS_MODE_A;
+                        } else {
+                                if (sta->supp_rates[0] <= 0xf)
+                                        mac->mode = WIRELESS_MODE_B;
+                                else
+                                        mac->mode = WIRELESS_MODE_G;
+                        }
+
+                        if (sta->ht_cap.ht_supported) {
+                                if (rtlhal->current_bandtype == BAND_ON_2_4G)
+                                        mac->mode = WIRELESS_MODE_N_24G;
+                                else
+                                        mac->mode = WIRELESS_MODE_N_5G;
                         }
+
+                        if (sta->vht_cap.vht_supported) {
+                                if (rtlhal->current_bandtype == BAND_ON_5G)
+                                        mac->mode = WIRELESS_MODE_AC_5G;
+                                else
+                                        mac->mode = WIRELESS_MODE_AC_24G;
+                        }
+
+                        if (vif->type == NL80211_IFTYPE_STATION && sta)
+                                rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
                         rcu_read_unlock();
 
+                        /* to avoid AP Disassociation caused by inactivity */
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_KEEP_ALIVE,
+                                                      (u8 *)(&keep_alive));
+
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
                                  "BSS_CHANGED_ASSOC\n");
                 } else {
+                        mstatus = RT_MEDIA_DISCONNECT;
+
                         if (mac->link_state == MAC80211_LINKED) {
                                 rtlpriv->enter_ps = false;
                                 schedule_work(&rtlpriv->works.lps_change_work);
                         }
-
                         if (ppsc->p2p_ps_info.p2p_ps_mode > P2P_PS_NONE)
                                 rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);
                         mac->link_state = MAC80211_NOLINK;
                         memset(mac->bssid, 0, ETH_ALEN);
                         mac->vendor = PEER_UNKNOWN;
+                        mac->mode = 0;
 
                         if (rtlpriv->dm.supp_phymode_switch) {
                                 if (rtlpriv->cfg->ops->chk_switch_dmdp)
                                         rtlpriv->cfg->ops->chk_switch_dmdp(hw);
                         }
-
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
                                  "BSS_CHANGED_UN_ASSOC\n");
                 }
+                rtlpriv->cfg->ops->set_network_type(hw, vif->type);
+                /* For FW LPS:
+                 * To tell firmware we have connected or disconnected
+                 */
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                              HW_VAR_H2C_FW_JOINBSSRPT,
+                                              (u8 *)(&mstatus));
+                ppsc->report_linked = (mstatus == RT_MEDIA_CONNECT) ?
+                                      true : false;
+
+                if (rtlpriv->cfg->ops->get_btc_status())
+                        rtlpriv->btcoexist.btc_ops->btc_mediastatus_notify(
+                                                        rtlpriv, mstatus);
         }
 
         if (changed & BSS_CHANGED_ERP_CTS_PROT) {
@@ -856,11 +1147,11 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                          "BSS_CHANGED_ERP_PREAMBLE use short preamble:%x\n",
-                         bss_conf->use_short_preamble);
+                          bss_conf->use_short_preamble);
 
                 mac->short_preamble = bss_conf->use_short_preamble;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACK_PREAMBLE,
-                                              &mac->short_preamble);
+                                              (u8 *)(&mac->short_preamble));
         }
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
@@ -873,13 +1164,17 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         mac->slot_time = RTL_SLOT_TIME_20;
 
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                              &mac->slot_time);
+                                              (u8 *)(&mac->slot_time));
         }
 
         if (changed & BSS_CHANGED_HT) {
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE, "BSS_CHANGED_HT\n");
+                struct ieee80211_sta *sta = NULL;
+
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
+                         "BSS_CHANGED_HT\n");
+
                 rcu_read_lock();
-                sta = get_sta(hw, vif, bss_conf->bssid);
+                sta = ieee80211_find_sta(vif, (u8 *)bss_conf->bssid);
                 if (sta) {
                         if (sta->ht_cap.ampdu_density >
                             mac->current_ampdu_density)
@@ -893,7 +1188,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 rcu_read_unlock();
 
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SHORTGI_DENSITY,
-                                              &mac->max_mss_density);
+                                              (u8 *)(&mac->max_mss_density));
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_FACTOR,
                                               &mac->current_ampdu_factor);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_MIN_SPACE,
@@ -902,19 +1197,19 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
 
         if (changed & BSS_CHANGED_BSSID) {
                 u32 basic_rates;
+                struct ieee80211_sta *sta = NULL;
 
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BSSID,
-                                              (u8 *) bss_conf->bssid);
+                                              (u8 *)bss_conf->bssid);
 
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG, "%pM\n",
-                         bss_conf->bssid);
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
+                         "bssid: %pM\n", bss_conf->bssid);
 
                 mac->vendor = PEER_UNKNOWN;
                 memcpy(mac->bssid, bss_conf->bssid, ETH_ALEN);
-                rtlpriv->cfg->ops->set_network_type(hw, vif->type);
 
                 rcu_read_lock();
-                sta = get_sta(hw, vif, bss_conf->bssid);
+                sta = ieee80211_find_sta(vif, (u8 *)bss_conf->bssid);
                 if (!sta) {
                         rcu_read_unlock();
                         goto out;
@@ -936,11 +1231,18 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                                 mac->mode = WIRELESS_MODE_N_5G;
                 }
 
+                if (sta->vht_cap.vht_supported) {
+                        if (rtlhal->current_bandtype == BAND_ON_5G)
+                                mac->mode = WIRELESS_MODE_AC_5G;
+                        else
+                                mac->mode = WIRELESS_MODE_AC_24G;
+                }
+
                 /* just station need it, because ibss & ap mode will
                  * set in sta_add, and will be NULL here */
-                if (mac->opmode == NL80211_IFTYPE_STATION) {
+                if (vif->type == NL80211_IFTYPE_STATION) {
                         struct rtl_sta_info *sta_entry;
-                        sta_entry = (struct rtl_sta_info *) sta->drv_priv;
+                        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
                         sta_entry->wireless_mode = mac->mode;
                 }
 
@@ -955,6 +1257,9 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                          * */
                 }
 
+                if (sta->vht_cap.vht_supported)
+                        mac->vht_enable = true;
+
                 if (changed & BSS_CHANGED_BASIC_RATES) {
                         /* for 5G must << RATE_6M_INDEX = 4,
                          * because 5G have no cck rate*/
@@ -969,40 +1274,6 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 }
                 rcu_read_unlock();
         }
-
-        /*
-         * For FW LPS:
-         * To tell firmware we have connected
-         * to an AP. For 92SE/CE power save v2.
-         */
-        if (changed & BSS_CHANGED_ASSOC) {
-                if (bss_conf->assoc) {
-                        if (ppsc->fwctrl_lps) {
-                                u8 mstatus = RT_MEDIA_CONNECT;
-                                u8 keep_alive = 10;
-                                rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                 HW_VAR_KEEP_ALIVE,
-                                                 &keep_alive);
-
-                                rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                      HW_VAR_H2C_FW_JOINBSSRPT,
-                                                      &mstatus);
-                                ppsc->report_linked = true;
-                        }
-                } else {
-                        if (ppsc->fwctrl_lps) {
-                                u8 mstatus = RT_MEDIA_DISCONNECT;
-                                rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                      HW_VAR_H2C_FW_JOINBSSRPT,
-                                                      &mstatus);
-                                ppsc->report_linked = false;
-                        }
-                }
-                if (rtlpriv->cfg->ops->bt_wifi_media_status_notify)
-                        rtlpriv->cfg->ops->bt_wifi_media_status_notify(hw,
-                                                         ppsc->report_linked);
-        }
-
 out:
         mutex_unlock(&rtlpriv->locks.conf_mutex);
 }
@@ -1012,28 +1283,27 @@ static u64 rtl_op_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u64 tsf;
 
-        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&tsf));
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *)(&tsf));
         return tsf;
 }
 
-static void rtl_op_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                           u64 tsf)
+static void rtl_op_set_tsf(struct ieee80211_hw *hw,
+                           struct ieee80211_vif *vif, u64 tsf)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;
 
         mac->tsf = tsf;
-        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, &bibss);
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *)(&bibss));
 }
 
-static void rtl_op_reset_tsf(struct ieee80211_hw *hw,
-                             struct ieee80211_vif *vif)
+static void rtl_op_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmp = 0;
 
-        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, &tmp);
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, (u8 *)(&tmp));
 }
 
 static void rtl_op_sta_notify(struct ieee80211_hw *hw,
@@ -1063,13 +1333,13 @@ static int rtl_op_ampdu_action(struct ieee80211_hw *hw,
         case IEEE80211_AMPDU_TX_START:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          "IEEE80211_AMPDU_TX_START: TID:%d\n", tid);
-                return rtl_tx_agg_start(hw, sta, tid, ssn);
+                return rtl_tx_agg_start(hw, vif, sta, tid, ssn);
         case IEEE80211_AMPDU_TX_STOP_CONT:
         case IEEE80211_AMPDU_TX_STOP_FLUSH:
         case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          "IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid);
-                return rtl_tx_agg_stop(hw, sta, tid);
+                return rtl_tx_agg_stop(hw, vif, sta, tid);
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          "IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid);
@@ -1103,10 +1373,14 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw)
                 return;
         }
 
+        if (rtlpriv->cfg->ops->get_btc_status())
+                rtlpriv->btcoexist.btc_ops->btc_scan_notify(rtlpriv, 1);
+
         if (rtlpriv->dm.supp_phymode_switch) {
                 if (rtlpriv->cfg->ops->chk_switch_dmdp)
                         rtlpriv->cfg->ops->chk_switch_dmdp(hw);
         }
+
         if (mac->link_state == MAC80211_LINKED) {
                 rtlpriv->enter_ps = false;
                 schedule_work(&rtlpriv->works.lps_change_work);
@@ -1115,11 +1389,11 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw)
                 rtl_ips_nic_on(hw);
         }
 
-        /* Dual mac */
+        /* Dul mac */
         rtlpriv->rtlhal.load_imrandiqk_setting_for2g = false;
 
         rtlpriv->cfg->ops->led_control(hw, LED_CTL_SITE_SURVEY);
-        rtlpriv->cfg->ops->scan_operation_backup(hw, SCAN_OPT_BACKUP);
+        rtlpriv->cfg->ops->scan_operation_backup(hw, SCAN_OPT_BACKUP_BAND0);
 }
 
 static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw)
@@ -1133,13 +1407,13 @@ static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw)
         if (rtlpriv->link_info.higher_busytraffic)
                 return;
 
-        /*p2p will use 1/6/11 to scan */
+        /* p2p will use 1/6/11 to scan */
         if (mac->n_channels == 3)
                 mac->p2p_in_use = true;
         else
                 mac->p2p_in_use = false;
         mac->n_channels = 0;
-        /* Dual mac */
+        /* Dul mac */
         rtlpriv->rtlhal.load_imrandiqk_setting_for2g = false;
 
         if (mac->link_state == MAC80211_LINKED_SCANNING) {
@@ -1151,6 +1425,8 @@ static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw)
         }
 
         rtlpriv->cfg->ops->scan_operation_backup(hw, SCAN_OPT_RESTORE);
+        if (rtlpriv->cfg->ops->get_btc_status())
+                rtlpriv->btcoexist.btc_ops->btc_scan_notify(rtlpriv, 0);
 }
 
 static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
@@ -1158,7 +1434,6 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                           struct ieee80211_key_conf *key)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u8 key_type = NO_ENCRYPTION;
         u8 key_idx;
         bool group_key = false;
@@ -1174,13 +1449,13 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         }
         /* To support IBSS, use sw-crypto for GTK */
         if (((vif->type == NL80211_IFTYPE_ADHOC) ||
-             (vif->type == NL80211_IFTYPE_MESH_POINT)) &&
-              !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
+            (vif->type == NL80211_IFTYPE_MESH_POINT)) &&
+           !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
                 return -ENOSPC;
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                  "%s hardware based encryption for keyidx: %d, mac: %pM\n",
-                 cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
-                 sta ? sta->addr : bcast_addr);
+                  cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
+                  sta ? sta->addr : bcast_addr);
         rtlpriv->sec.being_setkey = true;
         rtl_ips_nic_on(hw);
         mutex_lock(&rtlpriv->locks.conf_mutex);
@@ -1204,21 +1479,23 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CCMP\n");
                 break;
         case WLAN_CIPHER_SUITE_AES_CMAC:
-                /*HW doesn't support CMAC encryption, use software CMAC */
+                /* HW don't support CMAC encryption,
+                 * use software CMAC encryption
+                 */
                 key_type = AESCMAC_ENCRYPTION;
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CMAC\n");
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         "HW don't support CMAC encryption, use software CMAC\n");
+                         "HW don't support CMAC encrypiton, use software CMAC encrypiton\n");
                 err = -EOPNOTSUPP;
                 goto out_unlock;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "alg_err:%x!!!!\n",
-                         key->cipher);
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "alg_err:%x!!!!:\n", key->cipher);
                 goto out_unlock;
         }
         if (key_type == WEP40_ENCRYPTION ||
-                        key_type == WEP104_ENCRYPTION ||
-                        mac->opmode == NL80211_IFTYPE_ADHOC)
+           key_type == WEP104_ENCRYPTION ||
+           vif->type == NL80211_IFTYPE_ADHOC)
                 rtlpriv->sec.use_defaultkey = true;
 
         /* <2> get key_idx */
@@ -1232,14 +1509,14 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
          * 1) wep only: is just for wep enc, in this condition
          * rtlpriv->sec.pairwise_enc_algorithm == NO_ENCRYPTION
          * will be true & enable_hw_sec will be set when wep
-         * key setting.
+         * ke setting.
          * 2) wep(group) + AES(pairwise): some AP like cisco
          * may use it, in this condition enable_hw_sec will not
          * be set when wep key setting */
         /* we must reset sec_info after lingked before set key,
          * or some flag will be wrong*/
         if (vif->type == NL80211_IFTYPE_AP ||
-            vif->type == NL80211_IFTYPE_MESH_POINT) {
+                vif->type == NL80211_IFTYPE_MESH_POINT) {
                 if (!group_key || key_type == WEP40_ENCRYPTION ||
                         key_type == WEP104_ENCRYPTION) {
                         if (group_key)
@@ -1247,11 +1524,11 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                         rtlpriv->cfg->ops->enable_hw_sec(hw);
                 }
         } else {
-                if ((!group_key) || (mac->opmode == NL80211_IFTYPE_ADHOC) ||
-                     rtlpriv->sec.pairwise_enc_algorithm == NO_ENCRYPTION) {
+                if ((!group_key) || (vif->type == NL80211_IFTYPE_ADHOC) ||
+                    rtlpriv->sec.pairwise_enc_algorithm == NO_ENCRYPTION) {
                         if (rtlpriv->sec.pairwise_enc_algorithm ==
                             NO_ENCRYPTION &&
-                            (key_type == WEP40_ENCRYPTION ||
+                           (key_type == WEP40_ENCRYPTION ||
                             key_type == WEP104_ENCRYPTION))
                                 wep_only = true;
                         rtlpriv->sec.pairwise_enc_algorithm = key_type;
@@ -1323,7 +1600,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                          "disable key delete one entry\n");
                 /*set local buf about wep key. */
                 if (vif->type == NL80211_IFTYPE_AP ||
-                    vif->type == NL80211_IFTYPE_MESH_POINT) {
+                        vif->type == NL80211_IFTYPE_MESH_POINT) {
                         if (sta)
                                 rtl_cam_del_entry(hw, sta->addr);
                 }
@@ -1336,13 +1613,10 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                  *or clear all entry here.
                  */
                 rtl_cam_delete_one_entry(hw, mac_addr, key_idx);
-
-                rtl_cam_reset_sec_info(hw);
-
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "cmd_err:%x!!!!\n", cmd);
+                         "cmd_err:%x!!!!:\n", cmd);
         }
 out_unlock:
         mutex_unlock(&rtlpriv->locks.conf_mutex);
@@ -1372,7 +1646,7 @@ static void rtl_op_rfkill_poll(struct ieee80211_hw *hw)
 
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                  "wireless radio switch turned %s\n",
-                                 radio_state ? "on" : "off");
+                                  radio_state ? "on" : "off");
 
                         blocked = (rtlpriv->rfkill.rfkill_state == 1) ? 0 : 1;
                         wiphy_rfkill_set_hw_state(hw->wiphy, blocked);
@@ -1383,18 +1657,148 @@ static void rtl_op_rfkill_poll(struct ieee80211_hw *hw)
 }
 
 /* this function is called by mac80211 to flush tx buffer
- * before switch channel or power save, or tx buffer packet
+ * before switch channle or power save, or tx buffer packet
  * maybe send after offchannel or rf sleep, this may cause
  * dis-association by AP */
-static void rtl_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                         u32 queues, bool drop)
+static void rtl_op_flush(struct ieee80211_hw *hw,
+                         struct ieee80211_vif *vif,
+                         u32 queues,
+                         bool drop)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         if (rtlpriv->intf_ops->flush)
-                rtlpriv->intf_ops->flush(hw, drop);
+                rtlpriv->intf_ops->flush(hw, queues, drop);
 }
 
+/*      Description:
+ *              This routine deals with the Power Configuration CMD
+ *               parsing for RTL8723/RTL8188E Series IC.
+ *      Assumption:
+ *              We should follow specific format that was released from HW SD.
+ */
+bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
+                              u8 faversion, u8 interface_type,
+                              struct wlan_pwr_cfg pwrcfgcmd[])
+{
+        struct wlan_pwr_cfg cfg_cmd = {0};
+        bool polling_bit = false;
+        u32 ary_idx = 0;
+        u8 value = 0;
+        u32 offset = 0;
+        u32 polling_count = 0;
+        u32 max_polling_cnt = 5000;
+
+        do {
+                cfg_cmd = pwrcfgcmd[ary_idx];
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "rtl_hal_pwrseqcmdparsing(): offset(%#x),cut_msk(%#x), famsk(%#x), interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), value(%#x)\n",
+                         GET_PWR_CFG_OFFSET(cfg_cmd),
+                                            GET_PWR_CFG_CUT_MASK(cfg_cmd),
+                         GET_PWR_CFG_FAB_MASK(cfg_cmd),
+                                              GET_PWR_CFG_INTF_MASK(cfg_cmd),
+                         GET_PWR_CFG_BASE(cfg_cmd), GET_PWR_CFG_CMD(cfg_cmd),
+                         GET_PWR_CFG_MASK(cfg_cmd), GET_PWR_CFG_VALUE(cfg_cmd));
+
+                if ((GET_PWR_CFG_FAB_MASK(cfg_cmd)&faversion) &&
+                    (GET_PWR_CFG_CUT_MASK(cfg_cmd)&cut_version) &&
+                    (GET_PWR_CFG_INTF_MASK(cfg_cmd)&interface_type)) {
+                        switch (GET_PWR_CFG_CMD(cfg_cmd)) {
+                        case PWR_CMD_READ:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_READ\n");
+                                break;
+                        case PWR_CMD_WRITE:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_WRITE\n");
+                                offset = GET_PWR_CFG_OFFSET(cfg_cmd);
+
+                                /*Read the value from system register*/
+                                value = rtl_read_byte(rtlpriv, offset);
+                                value &= (~(GET_PWR_CFG_MASK(cfg_cmd)));
+                                value |= (GET_PWR_CFG_VALUE(cfg_cmd) &
+                                          GET_PWR_CFG_MASK(cfg_cmd));
+
+                                /*Write the value back to sytem register*/
+                                rtl_write_byte(rtlpriv, offset, value);
+                                break;
+                        case PWR_CMD_POLLING:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_POLLING\n");
+                                polling_bit = false;
+                                offset = GET_PWR_CFG_OFFSET(cfg_cmd);
+
+                                do {
+                                        value = rtl_read_byte(rtlpriv, offset);
+
+                                        value &= GET_PWR_CFG_MASK(cfg_cmd);
+                                        if (value ==
+                                            (GET_PWR_CFG_VALUE(cfg_cmd) &
+                                             GET_PWR_CFG_MASK(cfg_cmd)))
+                                                polling_bit = true;
+                                        else
+                                                udelay(10);
+
+                                        if (polling_count++ > max_polling_cnt)
+                                                return false;
+                                } while (!polling_bit);
+                                break;
+                        case PWR_CMD_DELAY:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                         "rtl_hal_pwrseqcmdparsing(): PWR_CMD_DELAY\n");
+                                if (GET_PWR_CFG_VALUE(cfg_cmd) ==
+                                    PWRSEQ_DELAY_US)
+                                        udelay(GET_PWR_CFG_OFFSET(cfg_cmd));
+                                else
+                                        mdelay(GET_PWR_CFG_OFFSET(cfg_cmd));
+                                break;
+                        case PWR_CMD_END:
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                         "rtl_hal_pwrseqcmdparsing(): PWR_CMD_END\n");
+                                return true;
+                        default:
+                                RT_ASSERT(false,
+                                          "rtl_hal_pwrseqcmdparsing(): Unknown CMD!!\n");
+                                break;
+                        }
+                }
+                ary_idx++;
+        } while (1);
+
+        return true;
+}
+EXPORT_SYMBOL(rtl_hal_pwrseqcmdparsing);
+
+bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring;
+        struct rtl_tx_desc *pdesc;
+        unsigned long flags;
+        struct sk_buff *pskb = NULL;
+
+        ring = &rtlpci->tx_ring[BEACON_QUEUE];
+
+        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
+        pskb = __skb_dequeue(&ring->queue);
+        if (pskb)
+                kfree_skb(pskb);
+
+        /*this is wrong, fill_tx_cmddesc needs update*/
+        pdesc = &ring->desc[0];
+
+        rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *)pdesc, 1, 1, skb);
+
+        __skb_queue_tail(&ring->queue, skb);
+
+        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
+
+        rtlpriv->cfg->ops->tx_polling(hw, BEACON_QUEUE);
+
+        return true;
+}
+EXPORT_SYMBOL(rtl_cmd_send_packet);
 const struct ieee80211_ops rtl_ops = {
         .start = rtl_op_start,
         .stop = rtl_op_stop,
@@ -1402,10 +1806,12 @@ const struct ieee80211_ops rtl_ops = {
         .add_interface = rtl_op_add_interface,
         .remove_interface = rtl_op_remove_interface,
         .change_interface = rtl_op_change_interface,
+#ifdef CONFIG_PM
+        .suspend = rtl_op_suspend,
+        .resume = rtl_op_resume,
+#endif
         .config = rtl_op_config,
         .configure_filter = rtl_op_configure_filter,
-        .sta_add = rtl_op_sta_add,
-        .sta_remove = rtl_op_sta_remove,
         .set_key = rtl_op_set_key,
         .conf_tx = rtl_op_conf_tx,
         .bss_info_changed = rtl_op_bss_info_changed,
@@ -1417,6 +1823,8 @@ const struct ieee80211_ops rtl_ops = {
         .sw_scan_start = rtl_op_sw_scan_start,
         .sw_scan_complete = rtl_op_sw_scan_complete,
         .rfkill_poll = rtl_op_rfkill_poll,
+        .sta_add = rtl_op_sta_add,
+        .sta_remove = rtl_op_sta_remove,
         .flush = rtl_op_flush,
 };
 EXPORT_SYMBOL_GPL(rtl_ops);
diff --git a/drivers/net/wireless/rtlwifi/core.h b/drivers/net/wireless/rtlwifi/core.h
index 027e75374dcc..59cd3b9dca25 100644
--- a/drivers/net/wireless/rtlwifi/core.h
+++ b/drivers/net/wireless/rtlwifi/core.h
@@ -2,20 +2,16 @@
  *
  * Copyright(c) 2009-2012  Realtek Corporation.
  *
- * Tmis program is free software; you can redistribute it and/or modify it
+ * This program 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
+ * 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.
  *
- * You should have received a copy of the GNU General Public License along with
- * tmis program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * Tme full GNU General Public License is included in this distribution in the
+ * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
  * Contact Information:
@@ -45,5 +41,6 @@ void rtl_addr_delay(u32 addr);
 void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
                      u32 mask, u32 data);
 void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data);
+bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index 76e2086e137e..fd25abad2b9e 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -2,20 +2,16 @@
  *
  * Copyright(c) 2009-2012  Realtek Corporation.
  *
- * Tmis program is free software; you can redistribute it and/or modify it
+ * This program 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
+ * 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.
  *
- * You should have received a copy of the GNU General Public License along with
- * tmis program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * Tme full GNU General Public License is included in this distribution in the
+ * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
  * Contact Information:
diff --git a/drivers/net/wireless/rtlwifi/debug.h b/drivers/net/wireless/rtlwifi/debug.h
index 6d669364e3d9..fc794b3e9f4a 100644
--- a/drivers/net/wireless/rtlwifi/debug.h
+++ b/drivers/net/wireless/rtlwifi/debug.h
@@ -2,20 +2,16 @@
  *
  * Copyright(c) 2009-2012  Realtek Corporation.
  *
- * Tmis program is free software; you can redistribute it and/or modify it
+ * This program 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
+ * 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.
  *
- * You should have received a copy of the GNU General Public License along with
- * tmis program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * Tme full GNU General Public License is included in this distribution in the
+ * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
  * Contact Information:
@@ -108,6 +104,7 @@
 #define COMP_USB                        BIT(29)
 #define COMP_EASY_CONCURRENT    COMP_USB /* reuse of this bit is OK */
 #define COMP_BT_COEXIST                 BIT(30)
+#define COMP_IQK                        BIT(31)
 
 /*--------------------------------------------------------------
                 Define the rt_print components
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 2ffc7298f686..0b4082c9272a 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * tmis program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * Tme full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -26,10 +22,9 @@
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
  *****************************************************************************/
-
-#include <linux/export.h>
 #include "wifi.h"
 #include "efuse.h"
+#include <linux/export.h>
 
 static const u8 MAX_PGPKT_SIZE = 9;
 static const u8 PGPKT_DATA_SIZE = 8;
@@ -63,21 +58,19 @@ static void efuse_shadow_write_2byte(struct ieee80211_hw *hw, u16 offset,
                                      u16 value);
 static void efuse_shadow_write_4byte(struct ieee80211_hw *hw, u16 offset,
                                      u32 value);
-static int efuse_one_byte_read(struct ieee80211_hw *hw, u16 addr,
-                                        u8 *data);
 static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr,
-                                        u8 data);
+                                u8 data);
 static void efuse_read_all_map(struct ieee80211_hw *hw, u8 *efuse);
 static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset,
-                                        u8 *data);
+                                u8 *data);
 static int efuse_pg_packet_write(struct ieee80211_hw *hw, u8 offset,
                                  u8 word_en, u8 *data);
 static void efuse_word_enable_data_read(u8 word_en, u8 *sourdata,
                                         u8 *targetdata);
-static u8 efuse_word_enable_data_write(struct ieee80211_hw *hw,
-                                       u16 efuse_addr, u8 word_en, u8 *data);
+static u8 enable_efuse_data_write(struct ieee80211_hw *hw,
+                                  u16 efuse_addr, u8 word_en, u8 *data);
 static void efuse_power_switch(struct ieee80211_hw *hw, u8 write,
-                                        u8 pwrstate);
+                               u8 pwrstate);
 static u16 efuse_get_current_size(struct ieee80211_hw *hw);
 static u8 efuse_calculate_word_cnts(u8 word_en);
 
@@ -258,7 +251,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
         }
 
         /* allocate memory for efuse_tbl and efuse_word */
-        efuse_tbl = kmalloc(rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE] *
+        efuse_tbl = kzalloc(rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE] *
                             sizeof(u8), GFP_ATOMIC);
         if (!efuse_tbl)
                 return;
@@ -266,7 +259,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
         if (!efuse_word)
                 goto out;
         for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
-                efuse_word[i] = kmalloc(efuse_max_section * sizeof(u16),
+                efuse_word[i] = kzalloc(efuse_max_section * sizeof(u16),
                                         GFP_ATOMIC);
                 if (!efuse_word[i])
                         goto done;
@@ -413,8 +406,7 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
         efuse_used = rtlefuse->efuse_usedbytes;
 
         if ((totalbytes + efuse_used) >=
-            (EFUSE_MAX_SIZE -
-             rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))
+            (EFUSE_MAX_SIZE - rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))
                 result = false;
 
         RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
@@ -428,13 +420,14 @@ void efuse_shadow_read(struct ieee80211_hw *hw, u8 type,
                        u16 offset, u32 *value)
 {
         if (type == 1)
-                efuse_shadow_read_1byte(hw, offset, (u8 *) value);
+                efuse_shadow_read_1byte(hw, offset, (u8 *)value);
         else if (type == 2)
-                efuse_shadow_read_2byte(hw, offset, (u16 *) value);
+                efuse_shadow_read_2byte(hw, offset, (u16 *)value);
         else if (type == 4)
                 efuse_shadow_read_4byte(hw, offset, value);
 
 }
+EXPORT_SYMBOL(efuse_shadow_read);
 
 void efuse_shadow_write(struct ieee80211_hw *hw, u8 type, u16 offset,
                                 u32 value)
@@ -456,7 +449,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
         u8 word_en = 0x0F;
         u8 first_pg = false;
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "--->\n");
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "\n");
 
         if (!efuse_shadow_update_chk(hw)) {
                 efuse_read_all_map(hw, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0]);
@@ -465,7 +458,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                        rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                         "<---efuse out of capacity!!\n");
+                         "efuse out of capacity!!\n");
                 return false;
         }
         efuse_power_switch(hw, true, true);
@@ -477,7 +470,6 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
 
                 for (i = 0; i < 8; i++) {
                         if (first_pg) {
-
                                 word_en &= ~(BIT(i / 2));
 
                                 rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] =
@@ -500,7 +492,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                                &rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base],
                                8);
                         RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD,
-                                      "U-efuse", tmpdata, 8);
+                                      "U-efuse\n", tmpdata, 8);
 
                         if (!efuse_pg_packet_write(hw, (u8) offset, word_en,
                                                    tmpdata)) {
@@ -519,7 +511,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
                rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "<---\n");
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "\n");
         return true;
 }
 
@@ -529,14 +521,14 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
 
         if (rtlefuse->autoload_failflag)
-                memset(&rtlefuse->efuse_map[EFUSE_INIT_MAP][0], 0xFF,
-                        rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
+                memset((&rtlefuse->efuse_map[EFUSE_INIT_MAP][0]),
+                       0xFF, rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
         else
                 efuse_read_all_map(hw, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0]);
 
         memcpy(&rtlefuse->efuse_map[EFUSE_MODIFY_MAP][0],
-               &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
-               rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
+                        &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
+                        rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
 }
 EXPORT_SYMBOL(rtl_efuse_shadow_map_update);
@@ -619,7 +611,7 @@ static void efuse_shadow_write_4byte(struct ieee80211_hw *hw,
 
 }
 
-static int efuse_one_byte_read(struct ieee80211_hw *hw, u16 addr, u8 *data)
+int efuse_one_byte_read(struct ieee80211_hw *hw, u16 addr, u8 *data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmpidx = 0;
@@ -650,14 +642,15 @@ static int efuse_one_byte_read(struct ieee80211_hw *hw, u16 addr, u8 *data)
         }
         return result;
 }
+EXPORT_SYMBOL(efuse_one_byte_read);
 
 static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmpidx = 0;
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "Addr = %x Data=%x\n",
-                 addr, data);
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
+                 "Addr = %x Data=%x\n", addr, data);
 
         rtl_write_byte(rtlpriv,
                        rtlpriv->cfg->maps[EFUSE_CTRL] + 1, (u8) (addr & 0xff));
@@ -677,11 +670,10 @@ static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data)
 
         if (tmpidx < 100)
                 return true;
-
         return false;
 }
 
-static void efuse_read_all_map(struct ieee80211_hw *hw, u8 * efuse)
+static void efuse_read_all_map(struct ieee80211_hw *hw, u8 *efuse)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         efuse_power_switch(hw, false, true);
@@ -706,14 +698,14 @@ static void efuse_read_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
         if (hoffset == offset) {
                 for (tmpidx = 0; tmpidx < word_cnts * 2; tmpidx++) {
                         if (efuse_one_byte_read(hw, *efuse_addr + 1 + tmpidx,
-                            &efuse_data)) {
+                                                &efuse_data)) {
                                 tmpdata[tmpidx] = efuse_data;
                                 if (efuse_data != 0xff)
-                                        dataempty = true;
+                                        dataempty = false;
                         }
                 }
 
-                if (dataempty) {
+                if (!dataempty) {
                         *readstate = PG_STATE_DATA;
                 } else {
                         *efuse_addr = *efuse_addr + (word_cnts * 2) + 1;
@@ -729,7 +721,9 @@ static void efuse_read_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
 static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset, u8 *data)
 {
         u8 readstate = PG_STATE_HEADER;
+
         bool continual = true;
+
         u8 efuse_data, word_cnts = 0;
         u16 efuse_addr = 0;
         u8 tmpdata[8];
@@ -747,9 +741,8 @@ static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset, u8 *data)
                         if (efuse_one_byte_read(hw, efuse_addr, &efuse_data)
                             && (efuse_data != 0xFF))
                                 efuse_read_data_case1(hw, &efuse_addr,
-                                                      efuse_data,
-                                                      offset, tmpdata,
-                                                      &readstate);
+                                                      efuse_data, offset,
+                                                      tmpdata, &readstate);
                         else
                                 continual = false;
                 } else if (readstate & PG_STATE_DATA) {
@@ -771,13 +764,14 @@ static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset, u8 *data)
 }
 
 static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
-                        u8 efuse_data, u8 offset, int *continual,
-                        u8 *write_state, struct pgpkt_struct *target_pkt,
-                        int *repeat_times, int *result, u8 word_en)
+                                   u8 efuse_data, u8 offset,
+                                   int *continual, u8 *write_state,
+                                   struct pgpkt_struct *target_pkt,
+                                   int *repeat_times, int *result, u8 word_en)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct pgpkt_struct tmp_pkt;
-        bool dataempty = true;
+        int dataempty = true;
         u8 originaldata[8 * sizeof(u8)];
         u8 badworden = 0x0F;
         u8 match_word_en, tmp_word_en;
@@ -794,9 +788,10 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                 *write_state = PG_STATE_HEADER;
         } else {
                 for (tmpindex = 0; tmpindex < (tmp_word_cnts * 2); tmpindex++) {
-                        u16 address = *efuse_addr + 1 + tmpindex;
-                        if (efuse_one_byte_read(hw, address,
-                             &efuse_data) && (efuse_data != 0xFF))
+                        if (efuse_one_byte_read(hw,
+                                                (*efuse_addr + 1 + tmpindex),
+                                                &efuse_data) &&
+                            (efuse_data != 0xFF))
                                 dataempty = false;
                 }
 
@@ -806,33 +801,34 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                 } else {
                         match_word_en = 0x0F;
                         if (!((target_pkt->word_en & BIT(0)) |
-                             (tmp_pkt.word_en & BIT(0))))
+                            (tmp_pkt.word_en & BIT(0))))
                                 match_word_en &= (~BIT(0));
 
                         if (!((target_pkt->word_en & BIT(1)) |
-                             (tmp_pkt.word_en & BIT(1))))
+                            (tmp_pkt.word_en & BIT(1))))
                                 match_word_en &= (~BIT(1));
 
                         if (!((target_pkt->word_en & BIT(2)) |
-                             (tmp_pkt.word_en & BIT(2))))
+                            (tmp_pkt.word_en & BIT(2))))
                                 match_word_en &= (~BIT(2));
 
                         if (!((target_pkt->word_en & BIT(3)) |
-                             (tmp_pkt.word_en & BIT(3))))
+                            (tmp_pkt.word_en & BIT(3))))
                                 match_word_en &= (~BIT(3));
 
                         if ((match_word_en & 0x0F) != 0x0F) {
-                                badworden = efuse_word_enable_data_write(
-                                                            hw, *efuse_addr + 1,
-                                                            tmp_pkt.word_en,
-                                                            target_pkt->data);
+                                badworden =
+                                  enable_efuse_data_write(hw,
+                                                          *efuse_addr + 1,
+                                                          tmp_pkt.word_en,
+                                                          target_pkt->data);
 
-                                if (0x0F != (badworden & 0x0F)) {
+                                if (0x0F != (badworden & 0x0F)) {
                                         u8 reorg_offset = offset;
                                         u8 reorg_worden = badworden;
                                         efuse_pg_packet_write(hw, reorg_offset,
-                                                               reorg_worden,
-                                                               originaldata);
+                                                              reorg_worden,
+                                                              originaldata);
                                 }
 
                                 tmp_word_en = 0x0F;
@@ -845,11 +841,11 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                                         tmp_word_en &= (~BIT(1));
 
                                 if ((target_pkt->word_en & BIT(2)) ^
-                                     (match_word_en & BIT(2)))
+                                    (match_word_en & BIT(2)))
                                         tmp_word_en &= (~BIT(2));
 
                                 if ((target_pkt->word_en & BIT(3)) ^
-                                     (match_word_en & BIT(3)))
+                                    (match_word_en & BIT(3)))
                                         tmp_word_en &= (~BIT(3));
 
                                 if ((tmp_word_en & 0x0F) != 0x0F) {
@@ -873,7 +869,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                         }
                 }
         }
-        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,  "efuse PG_STATE_HEADER-1\n");
+        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, "efuse PG_STATE_HEADER-1\n");
 }
 
 static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
@@ -908,12 +904,13 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
 
                 tmp_word_cnts = efuse_calculate_word_cnts(tmp_pkt.word_en);
 
-                memset(originaldata, 0xff, 8 * sizeof(u8));
+                memset(originaldata, 0xff,  8 * sizeof(u8));
 
                 if (efuse_pg_packet_read(hw, tmp_pkt.offset, originaldata)) {
-                        badworden = efuse_word_enable_data_write(hw,
-                                    *efuse_addr + 1, tmp_pkt.word_en,
-                                    originaldata);
+                        badworden = enable_efuse_data_write(hw,
+                                                            *efuse_addr + 1,
+                                                            tmp_pkt.word_en,
+                                                            originaldata);
 
                         if (0x0F != (badworden & 0x0F)) {
                                 u8 reorg_offset = tmp_pkt.offset;
@@ -923,8 +920,8 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
                                                       originaldata);
                                 *efuse_addr = efuse_get_current_size(hw);
                         } else {
-                                *efuse_addr = *efuse_addr + (tmp_word_cnts * 2)
-                                              + 1;
+                                *efuse_addr = *efuse_addr +
+                                              (tmp_word_cnts * 2) + 1;
                         }
                 } else {
                         *efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1;
@@ -948,7 +945,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct pgpkt_struct target_pkt;
         u8 write_state = PG_STATE_HEADER;
-        int continual = true, result = true;
+        int continual = true, dataempty = true, result = true;
         u16 efuse_addr = 0;
         u8 efuse_data;
         u8 target_word_cnts = 0;
@@ -956,7 +953,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         static int repeat_times;
 
         if (efuse_get_current_size(hw) >= (EFUSE_MAX_SIZE -
-            rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {
+                rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
                         "efuse_pg_packet_write error\n");
                 return false;
@@ -965,17 +962,18 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         target_pkt.offset = offset;
         target_pkt.word_en = word_en;
 
-        memset(target_pkt.data, 0xFF, 8 * sizeof(u8));
+        memset(target_pkt.data, 0xFF,  8 * sizeof(u8));
 
         efuse_word_enable_data_read(word_en, data, target_pkt.data);
         target_word_cnts = efuse_calculate_word_cnts(target_pkt.word_en);
 
-        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,  "efuse Power ON\n");
+        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, "efuse Power ON\n");
 
         while (continual && (efuse_addr < (EFUSE_MAX_SIZE -
-               rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))) {
+                rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))) {
 
                 if (write_state == PG_STATE_HEADER) {
+                        dataempty = true;
                         badworden = 0x0F;
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
                                 "efuse PG_STATE_HEADER\n");
@@ -985,7 +983,8 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
                                 efuse_write_data_case1(hw, &efuse_addr,
                                                        efuse_data, offset,
                                                        &continual,
-                                                       &write_state, &target_pkt,
+                                                       &write_state,
+                                                       &target_pkt,
                                                        &repeat_times, &result,
                                                        word_en);
                         else
@@ -999,15 +998,17 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
                 } else if (write_state == PG_STATE_DATA) {
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
                                 "efuse PG_STATE_DATA\n");
+                        badworden = 0x0f;
                         badworden =
-                            efuse_word_enable_data_write(hw, efuse_addr + 1,
-                                                         target_pkt.word_en,
-                                                         target_pkt.data);
+                            enable_efuse_data_write(hw, efuse_addr + 1,
+                                                    target_pkt.word_en,
+                                                    target_pkt.data);
 
                         if ((badworden & 0x0F) == 0x0F) {
                                 continual = false;
                         } else {
-                                efuse_addr += (2 * target_word_cnts) + 1;
+                                efuse_addr =
+                                    efuse_addr + (2 * target_word_cnts) + 1;
 
                                 target_pkt.offset = offset;
                                 target_pkt.word_en = badworden;
@@ -1027,7 +1028,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         }
 
         if (efuse_addr >= (EFUSE_MAX_SIZE -
-            rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {
+                rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
                          "efuse_addr(%#x) Out of size!!\n", efuse_addr);
         }
@@ -1035,8 +1036,8 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         return true;
 }
 
-static void efuse_word_enable_data_read(u8 word_en,
-                                        u8 *sourdata, u8 *targetdata)
+static void efuse_word_enable_data_read(u8 word_en, u8 *sourdata,
+                                        u8 *targetdata)
 {
         if (!(word_en & BIT(0))) {
                 targetdata[0] = sourdata[0];
@@ -1059,8 +1060,8 @@ static void efuse_word_enable_data_read(u8 word_en,
         }
 }
 
-static u8 efuse_word_enable_data_write(struct ieee80211_hw *hw,
-                                       u16 efuse_addr, u8 word_en, u8 *data)
+static u8 enable_efuse_data_write(struct ieee80211_hw *hw,
+                                  u16 efuse_addr, u8 word_en, u8 *data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u16 tmpaddr;
@@ -1069,8 +1070,8 @@ static u8 efuse_word_enable_data_write(struct ieee80211_hw *hw,
         u8 tmpdata[8];
 
         memset(tmpdata, 0xff, PGPKT_DATA_SIZE);
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "word_en = %x efuse_addr=%x\n",
-                 word_en, efuse_addr);
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
+                 "word_en = %x efuse_addr=%x\n", word_en, efuse_addr);
 
         if (!(word_en & BIT(0))) {
                 tmpaddr = start_addr;
@@ -1127,19 +1128,22 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
         u16 tmpV16;
 
         if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) {
-                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8188EE)
-                        rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_ACCESS],
-                                       0x69);
 
-                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];
-                        rtl_write_word(rtlpriv,
-                                       rtlpriv->cfg->maps[SYS_ISO_CTRL],
-                                       tmpV16);
+                if (rtlhal->hw_type != HARDWARE_TYPE_RTL8192CE &&
+                    rtlhal->hw_type != HARDWARE_TYPE_RTL8192DE) {
+                        rtl_write_byte(rtlpriv,
+                                       rtlpriv->cfg->maps[EFUSE_ACCESS], 0x69);
+                } else {
+                        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];
+                                rtl_write_word(rtlpriv,
+                                               rtlpriv->cfg->maps[SYS_ISO_CTRL],
+                                               tmpV16);
+                        }
                 }
-
                 tmpV16 = rtl_read_word(rtlpriv,
                                        rtlpriv->cfg->maps[SYS_FUNC_EN]);
                 if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {
@@ -1164,7 +1168,10 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
                                                 rtlpriv->cfg->maps[EFUSE_TEST] +
                                                 3);
 
-                        if (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE) {
+                        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                                tempval &= ~(BIT(3) | BIT(4) | BIT(5) | BIT(6));
+                                tempval |= (VOLTAGE_V25 << 3);
+                        } else if (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE) {
                                 tempval &= 0x0F;
                                 tempval |= (VOLTAGE_V25 << 4);
                         }
@@ -1176,11 +1183,11 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
 
                 if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192SE) {
                         rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_CLK],
-                                                0x03);
+                                       0x03);
                 }
-
         } else {
-                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8188EE)
+                if (rtlhal->hw_type != HARDWARE_TYPE_RTL8192CE &&
+                    rtlhal->hw_type != HARDWARE_TYPE_RTL8192DE)
                         rtl_write_byte(rtlpriv,
                                        rtlpriv->cfg->maps[EFUSE_ACCESS], 0);
 
@@ -1195,27 +1202,28 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
 
                 if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192SE) {
                         rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_CLK],
-                                                0x02);
+                                       0x02);
                 }
-
         }
-
 }
 
 static u16 efuse_get_current_size(struct ieee80211_hw *hw)
 {
+        int continual = true;
         u16 efuse_addr = 0;
-        u8 hworden;
+        u8 hoffset, hworden;
         u8 efuse_data, word_cnts;
 
-        while (efuse_one_byte_read(hw, efuse_addr, &efuse_data) &&
-               efuse_addr < EFUSE_MAX_SIZE) {
-                if (efuse_data == 0xFF)
-                        break;
-
-                hworden = efuse_data & 0x0F;
-                word_cnts = efuse_calculate_word_cnts(hworden);
-                efuse_addr = efuse_addr + (word_cnts * 2) + 1;
+        while (continual && efuse_one_byte_read(hw, efuse_addr, &efuse_data) &&
+               (efuse_addr < EFUSE_MAX_SIZE)) {
+                if (efuse_data != 0xFF) {
+                        hoffset = (efuse_data >> 4) & 0x0F;
+                        hworden = efuse_data & 0x0F;
+                        word_cnts = efuse_calculate_word_cnts(hworden);
+                        efuse_addr = efuse_addr + (word_cnts * 2) + 1;
+                } else {
+                        continual = false;
+                }
         }
 
         return efuse_addr;
diff --git a/drivers/net/wireless/rtlwifi/efuse.h b/drivers/net/wireless/rtlwifi/efuse.h
index 1663b3afd41e..fdab8240a5d7 100644
--- a/drivers/net/wireless/rtlwifi/efuse.h
+++ b/drivers/net/wireless/rtlwifi/efuse.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -32,7 +28,6 @@
 
 #define EFUSE_IC_ID_OFFSET              506
 
-#define EFUSE_MAP_LEN                   128
 #define EFUSE_MAX_WORD_UNIT             4
 
 #define EFUSE_INIT_MAP                  0
@@ -107,12 +102,14 @@ struct efuse_priv {
 void read_efuse_byte(struct ieee80211_hw *hw, u16 _offset, u8 *pbuf);
 void efuse_initialize(struct ieee80211_hw *hw);
 u8 efuse_read_1byte(struct ieee80211_hw *hw, u16 address);
+int efuse_one_byte_read(struct ieee80211_hw *hw, u16 addr, u8 *data);
 void efuse_write_1byte(struct ieee80211_hw *hw, u16 address, u8 value);
-void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf);
-void efuse_shadow_read(struct ieee80211_hw *hw, u8 type, u16 offset,
-                       u32 *value);
-void efuse_shadow_write(struct ieee80211_hw *hw, u8 type, u16 offset,
-                        u32 value);
+void read_efuse(struct ieee80211_hw *hw, u16 _offset,
+                u16 _size_byte, u8 *pbuf);
+void efuse_shadow_read(struct ieee80211_hw *hw, u8 type,
+                       u16 offset, u32 *value);
+void efuse_shadow_write(struct ieee80211_hw *hw, u8 type,
+                        u16 offset, u32 value);
 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);
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 74a8ba4b8844..667aba81246c 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -33,6 +33,7 @@
 #include "base.h"
 #include "ps.h"
 #include "efuse.h"
+#include <linux/interrupt.h>
 #include <linux/export.h>
 #include <linux/kmemleak.h>
 #include <linux/module.h>
@@ -44,10 +45,10 @@ MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("PCI basic driver for rtlwifi");
 
 static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = {
-        PCI_VENDOR_ID_INTEL,
-        PCI_VENDOR_ID_ATI,
-        PCI_VENDOR_ID_AMD,
-        PCI_VENDOR_ID_SI
+        INTEL_VENDOR_ID,
+        ATI_VENDOR_ID,
+        AMD_VENDOR_ID,
+        SIS_VENDOR_ID
 };
 
 static const u8 ac_to_hwq[] = {
@@ -566,27 +567,25 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
         struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[prio];
 
         while (skb_queue_len(&ring->queue)) {
-                struct rtl_tx_desc *entry = &ring->desc[ring->idx];
                 struct sk_buff *skb;
                 struct ieee80211_tx_info *info;
                 __le16 fc;
                 u8 tid;
+                u8 *entry;
 
-                u8 own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) entry, true,
-                                                          HW_DESC_OWN);
+                if (rtlpriv->use_new_trx_flow)
+                        entry = (u8 *)(&ring->buffer_desc[ring->idx]);
+                else
+                        entry = (u8 *)(&ring->desc[ring->idx]);
 
-                /*beacon packet will only use the first
-                 *descriptor by defaut, and the own may not
-                 *be cleared by the hardware
-                 */
-                if (own)
+                if (!rtlpriv->cfg->ops->is_tx_desc_closed(hw, prio, ring->idx))
                         return;
                 ring->idx = (ring->idx + 1) % ring->entries;
 
                 skb = __skb_dequeue(&ring->queue);
                 pci_unmap_single(rtlpci->pdev,
                                  rtlpriv->cfg->ops->
-                                             get_desc((u8 *) entry, true,
+                                             get_desc((u8 *)entry, true,
                                                       HW_DESC_TXBUFF_ADDR),
                                  skb->len, PCI_DMA_TODEVICE);
 
@@ -598,7 +597,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                          "new ring->idx:%d, free: skb_queue_len:%d, free: seq:%x\n",
                          ring->idx,
                          skb_queue_len(&ring->queue),
-                         *(u16 *) (skb->data + 22));
+                         *(u16 *)(skb->data + 22));
 
                 if (prio == TXCMD_QUEUE) {
                         dev_kfree_skb(skb);
@@ -666,175 +665,276 @@ tx_status_ok:
         }
 }
 
-static void _rtl_receive_one(struct ieee80211_hw *hw, struct sk_buff *skb,
-                             struct ieee80211_rx_status rx_status)
+static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw,
+                                    u8 *entry, int rxring_idx, int desc_idx)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
-        __le16 fc = rtl_get_fc(skb);
-        bool unicast = false;
-        struct sk_buff *uskb = NULL;
-        u8 *pdata;
-
-
-        memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
-
-        if (is_broadcast_ether_addr(hdr->addr1)) {
-                ;/*TODO*/
-        } else if (is_multicast_ether_addr(hdr->addr1)) {
-                ;/*TODO*/
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 bufferaddress;
+        u8 tmp_one = 1;
+        struct sk_buff *skb;
+
+        skb = dev_alloc_skb(rtlpci->rxbuffersize);
+        if (!skb)
+                return 0;
+        rtlpci->rx_ring[rxring_idx].rx_buf[desc_idx] = skb;
+
+        /* just set skb->cb to mapping addr for pci_unmap_single use */
+        *((dma_addr_t *)skb->cb) =
+                pci_map_single(rtlpci->pdev, skb_tail_pointer(skb),
+                               rtlpci->rxbuffersize, PCI_DMA_FROMDEVICE);
+        bufferaddress = *((dma_addr_t *)skb->cb);
+        if (pci_dma_mapping_error(rtlpci->pdev, bufferaddress))
+                return 0;
+        if (rtlpriv->use_new_trx_flow) {
+                rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
+                                            HW_DESC_RX_PREPARE,
+                                            (u8 *)&bufferaddress);
         } else {
-                unicast = true;
-                rtlpriv->stats.rxbytesunicast += skb->len;
+                rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
+                                            HW_DESC_RXBUFF_ADDR,
+                                            (u8 *)&bufferaddress);
+                rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
+                                            HW_DESC_RXPKT_LEN,
+                                            (u8 *)&rtlpci->rxbuffersize);
+                rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
+                                            HW_DESC_RXOWN,
+                                            (u8 *)&tmp_one);
         }
+        return 1;
+}
 
-        if (ieee80211_is_data(fc)) {
-                rtlpriv->cfg->ops->led_control(hw, LED_CTL_RX);
-
-                if (unicast)
-                        rtlpriv->link_info.num_rx_inperiod++;
+/* inorder to receive 8K AMSDU we have set skb to
+ * 9100bytes in init rx ring, but if this packet is
+ * not a AMSDU, this large packet will be sent to
+ * TCP/IP directly, this cause big packet ping fail
+ * like: "ping -s 65507", so here we will realloc skb
+ * based on the true size of packet, Mac80211
+ * Probably will do it better, but does not yet.
+ *
+ * Some platform will fail when alloc skb sometimes.
+ * in this condition, we will send the old skb to
+ * mac80211 directly, this will not cause any other
+ * issues, but only this packet will be lost by TCP/IP
+ */
+static void _rtl_pci_rx_to_mac80211(struct ieee80211_hw *hw,
+                                    struct sk_buff *skb,
+                                    struct ieee80211_rx_status rx_status)
+{
+        if (unlikely(!rtl_action_proc(hw, skb, false))) {
+                dev_kfree_skb_any(skb);
+        } else {
+                struct sk_buff *uskb = NULL;
+                u8 *pdata;
+
+                uskb = dev_alloc_skb(skb->len + 128);
+                if (likely(uskb)) {
+                        memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status,
+                               sizeof(rx_status));
+                        pdata = (u8 *)skb_put(uskb, skb->len);
+                        memcpy(pdata, skb->data, skb->len);
+                        dev_kfree_skb_any(skb);
+                        ieee80211_rx_irqsafe(hw, uskb);
+                } else {
+                        ieee80211_rx_irqsafe(hw, skb);
+                }
         }
+}
 
-        /* static bcn for roaming */
-        rtl_beacon_statistic(hw, skb);
-        rtl_p2p_info(hw, (void *)skb->data, skb->len);
-
-        /* for sw lps */
-        rtl_swlps_beacon(hw, (void *)skb->data, skb->len);
-        rtl_recognize_peer(hw, (void *)skb->data, skb->len);
-        if ((rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP) &&
-            (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) &&
-             (ieee80211_is_beacon(fc) || ieee80211_is_probe_resp(fc)))
-                return;
-
-        if (unlikely(!rtl_action_proc(hw, skb, false)))
-                return;
-
-        uskb = dev_alloc_skb(skb->len + 128);
-        if (!uskb)
-                return;         /* exit if allocation failed */
-        memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status, sizeof(rx_status));
-        pdata = (u8 *)skb_put(uskb, skb->len);
-        memcpy(pdata, skb->data, skb->len);
+/*hsisr interrupt handler*/
+static void _rtl_pci_hs_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        ieee80211_rx_irqsafe(hw, uskb);
+        rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[MAC_HSISR],
+                       rtl_read_byte(rtlpriv, rtlpriv->cfg->maps[MAC_HSISR]) |
+                       rtlpci->sys_irq_mask);
 }
 
 static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        int rx_queue_idx = RTL_PCI_RX_MPDU_QUEUE;
-
+        int rxring_idx = RTL_PCI_RX_MPDU_QUEUE;
         struct ieee80211_rx_status rx_status = { 0 };
         unsigned int count = rtlpci->rxringcount;
         u8 own;
         u8 tmp_one;
-        u32 bufferaddress;
-
+        bool unicast = false;
+        u8 hw_queue = 0;
+        unsigned int rx_remained_cnt;
         struct rtl_stats stats = {
                 .signal = 0,
                 .rate = 0,
         };
-        int index = rtlpci->rx_ring[rx_queue_idx].idx;
 
-        if (rtlpci->driver_is_goingto_unload)
-                return;
         /*RX NORMAL PKT */
         while (count--) {
-                /*rx descriptor */
-                struct rtl_rx_desc *pdesc = &rtlpci->rx_ring[rx_queue_idx].desc[
-                                index];
+                struct ieee80211_hdr *hdr;
+                __le16 fc;
+                u16 len;
+                /*rx buffer descriptor */
+                struct rtl_rx_buffer_desc *buffer_desc = NULL;
+                /*if use new trx flow, it means wifi info */
+                struct rtl_rx_desc *pdesc = NULL;
                 /*rx pkt */
-                struct sk_buff *skb = rtlpci->rx_ring[rx_queue_idx].rx_buf[
-                                index];
-                struct sk_buff *new_skb = NULL;
-
-                own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
-                                                       false, HW_DESC_OWN);
-
-                /*wait data to be filled by hardware */
-                if (own)
-                        break;
+                struct sk_buff *skb = rtlpci->rx_ring[rxring_idx].rx_buf[
+                                      rtlpci->rx_ring[rxring_idx].idx];
+
+                if (rtlpriv->use_new_trx_flow) {
+                        rx_remained_cnt =
+                                rtlpriv->cfg->ops->rx_desc_buff_remained_cnt(hw,
+                                                                      hw_queue);
+                        if (rx_remained_cnt < 1)
+                                return;
+
+                } else {        /* rx descriptor */
+                        pdesc = &rtlpci->rx_ring[rxring_idx].desc[
+                                rtlpci->rx_ring[rxring_idx].idx];
+
+                        own = (u8)rtlpriv->cfg->ops->get_desc((u8 *)pdesc,
+                                                              false,
+                                                              HW_DESC_OWN);
+                        if (own) /* wait data to be filled by hardware */
+                                return;
+                }
 
+                /* Reaching this point means: data is filled already
+                 * AAAAAAttention !!!
+                 * We can NOT access 'skb' before 'pci_unmap_single'
+                 */
+                pci_unmap_single(rtlpci->pdev, *((dma_addr_t *)skb->cb),
+                                 rtlpci->rxbuffersize, PCI_DMA_FROMDEVICE);
+
+                if (rtlpriv->use_new_trx_flow) {
+                        buffer_desc =
+                          &rtlpci->rx_ring[rxring_idx].buffer_desc
+                                [rtlpci->rx_ring[rxring_idx].idx];
+                        /*means rx wifi info*/
+                        pdesc = (struct rtl_rx_desc *)skb->data;
+                }
+                memset(&rx_status , 0 , sizeof(rx_status));
                 rtlpriv->cfg->ops->query_rx_desc(hw, &stats,
-                                                 &rx_status,
-                                                 (u8 *) pdesc, skb);
+                                                 &rx_status, (u8 *)pdesc, skb);
 
-                if (stats.crc || stats.hwerror)
-                        goto done;
+                if (rtlpriv->use_new_trx_flow)
+                        rtlpriv->cfg->ops->rx_check_dma_ok(hw,
+                                                           (u8 *)buffer_desc,
+                                                           hw_queue);
 
-                new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
-                if (unlikely(!new_skb)) {
-                        RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV), DBG_DMESG,
-                                 "can't alloc skb for rx\n");
-                        goto done;
-                }
-                kmemleak_not_leak(new_skb);
+                len = rtlpriv->cfg->ops->get_desc((u8 *)pdesc, false,
+                                                  HW_DESC_RXPKT_LEN);
 
-                pci_unmap_single(rtlpci->pdev,
-                                 *((dma_addr_t *) skb->cb),
-                                 rtlpci->rxbuffersize,
-                                 PCI_DMA_FROMDEVICE);
+                if (skb->end - skb->tail > len) {
+                        skb_put(skb, len);
+                        if (rtlpriv->use_new_trx_flow)
+                                skb_reserve(skb, stats.rx_drvinfo_size +
+                                            stats.rx_bufshift + 24);
+                        else
+                                skb_reserve(skb, stats.rx_drvinfo_size +
+                                            stats.rx_bufshift);
 
-                skb_put(skb, rtlpriv->cfg->ops->get_desc((u8 *) pdesc, false,
-                        HW_DESC_RXPKT_LEN));
-                skb_reserve(skb, stats.rx_drvinfo_size + stats.rx_bufshift);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                 "skb->end - skb->tail = %d, len is %d\n",
+                                 skb->end - skb->tail, len);
+                        break;
+                }
+                /* handle command packet here */
+                if (rtlpriv->cfg->ops->rx_command_packet(hw, stats, skb)) {
+                                dev_kfree_skb_any(skb);
+                                goto end;
+                }
 
                 /*
                  * NOTICE This can not be use for mac80211,
                  * this is done in mac80211 code,
-                 * if you done here sec DHCP will fail
+                 * if done here sec DHCP will fail
                  * skb_trim(skb, skb->len - 4);
                  */
 
-                _rtl_receive_one(hw, skb, rx_status);
+                hdr = rtl_get_hdr(skb);
+                fc = rtl_get_fc(skb);
+
+                if (!stats.crc && !stats.hwerror) {
+                        memcpy(IEEE80211_SKB_RXCB(skb), &rx_status,
+                               sizeof(rx_status));
+
+                        if (is_broadcast_ether_addr(hdr->addr1)) {
+                                ;/*TODO*/
+                        } else if (is_multicast_ether_addr(hdr->addr1)) {
+                                ;/*TODO*/
+                        } else {
+                                unicast = true;
+                                rtlpriv->stats.rxbytesunicast += skb->len;
+                        }
+                        rtl_is_special_data(hw, skb, false);
 
+                        if (ieee80211_is_data(fc)) {
+                                rtlpriv->cfg->ops->led_control(hw, LED_CTL_RX);
+                                if (unicast)
+                                        rtlpriv->link_info.num_rx_inperiod++;
+                        }
+                        /* static bcn for roaming */
+                        rtl_beacon_statistic(hw, skb);
+                        rtl_p2p_info(hw, (void *)skb->data, skb->len);
+                        /* for sw lps */
+                        rtl_swlps_beacon(hw, (void *)skb->data, skb->len);
+                        rtl_recognize_peer(hw, (void *)skb->data, skb->len);
+                        if ((rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP) &&
+                            (rtlpriv->rtlhal.current_bandtype ==
+                             BAND_ON_2_4G) &&
+                            (ieee80211_is_beacon(fc) ||
+                             ieee80211_is_probe_resp(fc))) {
+                                dev_kfree_skb_any(skb);
+                        } else {
+                                _rtl_pci_rx_to_mac80211(hw, skb, rx_status);
+                        }
+                } else {
+                        dev_kfree_skb_any(skb);
+                }
+                if (rtlpriv->use_new_trx_flow) {
+                        rtlpci->rx_ring[hw_queue].next_rx_rp += 1;
+                        rtlpci->rx_ring[hw_queue].next_rx_rp %=
+                                        RTL_PCI_MAX_RX_COUNT;
+
+                        rx_remained_cnt--;
+                        rtl_write_word(rtlpriv, 0x3B4,
+                                       rtlpci->rx_ring[hw_queue].next_rx_rp);
+                }
                 if (((rtlpriv->link_info.num_rx_inperiod +
                       rtlpriv->link_info.num_tx_inperiod) > 8) ||
                       (rtlpriv->link_info.num_rx_inperiod > 2)) {
                         rtlpriv->enter_ps = false;
                         schedule_work(&rtlpriv->works.lps_change_work);
                 }
+end:
+                if (rtlpriv->use_new_trx_flow) {
+                        _rtl_pci_init_one_rxdesc(hw, (u8 *)buffer_desc,
+                                                 rxring_idx,
+                                               rtlpci->rx_ring[rxring_idx].idx);
+                } else {
+                        _rtl_pci_init_one_rxdesc(hw, (u8 *)pdesc, rxring_idx,
+                                                 rtlpci->rx_ring[rxring_idx].idx);
 
-                dev_kfree_skb_any(skb);
-                skb = new_skb;
-
-                rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;
-                *((dma_addr_t *) skb->cb) =
-                            pci_map_single(rtlpci->pdev, skb_tail_pointer(skb),
-                                           rtlpci->rxbuffersize,
-                                           PCI_DMA_FROMDEVICE);
-
-done:
-                bufferaddress = (*((dma_addr_t *)skb->cb));
-                if (pci_dma_mapping_error(rtlpci->pdev, bufferaddress))
-                        return;
-                tmp_one = 1;
-                rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, false,
-                                            HW_DESC_RXBUFF_ADDR,
-                                            (u8 *)&bufferaddress);
-                rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, false,
-                                            HW_DESC_RXPKT_LEN,
-                                            (u8 *)&rtlpci->rxbuffersize);
-
-                if (index == rtlpci->rxringcount - 1)
-                        rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, false,
-                                                    HW_DESC_RXERO,
-                                                    &tmp_one);
-
-                rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, false, HW_DESC_RXOWN,
-                                            &tmp_one);
-
-                index = (index + 1) % rtlpci->rxringcount;
+                        if (rtlpci->rx_ring[rxring_idx].idx ==
+                            rtlpci->rxringcount - 1)
+                                rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc,
+                                                            false,
+                                                            HW_DESC_RXERO,
+                                                            (u8 *)&tmp_one);
+                }
+                rtlpci->rx_ring[rxring_idx].idx =
+                                (rtlpci->rx_ring[rxring_idx].idx + 1) %
+                                rtlpci->rxringcount;
         }
-
-        rtlpci->rx_ring[rx_queue_idx].idx = index;
 }
 
 static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
 {
         struct ieee80211_hw *hw = dev_id;
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         unsigned long flags;
@@ -842,16 +942,18 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         u32 intb = 0;
         irqreturn_t ret = IRQ_HANDLED;
 
-        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
+        if (rtlpci->irq_enabled == 0)
+                return ret;
+
+        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock , flags);
+        rtlpriv->cfg->ops->disable_interrupt(hw);
 
         /*read ISR: 4/8bytes */
         rtlpriv->cfg->ops->interrupt_recognized(hw, &inta, &intb);
 
         /*Shared IRQ or HW disappared */
-        if (!inta || inta == 0xffff) {
-                ret = IRQ_NONE;
+        if (!inta || inta == 0xffff)
                 goto done;
-        }
 
         /*<1> beacon related */
         if (inta & rtlpriv->cfg->maps[RTL_IMR_TBDOK]) {
@@ -874,8 +976,8 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 tasklet_schedule(&rtlpriv->works.irq_prepare_bcn_tasklet);
         }
 
-        /*<3> Tx related */
-        if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_TXFOVW]))
+        /*<2> Tx related */
+        if (unlikely(intb & rtlpriv->cfg->maps[RTL_IMR_TXFOVW]))
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "IMR_TXFOVW!\n");
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_MGNTDOK]) {
@@ -932,7 +1034,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 }
         }
 
-        /*<2> Rx related */
+        /*<3> Rx related */
         if (inta & rtlpriv->cfg->maps[RTL_IMR_ROK]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, "Rx ok interrupt!\n");
                 _rtl_pci_rx_interrupt(hw);
@@ -944,12 +1046,12 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 _rtl_pci_rx_interrupt(hw);
         }
 
-        if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_RXFOVW])) {
+        if (unlikely(intb & rtlpriv->cfg->maps[RTL_IMR_RXFOVW])) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "rx overflow !\n");
                 _rtl_pci_rx_interrupt(hw);
         }
 
-        /*fw related*/
+        /*<4> fw related*/
         if (rtlhal->hw_type == HARDWARE_TYPE_RTL8723AE) {
                 if (inta & rtlpriv->cfg->maps[RTL_IMR_C2HCMD]) {
                         RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
@@ -959,10 +1061,26 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 }
         }
 
+        /*<5> hsisr related*/
+        /* Only 8188EE & 8723BE Supported.
+         * If Other ICs Come in, System will corrupt,
+         * because maps[RTL_IMR_HSISR_IND] & maps[MAC_HSISR]
+         * are not initialized
+         */
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8188EE ||
+            rtlhal->hw_type == HARDWARE_TYPE_RTL8723BE) {
+                if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_HSISR_IND])) {
+                        RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
+                                 "hsisr interrupt!\n");
+                        _rtl_pci_hs_interrupt(hw);
+                }
+        }
+
         if (rtlpriv->rtlhal.earlymode_enable)
                 tasklet_schedule(&rtlpriv->works.irq_tasklet);
 
 done:
+        rtlpriv->cfg->ops->enable_interrupt(hw);
         spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
         return ret;
 }
@@ -990,13 +1108,8 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
         ring = &rtlpci->tx_ring[BEACON_QUEUE];
         pskb = __skb_dequeue(&ring->queue);
-        if (pskb) {
-                struct rtl_tx_desc *entry = &ring->desc[ring->idx];
-                pci_unmap_single(rtlpci->pdev, rtlpriv->cfg->ops->get_desc(
-                                 (u8 *) entry, true, HW_DESC_TXBUFF_ADDR),
-                                 pskb->len, PCI_DMA_TODEVICE);
+        if (pskb)
                 kfree_skb(pskb);
-        }
 
         /*NB: the beacon data buffer must be 32-bit aligned. */
         pskb = ieee80211_beacon_get(hw, mac->vif);
@@ -1005,7 +1118,10 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         hdr = rtl_get_hdr(pskb);
         info = IEEE80211_SKB_CB(pskb);
         pdesc = &ring->desc[0];
-        rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *) pdesc,
+        if (rtlpriv->use_new_trx_flow)
+                pbuffer_desc = &ring->buffer_desc[0];
+
+        rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *)pdesc,
                                         (u8 *)pbuffer_desc, info, NULL, pskb,
                                         BEACON_QUEUE, &tcb_desc);
 
@@ -1020,10 +1136,18 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
 static void _rtl_pci_init_trx_var(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         u8 i;
+        u16 desc_num;
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192EE)
+                desc_num = TX_DESC_NUM_92E;
+        else
+                desc_num = RT_TXDESC_NUM;
 
         for (i = 0; i < RTL_PCI_MAX_TX_QUEUE_COUNT; i++)
-                rtlpci->txringcount[i] = RT_TXDESC_NUM;
+                rtlpci->txringcount[i] = desc_num;
 
         /*
          *we just alloc 2 desc for beacon queue,
@@ -1031,12 +1155,12 @@ static void _rtl_pci_init_trx_var(struct ieee80211_hw *hw)
          */
         rtlpci->txringcount[BEACON_QUEUE] = 2;
 
-        /*
-         *BE queue need more descriptor for performance
+        /*BE queue need more descriptor for performance
          *consideration or, No more tx desc will happen,
          *and may cause mac80211 mem leakage.
          */
-        rtlpci->txringcount[BE_QUEUE] = RT_TXDESC_NUM_BE_QUEUE;
+        if (!rtl_priv(hw)->use_new_trx_flow)
+                rtlpci->txringcount[BE_QUEUE] = RT_TXDESC_NUM_BE_QUEUE;
 
         rtlpci->rxbuffersize = 9100;    /*2048/1024; */
         rtlpci->rxringcount = RTL_PCI_MAX_RX_COUNT;     /*64; */
@@ -1087,113 +1211,124 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_tx_desc *ring;
-        dma_addr_t dma;
+        struct rtl_tx_buffer_desc *buffer_desc;
+        struct rtl_tx_desc *desc;
+        dma_addr_t buffer_desc_dma, desc_dma;
         u32 nextdescaddress;
         int i;
 
-        ring = pci_zalloc_consistent(rtlpci->pdev, sizeof(*ring) * entries,
-                                     &dma);
-        if (!ring || (unsigned long)ring & 0xFF) {
+        /* alloc tx buffer desc for new trx flow*/
+        if (rtlpriv->use_new_trx_flow) {
+                buffer_desc =
+                   pci_zalloc_consistent(rtlpci->pdev,
+                                         sizeof(*buffer_desc) * entries,
+                                         &buffer_desc_dma);
+
+                if (!buffer_desc || (unsigned long)buffer_desc & 0xFF) {
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Cannot allocate TX ring (prio = %d)\n",
+                                 prio);
+                        return -ENOMEM;
+                }
+
+                rtlpci->tx_ring[prio].buffer_desc = buffer_desc;
+                rtlpci->tx_ring[prio].buffer_desc_dma = buffer_desc_dma;
+
+                rtlpci->tx_ring[prio].cur_tx_rp = 0;
+                rtlpci->tx_ring[prio].cur_tx_wp = 0;
+                rtlpci->tx_ring[prio].avl_desc = entries;
+        }
+
+        /* alloc dma for this ring */
+        desc = pci_zalloc_consistent(rtlpci->pdev,
+                                     sizeof(*desc) * entries, &desc_dma);
+
+        if (!desc || (unsigned long)desc & 0xFF) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Cannot allocate TX ring (prio = %d)\n", prio);
                 return -ENOMEM;
         }
 
-        rtlpci->tx_ring[prio].desc = ring;
-        rtlpci->tx_ring[prio].dma = dma;
+        rtlpci->tx_ring[prio].desc = desc;
+        rtlpci->tx_ring[prio].dma = desc_dma;
+
         rtlpci->tx_ring[prio].idx = 0;
         rtlpci->tx_ring[prio].entries = entries;
         skb_queue_head_init(&rtlpci->tx_ring[prio].queue);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "queue:%d, ring_addr:%p\n",
-                 prio, ring);
-
-        for (i = 0; i < entries; i++) {
-                nextdescaddress = (u32) dma +
-                                              ((i + 1) % entries) *
-                                              sizeof(*ring);
-
-                rtlpriv->cfg->ops->set_desc(hw, (u8 *)&(ring[i]),
-                                            true, HW_DESC_TX_NEXTDESC_ADDR,
-                                            (u8 *)&nextdescaddress);
+                 prio, desc);
+
+        /* init every desc in this ring */
+        if (!rtlpriv->use_new_trx_flow) {
+                for (i = 0; i < entries; i++) {
+                        nextdescaddress = (u32)desc_dma +
+                                          ((i + 1) % entries) *
+                                          sizeof(*desc);
+
+                        rtlpriv->cfg->ops->set_desc(hw, (u8 *)&desc[i],
+                                                    true,
+                                                    HW_DESC_TX_NEXTDESC_ADDR,
+                                                    (u8 *)&nextdescaddress);
+                }
         }
-
         return 0;
 }
 
-static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw)
+static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_rx_desc *entry = NULL;
-        int i, rx_queue_idx;
-        u8 tmp_one = 1;
+        int i;
 
-        /*
-         *rx_queue_idx 0:RX_MPDU_QUEUE
-         *rx_queue_idx 1:RX_CMD_QUEUE
-         */
-        for (rx_queue_idx = 0; rx_queue_idx < RTL_PCI_MAX_RX_QUEUE;
-             rx_queue_idx++) {
-                rtlpci->rx_ring[rx_queue_idx].desc =
-                        pci_zalloc_consistent(rtlpci->pdev,
-                                              sizeof(*rtlpci->rx_ring[rx_queue_idx].desc) * rtlpci->rxringcount,
-                                              &rtlpci->rx_ring[rx_queue_idx].dma);
-
-                if (!rtlpci->rx_ring[rx_queue_idx].desc ||
-                    (unsigned long)rtlpci->rx_ring[rx_queue_idx].desc & 0xFF) {
+        if (rtlpriv->use_new_trx_flow) {
+                struct rtl_rx_buffer_desc *entry = NULL;
+                /* alloc dma for this ring */
+                rtlpci->rx_ring[rxring_idx].buffer_desc =
+                    pci_zalloc_consistent(rtlpci->pdev,
+                                          sizeof(*rtlpci->rx_ring[rxring_idx].
+                                                 buffer_desc) *
+                                                 rtlpci->rxringcount,
+                                          &rtlpci->rx_ring[rxring_idx].dma);
+                if (!rtlpci->rx_ring[rxring_idx].buffer_desc ||
+                    (ulong)rtlpci->rx_ring[rxring_idx].buffer_desc & 0xFF) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                                  "Cannot allocate RX ring\n");
                         return -ENOMEM;
                 }
 
-                rtlpci->rx_ring[rx_queue_idx].idx = 0;
+                /* init every desc in this ring */
+                rtlpci->rx_ring[rxring_idx].idx = 0;
+                for (i = 0; i < rtlpci->rxringcount; i++) {
+                        entry = &rtlpci->rx_ring[rxring_idx].buffer_desc[i];
+                        if (!_rtl_pci_init_one_rxdesc(hw, (u8 *)entry,
+                                                      rxring_idx, i))
+                                return -ENOMEM;
+                }
+        } else {
+                struct rtl_rx_desc *entry = NULL;
+                u8 tmp_one = 1;
+                /* alloc dma for this ring */
+                rtlpci->rx_ring[rxring_idx].desc =
+                    pci_zalloc_consistent(rtlpci->pdev,
+                                          sizeof(*rtlpci->rx_ring[rxring_idx].
+                                          desc) * rtlpci->rxringcount,
+                                          &rtlpci->rx_ring[rxring_idx].dma);
+                if (!rtlpci->rx_ring[rxring_idx].desc ||
+                    (unsigned long)rtlpci->rx_ring[rxring_idx].desc & 0xFF) {
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Cannot allocate RX ring\n");
+                        return -ENOMEM;
+                }
 
-                /* If amsdu_8k is disabled, set buffersize to 4096. This
-                 * change will reduce memory fragmentation.
-                 */
-                if (rtlpci->rxbuffersize > 4096 &&
-                    rtlpriv->rtlhal.disable_amsdu_8k)
-                        rtlpci->rxbuffersize = 4096;
+                /* init every desc in this ring */
+                rtlpci->rx_ring[rxring_idx].idx = 0;
 
                 for (i = 0; i < rtlpci->rxringcount; i++) {
-                        struct sk_buff *skb =
-                            dev_alloc_skb(rtlpci->rxbuffersize);
-                        u32 bufferaddress;
-                        if (!skb)
-                                return 0;
-                        kmemleak_not_leak(skb);
-                        entry = &rtlpci->rx_ring[rx_queue_idx].desc[i];
-
-                        /*skb->dev = dev; */
-
-                        rtlpci->rx_ring[rx_queue_idx].rx_buf[i] = skb;
-
-                        /*
-                         *just set skb->cb to mapping addr
-                         *for pci_unmap_single use
-                         */
-                        *((dma_addr_t *) skb->cb) =
-                            pci_map_single(rtlpci->pdev, skb_tail_pointer(skb),
-                                           rtlpci->rxbuffersize,
-                                           PCI_DMA_FROMDEVICE);
-
-                        bufferaddress = (*((dma_addr_t *)skb->cb));
-                        if (pci_dma_mapping_error(rtlpci->pdev, bufferaddress)) {
-                                dev_kfree_skb_any(skb);
-                                return 1;
-                        }
-                        rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
-                                                    HW_DESC_RXBUFF_ADDR,
-                                                    (u8 *)&bufferaddress);
-                        rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
-                                                    HW_DESC_RXPKT_LEN,
-                                                    (u8 *)&rtlpci->
-                                                    rxbuffersize);
-                        rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
-                                                    HW_DESC_RXOWN,
-                                                    &tmp_one);
+                        entry = &rtlpci->rx_ring[rxring_idx].desc[i];
+                        if (!_rtl_pci_init_one_rxdesc(hw, (u8 *)entry,
+                                                      rxring_idx, i))
+                                return -ENOMEM;
                 }
 
                 rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
@@ -1209,56 +1344,70 @@ static void _rtl_pci_free_tx_ring(struct ieee80211_hw *hw,
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[prio];
 
+        /* free every desc in this ring */
         while (skb_queue_len(&ring->queue)) {
-                struct rtl_tx_desc *entry = &ring->desc[ring->idx];
+                u8 *entry;
                 struct sk_buff *skb = __skb_dequeue(&ring->queue);
 
+                if (rtlpriv->use_new_trx_flow)
+                        entry = (u8 *)(&ring->buffer_desc[ring->idx]);
+                else
+                        entry = (u8 *)(&ring->desc[ring->idx]);
+
                 pci_unmap_single(rtlpci->pdev,
                                  rtlpriv->cfg->
-                                             ops->get_desc((u8 *) entry, true,
+                                             ops->get_desc((u8 *)entry, true,
                                                    HW_DESC_TXBUFF_ADDR),
                                  skb->len, PCI_DMA_TODEVICE);
                 kfree_skb(skb);
                 ring->idx = (ring->idx + 1) % ring->entries;
         }
 
-        if (ring->desc) {
+        /* free dma of this ring */
+        pci_free_consistent(rtlpci->pdev,
+                            sizeof(*ring->desc) * ring->entries,
+                            ring->desc, ring->dma);
+        ring->desc = NULL;
+        if (rtlpriv->use_new_trx_flow) {
                 pci_free_consistent(rtlpci->pdev,
                                     sizeof(*ring->desc) * ring->entries,
-                                    ring->desc, ring->dma);
+                                    ring->buffer_desc, ring->buffer_desc_dma);
                 ring->desc = NULL;
         }
 }
 
-static void _rtl_pci_free_rx_ring(struct rtl_pci *rtlpci)
+static void _rtl_pci_free_rx_ring(struct ieee80211_hw *hw, int rxring_idx)
 {
-        int i, rx_queue_idx;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        int i;
 
-        /*rx_queue_idx 0:RX_MPDU_QUEUE */
-        /*rx_queue_idx 1:RX_CMD_QUEUE */
-        for (rx_queue_idx = 0; rx_queue_idx < RTL_PCI_MAX_RX_QUEUE;
-             rx_queue_idx++) {
-                for (i = 0; i < rtlpci->rxringcount; i++) {
-                        struct sk_buff *skb =
-                            rtlpci->rx_ring[rx_queue_idx].rx_buf[i];
-                        if (!skb)
-                                continue;
-
-                        pci_unmap_single(rtlpci->pdev,
-                                         *((dma_addr_t *) skb->cb),
-                                         rtlpci->rxbuffersize,
-                                         PCI_DMA_FROMDEVICE);
-                        kfree_skb(skb);
-                }
+        /* free every desc in this ring */
+        for (i = 0; i < rtlpci->rxringcount; i++) {
+                struct sk_buff *skb = rtlpci->rx_ring[rxring_idx].rx_buf[i];
 
-                if (rtlpci->rx_ring[rx_queue_idx].desc) {
-                        pci_free_consistent(rtlpci->pdev,
-                                    sizeof(*rtlpci->rx_ring[rx_queue_idx].
-                                           desc) * rtlpci->rxringcount,
-                                    rtlpci->rx_ring[rx_queue_idx].desc,
-                                    rtlpci->rx_ring[rx_queue_idx].dma);
-                        rtlpci->rx_ring[rx_queue_idx].desc = NULL;
-                }
+                if (!skb)
+                        continue;
+                pci_unmap_single(rtlpci->pdev, *((dma_addr_t *)skb->cb),
+                                 rtlpci->rxbuffersize, PCI_DMA_FROMDEVICE);
+                kfree_skb(skb);
+        }
+
+        /* free dma of this ring */
+        if (rtlpriv->use_new_trx_flow) {
+                pci_free_consistent(rtlpci->pdev,
+                                    sizeof(*rtlpci->rx_ring[rxring_idx].
+                                    buffer_desc) * rtlpci->rxringcount,
+                                    rtlpci->rx_ring[rxring_idx].buffer_desc,
+                                    rtlpci->rx_ring[rxring_idx].dma);
+                rtlpci->rx_ring[rxring_idx].buffer_desc = NULL;
+        } else {
+                pci_free_consistent(rtlpci->pdev,
+                                    sizeof(*rtlpci->rx_ring[rxring_idx].desc) *
+                                    rtlpci->rxringcount,
+                                    rtlpci->rx_ring[rxring_idx].desc,
+                                    rtlpci->rx_ring[rxring_idx].dma);
+                rtlpci->rx_ring[rxring_idx].desc = NULL;
         }
 }
 
@@ -1266,11 +1415,16 @@ static int _rtl_pci_init_trx_ring(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         int ret;
-        int i;
+        int i, rxring_idx;
 
-        ret = _rtl_pci_init_rx_ring(hw);
-        if (ret)
-                return ret;
+        /* rxring_idx 0:RX_MPDU_QUEUE
+         * rxring_idx 1:RX_CMD_QUEUE
+         */
+        for (rxring_idx = 0; rxring_idx < RTL_PCI_MAX_RX_QUEUE; rxring_idx++) {
+                ret = _rtl_pci_init_rx_ring(hw, rxring_idx);
+                if (ret)
+                        return ret;
+        }
 
         for (i = 0; i < RTL_PCI_MAX_TX_QUEUE_COUNT; i++) {
                 ret = _rtl_pci_init_tx_ring(hw, i,
@@ -1282,10 +1436,12 @@ static int _rtl_pci_init_trx_ring(struct ieee80211_hw *hw)
         return 0;
 
 err_free_rings:
-        _rtl_pci_free_rx_ring(rtlpci);
+        for (rxring_idx = 0; rxring_idx < RTL_PCI_MAX_RX_QUEUE; rxring_idx++)
+                _rtl_pci_free_rx_ring(hw, rxring_idx);
 
         for (i = 0; i < RTL_PCI_MAX_TX_QUEUE_COUNT; i++)
-                if (rtlpci->tx_ring[i].desc)
+                if (rtlpci->tx_ring[i].desc ||
+                    rtlpci->tx_ring[i].buffer_desc)
                         _rtl_pci_free_tx_ring(hw, i);
 
         return 1;
@@ -1293,11 +1449,11 @@ err_free_rings:
 
 static int _rtl_pci_deinit_trx_ring(struct ieee80211_hw *hw)
 {
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        u32 i;
+        u32 i, rxring_idx;
 
         /*free rx rings */
-        _rtl_pci_free_rx_ring(rtlpci);
+        for (rxring_idx = 0; rxring_idx < RTL_PCI_MAX_RX_QUEUE; rxring_idx++)
+                _rtl_pci_free_rx_ring(hw, rxring_idx);
 
         /*free tx rings */
         for (i = 0; i < RTL_PCI_MAX_TX_QUEUE_COUNT; i++)
@@ -1310,48 +1466,76 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        int i, rx_queue_idx;
+        int i, rxring_idx;
         unsigned long flags;
         u8 tmp_one = 1;
-
-        /*rx_queue_idx 0:RX_MPDU_QUEUE */
-        /*rx_queue_idx 1:RX_CMD_QUEUE */
-        for (rx_queue_idx = 0; rx_queue_idx < RTL_PCI_MAX_RX_QUEUE;
-             rx_queue_idx++) {
-                /*
-                 *force the rx_ring[RX_MPDU_QUEUE/
-                 *RX_CMD_QUEUE].idx to the first one
-                 */
-                if (rtlpci->rx_ring[rx_queue_idx].desc) {
+        u32 bufferaddress;
+        /* rxring_idx 0:RX_MPDU_QUEUE */
+        /* rxring_idx 1:RX_CMD_QUEUE */
+        for (rxring_idx = 0; rxring_idx < RTL_PCI_MAX_RX_QUEUE; rxring_idx++) {
+                /* force the rx_ring[RX_MPDU_QUEUE/
+                 * RX_CMD_QUEUE].idx to the first one
+                 *new trx flow, do nothing
+                */
+                if (!rtlpriv->use_new_trx_flow &&
+                    rtlpci->rx_ring[rxring_idx].desc) {
                         struct rtl_rx_desc *entry = NULL;
 
+                        rtlpci->rx_ring[rxring_idx].idx = 0;
                         for (i = 0; i < rtlpci->rxringcount; i++) {
-                                entry = &rtlpci->rx_ring[rx_queue_idx].desc[i];
-                                rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry,
-                                                            false,
-                                                            HW_DESC_RXOWN,
-                                                            &tmp_one);
+                                entry = &rtlpci->rx_ring[rxring_idx].desc[i];
+                                bufferaddress =
+                                  rtlpriv->cfg->ops->get_desc((u8 *)entry,
+                                  false , HW_DESC_RXBUFF_ADDR);
+                                memset((u8 *)entry , 0 ,
+                                       sizeof(*rtlpci->rx_ring
+                                       [rxring_idx].desc));/*clear one entry*/
+                                if (rtlpriv->use_new_trx_flow) {
+                                        rtlpriv->cfg->ops->set_desc(hw,
+                                            (u8 *)entry, false,
+                                            HW_DESC_RX_PREPARE,
+                                            (u8 *)&bufferaddress);
+                                } else {
+                                        rtlpriv->cfg->ops->set_desc(hw,
+                                            (u8 *)entry, false,
+                                            HW_DESC_RXBUFF_ADDR,
+                                            (u8 *)&bufferaddress);
+                                        rtlpriv->cfg->ops->set_desc(hw,
+                                            (u8 *)entry, false,
+                                            HW_DESC_RXPKT_LEN,
+                                            (u8 *)&rtlpci->rxbuffersize);
+                                        rtlpriv->cfg->ops->set_desc(hw,
+                                            (u8 *)entry, false,
+                                            HW_DESC_RXOWN,
+                                            (u8 *)&tmp_one);
+                                }
                         }
-                        rtlpci->rx_ring[rx_queue_idx].idx = 0;
+                        rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,
+                                            HW_DESC_RXERO, (u8 *)&tmp_one);
                 }
+                rtlpci->rx_ring[rxring_idx].idx = 0;
         }
 
         /*
          *after reset, release previous pending packet,
          *and force the  tx idx to the first one
          */
+        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
         for (i = 0; i < RTL_PCI_MAX_TX_QUEUE_COUNT; i++) {
-                if (rtlpci->tx_ring[i].desc) {
+                if (rtlpci->tx_ring[i].desc ||
+                    rtlpci->tx_ring[i].buffer_desc) {
                         struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[i];
 
                         while (skb_queue_len(&ring->queue)) {
-                                struct rtl_tx_desc *entry;
-                                struct sk_buff *skb;
+                                u8 *entry;
+                                struct sk_buff *skb =
+                                        __skb_dequeue(&ring->queue);
+                                if (rtlpriv->use_new_trx_flow)
+                                        entry = (u8 *)(&ring->buffer_desc
+                                                                [ring->idx]);
+                                else
+                                        entry = (u8 *)(&ring->desc[ring->idx]);
 
-                                spin_lock_irqsave(&rtlpriv->locks.irq_th_lock,
-                                                  flags);
-                                entry = &ring->desc[ring->idx];
-                                skb = __skb_dequeue(&ring->queue);
                                 pci_unmap_single(rtlpci->pdev,
                                                  rtlpriv->cfg->ops->
                                                          get_desc((u8 *)
@@ -1360,13 +1544,13 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
                                                          HW_DESC_TXBUFF_ADDR),
                                                  skb->len, PCI_DMA_TODEVICE);
                                 ring->idx = (ring->idx + 1) % ring->entries;
-                                spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock,
-                                                  flags);
                                 kfree_skb(skb);
+                                ring->idx = (ring->idx + 1) % ring->entries;
                         }
                         ring->idx = 0;
                 }
         }
+        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
 
         return 0;
 }
@@ -1421,7 +1605,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
         struct rtl8192_tx_ring *ring;
         struct rtl_tx_desc *pdesc;
         struct rtl_tx_buffer_desc *ptx_bd_desc = NULL;
-        u8 idx;
+        u16 idx;
         u8 hw_queue = _rtl_mac_to_hwqueue(hw, skb);
         unsigned long flags;
         struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
@@ -1454,11 +1638,15 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
 
         spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
         ring = &rtlpci->tx_ring[hw_queue];
-        if (hw_queue != BEACON_QUEUE)
-                idx = (ring->idx + skb_queue_len(&ring->queue)) %
-                                ring->entries;
-        else
+        if (hw_queue != BEACON_QUEUE) {
+                if (rtlpriv->use_new_trx_flow)
+                        idx = ring->cur_tx_wp;
+                else
+                        idx = (ring->idx + skb_queue_len(&ring->queue)) %
+                              ring->entries;
+        } else {
                 idx = 0;
+        }
 
         pdesc = &ring->desc[idx];
         if (rtlpriv->use_new_trx_flow) {
@@ -1525,7 +1713,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
         return 0;
 }
 
-static void rtl_pci_flush(struct ieee80211_hw *hw, bool drop)
+static void rtl_pci_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
@@ -1540,6 +1728,11 @@ static void rtl_pci_flush(struct ieee80211_hw *hw, bool drop)
 
         for (queue_id = RTL_PCI_MAX_TX_QUEUE_COUNT - 1; queue_id >= 0;) {
                 u32 queue_len;
+
+                if (((queues >> queue_id) & 0x1) == 0) {
+                        queue_id--;
+                        continue;
+                }
                 ring = &pcipriv->dev.tx_ring[queue_id];
                 queue_len = skb_queue_len(&ring->queue);
                 if (queue_len == 0 || queue_id == BEACON_QUEUE ||
@@ -1603,6 +1796,10 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
         rtl_pci_reset_trx_ring(hw);
 
         rtlpci->driver_is_goingto_unload = false;
+        if (rtlpriv->cfg->ops->get_btc_status()) {
+                rtlpriv->btcoexist.btc_ops->btc_init_variables(rtlpriv);
+                rtlpriv->btcoexist.btc_ops->btc_init_hal_vars(rtlpriv);
+        }
         err = rtlpriv->cfg->ops->hw_init(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
@@ -1622,7 +1819,7 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
 
         rtlpci->up_first_time = false;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "rtl_pci_start OK\n");
         return 0;
 }
 
@@ -1635,6 +1832,9 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
         unsigned long flags;
         u8 RFInProgressTimeOut = 0;
 
+        if (rtlpriv->cfg->ops->get_btc_status())
+                rtlpriv->btcoexist.btc_ops->btc_halt_notify();
+
         /*
          *should be before disable interrupt&adapter
          *and will do it immediately.
@@ -1753,6 +1953,22 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                 rtlhal->hw_type = HARDWARE_TYPE_RTL8188EE;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "Find adapter, Hardware type is 8188EE\n");
+        } else if (deviceid == RTL_PCI_8723BE_DID) {
+                        rtlhal->hw_type = HARDWARE_TYPE_RTL8723BE;
+                        RT_TRACE(rtlpriv, COMP_INIT , DBG_LOUD,
+                                 "Find adapter, Hardware type is 8723BE\n");
+        } else if (deviceid == RTL_PCI_8192EE_DID) {
+                        rtlhal->hw_type = HARDWARE_TYPE_RTL8192EE;
+                        RT_TRACE(rtlpriv, COMP_INIT , DBG_LOUD,
+                                 "Find adapter, Hardware type is 8192EE\n");
+        } else if (deviceid == RTL_PCI_8821AE_DID) {
+                        rtlhal->hw_type = HARDWARE_TYPE_RTL8821AE;
+                        RT_TRACE(rtlpriv, COMP_INIT , DBG_LOUD,
+                                 "Find adapter, Hardware type is 8821AE\n");
+        } else if (deviceid == RTL_PCI_8812AE_DID) {
+                        rtlhal->hw_type = HARDWARE_TYPE_RTL8812AE;
+                        RT_TRACE(rtlpriv, COMP_INIT , DBG_LOUD,
+                                 "Find adapter, Hardware type is 8812AE\n");
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Err: Unknown device - vid/did=%x/%x\n",
@@ -1779,11 +1995,20 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                         rtlhal->interfaceindex = 0;
                 }
         }
+
+        /* 92ee use new trx flow */
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192EE)
+                rtlpriv->use_new_trx_flow = true;
+        else
+                rtlpriv->use_new_trx_flow = false;
+
         /*find bus info */
         pcipriv->ndis_adapter.busnumber = pdev->bus->number;
         pcipriv->ndis_adapter.devnumber = PCI_SLOT(pdev->devfn);
         pcipriv->ndis_adapter.funcnumber = PCI_FUNC(pdev->devfn);
 
+        /*find bridge info */
+        pcipriv->ndis_adapter.pcibridge_vendor = PCI_BRIDGE_VENDOR_UNKNOWN;
         /* some ARM have no bridge_pdev and will crash here
          * so we should check if bridge_pdev is NULL
          */
@@ -1951,6 +2176,11 @@ int rtl_pci_probe(struct pci_dev *pdev,
         pcipriv = (void *)rtlpriv->priv;
         pcipriv->dev.pdev = pdev;
         init_completion(&rtlpriv->firmware_loading_complete);
+        /*proximity init here*/
+        rtlpriv->proximity.proxim_on = false;
+
+        pcipriv = (void *)rtlpriv->priv;
+        pcipriv->dev.pdev = pdev;
 
         /* init cfg & intf_ops */
         rtlpriv->rtlhal.interface = INTF_PCI;
@@ -2013,9 +2243,6 @@ int rtl_pci_probe(struct pci_dev *pdev,
         /*like read eeprom and so on */
         rtlpriv->cfg->ops->read_eeprom_info(hw);
 
-        /*aspm */
-        rtl_pci_init_aspm(hw);
-
         /* Init mac80211 sw */
         err = rtl_init_core(hw);
         if (err) {
@@ -2036,9 +2263,20 @@ int rtl_pci_probe(struct pci_dev *pdev,
                 err = -ENODEV;
                 goto fail3;
         }
-
         rtlpriv->cfg->ops->init_sw_leds(hw);
 
+        /*aspm */
+        rtl_pci_init_aspm(hw);
+
+        err = ieee80211_register_hw(hw);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't register mac80211 hw.\n");
+                err = -ENODEV;
+                goto fail3;
+        }
+        rtlpriv->mac80211.mac80211_registered = 1;
+
         err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -2046,6 +2284,9 @@ int rtl_pci_probe(struct pci_dev *pdev,
                 goto fail3;
         }
 
+        /*init rfkill */
+        rtl_init_rfkill(hw);    /* Init PCI sw */
+
         rtlpci = rtl_pcidev(pcipriv);
         err = rtl_pci_intr_mode_decide(hw);
         if (err) {
@@ -2056,9 +2297,11 @@ int rtl_pci_probe(struct pci_dev *pdev,
         }
         rtlpci->irq_alloc = 1;
 
+        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
         return 0;
 
 fail3:
+        pci_set_drvdata(pdev, NULL);
         rtl_deinit_core(hw);
 
         if (rtlpriv->io.pci_mem_start != 0)
@@ -2128,6 +2371,8 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
 
         rtl_pci_disable_aspm(hw);
 
+        pci_set_drvdata(pdev, NULL);
+
         ieee80211_free_hw(hw);
 }
 EXPORT_SYMBOL(rtl_pci_disconnect);
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index 90174a814a6d..5e832306dba9 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -39,10 +39,11 @@
 #define RTL_PCI_RX_CMD_QUEUE                    1
 #define RTL_PCI_MAX_RX_QUEUE                    2
 
-#define RTL_PCI_MAX_RX_COUNT                    64
+#define RTL_PCI_MAX_RX_COUNT                    512/*64*/
 #define RTL_PCI_MAX_TX_QUEUE_COUNT              9
 
 #define RT_TXDESC_NUM                           128
+#define TX_DESC_NUM_92E                         512
 #define RT_TXDESC_NUM_BE_QUEUE                  256
 
 #define BK_QUEUE                                0
@@ -62,6 +63,12 @@
         .subdevice = PCI_ANY_ID,\
         .driver_data = (kernel_ulong_t)&(cfg)
 
+#define INTEL_VENDOR_ID                         0x8086
+#define SIS_VENDOR_ID                           0x1039
+#define ATI_VENDOR_ID                           0x1002
+#define ATI_DEVICE_ID                           0x7914
+#define AMD_VENDOR_ID                           0x1022
+
 #define PCI_MAX_BRIDGE_NUMBER                   255
 #define PCI_MAX_DEVICES                         32
 #define PCI_MAX_FUNCTION                        8
@@ -69,6 +76,11 @@
 #define PCI_CONF_ADDRESS        0x0CF8  /*PCI Configuration Space Address */
 #define PCI_CONF_DATA           0x0CFC  /*PCI Configuration Space Data */
 
+#define PCI_CLASS_BRIDGE_DEV            0x06
+#define PCI_SUBCLASS_BR_PCI_TO_PCI      0x04
+#define PCI_CAPABILITY_ID_PCI_EXPRESS   0x10
+#define PCI_CAP_ID_EXP                  0x10
+
 #define U1DONTCARE                      0xFF
 #define U2DONTCARE                      0xFFFF
 #define U4DONTCARE                      0xFFFFFFFF
@@ -87,6 +99,7 @@
 #define RTL_PCI_700F_DID        0x700F
 #define RTL_PCI_701F_DID        0x701F
 #define RTL_PCI_DLINK_DID       0x3304
+#define RTL_PCI_8723AE_DID      0x8723  /*8723e */
 #define RTL_PCI_8192CET_DID     0x8191  /*8192ce */
 #define RTL_PCI_8192CE_DID      0x8178  /*8192ce */
 #define RTL_PCI_8191CE_DID      0x8177  /*8192ce */
@@ -95,6 +108,10 @@
 #define RTL_PCI_8192DE_DID      0x8193  /*8192de */
 #define RTL_PCI_8192DE_DID2     0x002B  /*92DE*/
 #define RTL_PCI_8188EE_DID      0x8179  /*8188ee*/
+#define RTL_PCI_8723BE_DID      0xB723  /*8723be*/
+#define RTL_PCI_8192EE_DID      0x818B  /*8192ee*/
+#define RTL_PCI_8821AE_DID      0x8821  /*8821ae*/
+#define RTL_PCI_8812AE_DID      0x8812  /*8812ae*/
 
 /*8192 support 16 pages of IO registers*/
 #define RTL_MEM_MAPPED_IO_RANGE_8190PCI         0x1000
@@ -125,24 +142,34 @@ struct rtl_pci_capabilities_header {
         u8 next;
 };
 
-struct rtl_rx_desc {
-        u32 dword[8];
+/* In new TRX flow, Buffer_desc is new concept
+ * But TX wifi info == TX descriptor in old flow
+ * RX wifi info == RX descriptor in old flow
+ */
+struct rtl_tx_buffer_desc {
+#if (RTL8192EE_SEG_NUM == 2)
+        u32 dword[2*(DMA_IS_64BIT + 1)*8]; /*seg = 8*/
+#elif (RTL8192EE_SEG_NUM == 1)
+        u32 dword[2*(DMA_IS_64BIT + 1)*4]; /*seg = 4*/
+#elif (RTL8192EE_SEG_NUM == 0)
+        u32 dword[2*(DMA_IS_64BIT + 1)*2]; /*seg = 2*/
+#endif
 } __packed;
 
 struct rtl_tx_desc {
         u32 dword[16];
 } __packed;
 
-struct rtl_tx_cmd_desc {
-        u32 dword[16];
+struct rtl_rx_buffer_desc { /*rx buffer desc*/
+        u32 dword[2];
 } __packed;
 
-/* In new TRX flow, Buffer_desc is new concept
- * But TX wifi info == TX descriptor in old flow
- * RX wifi info == RX descriptor in old flow
- */
-struct rtl_tx_buffer_desc {
-        u32 dword[8]; /*seg = 4*/
+struct rtl_rx_desc { /*old: rx desc new: rx wifi info*/
+        u32 dword[8];
+} __packed;
+
+struct rtl_tx_cmd_desc {
+        u32 dword[16];
 } __packed;
 
 struct rtl8192_tx_ring {
@@ -153,6 +180,10 @@ struct rtl8192_tx_ring {
         struct sk_buff_head queue;
         /*add for new trx flow*/
         struct rtl_tx_buffer_desc *buffer_desc; /*tx buffer descriptor*/
+        dma_addr_t buffer_desc_dma; /*tx bufferd desc dma memory*/
+        u16 avl_desc; /* available_desc_to_write */
+        u16 cur_tx_wp; /* current_tx_write_point */
+        u16 cur_tx_rp; /* current_tx_read_point */
 };
 
 struct rtl8192_rx_ring {
@@ -160,6 +191,9 @@ struct rtl8192_rx_ring {
         dma_addr_t dma;
         unsigned int idx;
         struct sk_buff *rx_buf[RTL_PCI_MAX_RX_COUNT];
+        /*add for new trx flow*/
+        struct rtl_rx_buffer_desc *buffer_desc; /*rx buffer descriptor*/
+        u16 next_rx_rp; /* next_rx_read_point */
 };
 
 struct rtl_pci {
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 50504942ded1..b69321d45f04 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -27,110 +23,11 @@
  *
  *****************************************************************************/
 
-#include <linux/export.h>
 #include "wifi.h"
 #include "base.h"
 #include "ps.h"
-
-/*      Description:
- *              This routine deals with the Power Configuration CMD
- *               parsing for RTL8723/RTL8188E Series IC.
- *      Assumption:
- *              We should follow specific format that was released from HW SD.
- */
-bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
-                              u8 faversion, u8 interface_type,
-                              struct wlan_pwr_cfg pwrcfgcmd[])
-{
-        struct wlan_pwr_cfg cfg_cmd = {0};
-        bool polling_bit = false;
-        u32 ary_idx = 0;
-        u8 value = 0;
-        u32 offset = 0;
-        u32 polling_count = 0;
-        u32 max_polling_cnt = 5000;
-
-        do {
-                cfg_cmd = pwrcfgcmd[ary_idx];
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "rtl_hal_pwrseqcmdparsing(): offset(%#x),cut_msk(%#x), famsk(%#x),"
-                        "interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), value(%#x)\n",
-                        GET_PWR_CFG_OFFSET(cfg_cmd),
-                                           GET_PWR_CFG_CUT_MASK(cfg_cmd),
-                        GET_PWR_CFG_FAB_MASK(cfg_cmd),
-                                             GET_PWR_CFG_INTF_MASK(cfg_cmd),
-                        GET_PWR_CFG_BASE(cfg_cmd), GET_PWR_CFG_CMD(cfg_cmd),
-                        GET_PWR_CFG_MASK(cfg_cmd), GET_PWR_CFG_VALUE(cfg_cmd));
-
-                if ((GET_PWR_CFG_FAB_MASK(cfg_cmd)&faversion) &&
-                    (GET_PWR_CFG_CUT_MASK(cfg_cmd)&cut_version) &&
-                    (GET_PWR_CFG_INTF_MASK(cfg_cmd)&interface_type)) {
-                        switch (GET_PWR_CFG_CMD(cfg_cmd)) {
-                        case PWR_CMD_READ:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_READ\n");
-                                break;
-                        case PWR_CMD_WRITE:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_WRITE\n");
-                                offset = GET_PWR_CFG_OFFSET(cfg_cmd);
-
-                                /*Read the value from system register*/
-                                value = rtl_read_byte(rtlpriv, offset);
-                                value &= (~(GET_PWR_CFG_MASK(cfg_cmd)));
-                                value |= (GET_PWR_CFG_VALUE(cfg_cmd) &
-                                          GET_PWR_CFG_MASK(cfg_cmd));
-
-                                /*Write the value back to sytem register*/
-                                rtl_write_byte(rtlpriv, offset, value);
-                                break;
-                        case PWR_CMD_POLLING:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_POLLING\n");
-                                polling_bit = false;
-                                offset = GET_PWR_CFG_OFFSET(cfg_cmd);
-
-                                do {
-                                        value = rtl_read_byte(rtlpriv, offset);
-
-                                        value &= GET_PWR_CFG_MASK(cfg_cmd);
-                                        if (value ==
-                                            (GET_PWR_CFG_VALUE(cfg_cmd)
-                                            & GET_PWR_CFG_MASK(cfg_cmd)))
-                                                polling_bit = true;
-                                        else
-                                                udelay(10);
-
-                                        if (polling_count++ > max_polling_cnt)
-                                                return false;
-                                } while (!polling_bit);
-                                break;
-                        case PWR_CMD_DELAY:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_DELAY\n");
-                                if (GET_PWR_CFG_VALUE(cfg_cmd) ==
-                                    PWRSEQ_DELAY_US)
-                                        udelay(GET_PWR_CFG_OFFSET(cfg_cmd));
-                                else
-                                        mdelay(GET_PWR_CFG_OFFSET(cfg_cmd));
-                                break;
-                        case PWR_CMD_END:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtl_hal_pwrseqcmdparsing(): PWR_CMD_END\n");
-                                return true;
-                        default:
-                                RT_ASSERT(false,
-                                         "rtl_hal_pwrseqcmdparsing(): Unknown CMD!!\n");
-                                break;
-                        }
-
-                }
-                ary_idx++;
-        } while (1);
-
-        return true;
-}
-EXPORT_SYMBOL(rtl_hal_pwrseqcmdparsing);
+#include <linux/export.h>
+#include "btcoexist/rtl_btc.h"
 
 bool rtl_ps_enable_nic(struct ieee80211_hw *hw)
 {
@@ -181,11 +78,49 @@ EXPORT_SYMBOL(rtl_ps_disable_nic);
 
 bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,
                          enum rf_pwrstate state_toset,
-                         u32 changesource)
+                         u32 changesource, bool protect_or_not)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        enum rf_pwrstate rtstate;
         bool actionallowed = false;
+        u16 rfwait_cnt = 0;
+
+        if (protect_or_not)
+                goto no_protect;
+
+        /*Only one thread can change
+         *the RF state at one time, and others
+         *should wait to be executed.
+         */
+        while (true) {
+                spin_lock(&rtlpriv->locks.rf_ps_lock);
+                if (ppsc->rfchange_inprogress) {
+                        spin_unlock(&rtlpriv->locks.rf_ps_lock);
+
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                 "RF Change in progress! Wait to set..state_toset(%d).\n",
+                                  state_toset);
+
+                        /* Set RF after the previous action is done.  */
+                        while (ppsc->rfchange_inprogress) {
+                                rfwait_cnt++;
+                                mdelay(1);
+                                /*Wait too long, return false to avoid
+                                 *to be stuck here.
+                                 */
+                                if (rfwait_cnt > 100)
+                                        return false;
+                        }
+                } else {
+                        ppsc->rfchange_inprogress = true;
+                        spin_unlock(&rtlpriv->locks.rf_ps_lock);
+                        break;
+                }
+        }
+
+no_protect:
+        rtstate = ppsc->rfpwr_state;
 
         switch (state_toset) {
         case ERFON:
@@ -227,6 +162,12 @@ bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,
         if (actionallowed)
                 rtlpriv->cfg->ops->set_rf_power_state(hw, state_toset);
 
+        if (!protect_or_not) {
+                spin_lock(&rtlpriv->locks.rf_ps_lock);
+                ppsc->rfchange_inprogress = false;
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+        }
+
         return actionallowed;
 }
 EXPORT_SYMBOL(rtl_ps_set_rf_state);
@@ -249,12 +190,13 @@ static void _rtl_ps_inactive_ps(struct ieee80211_hw *hw)
                 }
         }
 
-        rtl_ps_set_rf_state(hw, ppsc->inactive_pwrstate, RF_CHANGE_BY_IPS);
+        rtl_ps_set_rf_state(hw, ppsc->inactive_pwrstate,
+                            RF_CHANGE_BY_IPS, false);
 
         if (ppsc->inactive_pwrstate == ERFOFF &&
             rtlhal->interface == INTF_PCI) {
                 if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM &&
-                        !RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
+                    !RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
                         rtlpriv->intf_ops->enable_aspm(hw);
                         RT_SET_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM);
                 }
@@ -318,6 +260,11 @@ void rtl_ips_nic_off_wq_callback(void *data)
                         ppsc->inactive_pwrstate = ERFOFF;
                         ppsc->in_powersavemode = true;
 
+                        /* call before RF off */
+                        if (rtlpriv->cfg->ops->get_btc_status())
+                                rtlpriv->btcoexist.btc_ops->btc_ips_notify(rtlpriv,
+                                                                        ppsc->inactive_pwrstate);
+
                         /*rtl_pci_reset_trx_ring(hw); */
                         _rtl_ps_inactive_ps(hw);
                 }
@@ -328,10 +275,9 @@ void rtl_ips_nic_off(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        /*
-         *because when link with ap, mac80211 will ask us
-         *to disable nic quickly after scan before linking,
-         *this will cause link failed, so we delay 100ms here
+        /* because when link with ap, mac80211 will ask us
+         * to disable nic quickly after scan before linking,
+         * this will cause link failed, so we delay 100ms here
          */
         queue_delayed_work(rtlpriv->works.rtl_wq,
                            &rtlpriv->works.ips_nic_off_wq, MSECS(100));
@@ -343,16 +289,12 @@ void rtl_ips_nic_off(struct ieee80211_hw *hw)
 void rtl_ips_nic_on(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         enum rf_pwrstate rtstate;
-        unsigned long flags;
-
-        if (mac->opmode != NL80211_IFTYPE_STATION)
-                return;
 
-        spin_lock_irqsave(&rtlpriv->locks.ips_lock, flags);
+        cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
 
+        spin_lock(&rtlpriv->locks.ips_lock);
         if (ppsc->inactiveps) {
                 rtstate = ppsc->rfpwr_state;
 
@@ -362,12 +304,14 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
 
                         ppsc->inactive_pwrstate = ERFON;
                         ppsc->in_powersavemode = false;
-
                         _rtl_ps_inactive_ps(hw);
+                        /* call after RF on */
+                        if (rtlpriv->cfg->ops->get_btc_status())
+                                rtlpriv->btcoexist.btc_ops->btc_ips_notify(rtlpriv,
+                                                                        ppsc->inactive_pwrstate);
                 }
         }
-
-        spin_unlock_irqrestore(&rtlpriv->locks.ips_lock, flags);
+        spin_unlock(&rtlpriv->locks.ips_lock);
 }
 EXPORT_SYMBOL_GPL(rtl_ips_nic_on);
 
@@ -404,7 +348,7 @@ static bool rtl_get_fwlps_doze(struct ieee80211_hw *hw)
 }
 
 /* Change current and default preamble mode.*/
-static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
+void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -437,21 +381,24 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                 if (ppsc->dot11_psmode == EACTIVE) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                  "FW LPS leave ps_mode:%x\n",
-                                 FW_PS_ACTIVE_MODE);
+                                  FW_PS_ACTIVE_MODE);
                         enter_fwlps = false;
                         ppsc->pwr_mode = FW_PS_ACTIVE_MODE;
                         ppsc->smart_ps = 0;
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                HW_VAR_FW_LPS_ACTION,
-                                                (u8 *)(&enter_fwlps));
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_LPS_ACTION,
+                                                      (u8 *)(&enter_fwlps));
                         if (ppsc->p2p_ps_info.opp_ps)
-                                rtl_p2p_ps_cmd(hw, P2P_PS_ENABLE);
+                                rtl_p2p_ps_cmd(hw , P2P_PS_ENABLE);
 
+                        if (rtlpriv->cfg->ops->get_btc_status())
+                                rtlpriv->btcoexist.btc_ops->btc_lps_notify(rtlpriv, rt_psmode);
                 } else {
                         if (rtl_get_fwlps_doze(hw)) {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                          "FW LPS enter ps_mode:%x\n",
                                          ppsc->fwctrl_psmode);
+                                if (rtlpriv->cfg->ops->get_btc_status())
+                                        rtlpriv->btcoexist.btc_ops->btc_lps_notify(rtlpriv, rt_psmode);
                                 enter_fwlps = true;
                                 ppsc->pwr_mode = ppsc->fwctrl_psmode;
                                 ppsc->smart_ps = 2;
@@ -473,6 +420,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        unsigned long flag;
 
         if (!ppsc->fwctrl_lps)
                 return;
@@ -493,7 +441,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
         if (mac->link_state != MAC80211_LINKED)
                 return;
 
-        mutex_lock(&rtlpriv->locks.ps_mutex);
+        spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag);
 
         /* Idle for a while if we connect to AP a while ago. */
         if (mac->cnt_after_linked >= 2) {
@@ -505,8 +453,9 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
                 }
         }
 
-        mutex_unlock(&rtlpriv->locks.ps_mutex);
+        spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag);
 }
+EXPORT_SYMBOL(rtl_lps_enter);
 
 /*Leave the leisure power save mode.*/
 void rtl_lps_leave(struct ieee80211_hw *hw)
@@ -514,14 +463,15 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        unsigned long flag;
 
-        mutex_lock(&rtlpriv->locks.ps_mutex);
+        spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag);
 
         if (ppsc->fwctrl_lps) {
                 if (ppsc->dot11_psmode != EACTIVE) {
 
                         /*FIX ME */
-                        rtlpriv->cfg->ops->enable_interrupt(hw);
+                        /*rtlpriv->cfg->ops->enable_interrupt(hw); */
 
                         if (ppsc->reg_rfps_level & RT_RF_LPS_LEVEL_ASPM &&
                             RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM) &&
@@ -536,8 +486,9 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
                         rtl_lps_set_psmode(hw, EACTIVE);
                 }
         }
-        mutex_unlock(&rtlpriv->locks.ps_mutex);
+        spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag);
 }
+EXPORT_SYMBOL(rtl_lps_leave);
 
 /* For sw LPS*/
 void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
@@ -613,7 +564,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
                 /* back to low-power land. and delay is
                  * prevent null power save frame tx fail */
                 queue_delayed_work(rtlpriv->works.rtl_wq,
-                                &rtlpriv->works.ps_work, MSECS(5));
+                                   &rtlpriv->works.ps_work, MSECS(5));
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
                          "u_bufferd: %x, m_buffered: %x\n", u_buffed, m_buffed);
@@ -626,6 +577,7 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        unsigned long flag;
 
         if (!rtlpriv->psc.swctrl_lps)
                 return;
@@ -633,14 +585,14 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw)
                 return;
 
         if (ppsc->reg_rfps_level & RT_RF_LPS_LEVEL_ASPM &&
-                RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
+            RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
                 rtlpriv->intf_ops->disable_aspm(hw);
                 RT_CLEAR_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM);
         }
 
-        mutex_lock(&rtlpriv->locks.ps_mutex);
-        rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS);
-        mutex_unlock(&rtlpriv->locks.ps_mutex);
+        spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag);
+        rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS, false);
+        spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag);
 }
 
 void rtl_swlps_rfon_wq_callback(void *data)
@@ -657,6 +609,7 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        unsigned long flag;
         u8 sleep_intv;
 
         if (!rtlpriv->psc.sw_ps_enabled)
@@ -673,12 +626,19 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
         if (rtlpriv->link_info.busytraffic)
                 return;
 
-        mutex_lock(&rtlpriv->locks.ps_mutex);
-        rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS);
-        mutex_unlock(&rtlpriv->locks.ps_mutex);
+        spin_lock(&rtlpriv->locks.rf_ps_lock);
+        if (rtlpriv->psc.rfchange_inprogress) {
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+                return;
+        }
+        spin_unlock(&rtlpriv->locks.rf_ps_lock);
+
+        spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag);
+        rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS , false);
+        spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag);
 
         if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM &&
-                !RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
+            !RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
                 rtlpriv->intf_ops->enable_aspm(hw);
                 RT_SET_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM);
         }
@@ -706,7 +666,7 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
          * awake before every dtim */
         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
                  "dtim_counter:%x will sleep :%d beacon_intv\n",
-                 rtlpriv->psc.dtim_counter, sleep_intv);
+                  rtlpriv->psc.dtim_counter, sleep_intv);
 
         /* we tested that 40ms is enough for sw & hw sw delay */
         queue_delayed_work(rtlpriv->works.rtl_wq, &rtlpriv->works.ps_rfon_wq,
@@ -744,7 +704,7 @@ void rtl_swlps_wq_callback(void *data)
 
                 if (rtlpriv->psc.state && !ps) {
                         rtlpriv->psc.sleep_ms = jiffies_to_msecs(jiffies -
-                                        rtlpriv->psc.last_action);
+                                                 rtlpriv->psc.last_action);
                 }
 
                 if (ps)
@@ -764,7 +724,7 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data,
         u8 *pos, *end, *ie;
         u16 noa_len;
         static u8 p2p_oui_ie_type[4] = {0x50, 0x6f, 0x9a, 0x09};
-        u8 noa_num, index, i, noa_index = 0;
+        u8 noa_num, index , i, noa_index = 0;
         bool find_p2p_ie = false , find_p2p_ps_ie = false;
         pos = (u8 *)mgmt->u.beacon.variable;
         end = data + len;
@@ -814,7 +774,7 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data,
                                 index = 5;
                                 for (i = 0; i < noa_num; i++) {
                                         p2pinfo->noa_count_type[i] =
-                                                 READEF1BYTE(ie+index);
+                                                        READEF1BYTE(ie+index);
                                         index += 1;
                                         p2pinfo->noa_duration[i] =
                                                  READEF4BYTE((__le32 *)ie+index);
@@ -842,7 +802,7 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data,
                                         rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);
                                 }
                         }
-                break;
+                        break;
                 }
                 ie += 3 + noa_len;
         }
@@ -860,7 +820,7 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct ieee80211_mgmt *mgmt = data;
         struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info);
-        u8 noa_num, index, i, noa_index = 0;
+        u8 noa_num, index , i , noa_index = 0;
         u8 *pos, *end, *ie;
         u16 noa_len;
         static u8 p2p_oui_ie_type[4] = {0x50, 0x6f, 0x9a, 0x09};
@@ -906,7 +866,7 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
                                 index = 5;
                                 for (i = 0; i < noa_num; i++) {
                                         p2pinfo->noa_count_type[i] =
-                                                         READEF1BYTE(ie+index);
+                                                        READEF1BYTE(ie+index);
                                         index += 1;
                                         p2pinfo->noa_duration[i] =
                                                          READEF4BYTE((__le32 *)ie+index);
@@ -934,37 +894,37 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
                                         rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);
                                 }
                         }
-                break;
+                        break;
                 }
                 ie += 3 + noa_len;
         }
 }
 
-void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
+void rtl_p2p_ps_cmd(struct ieee80211_hw *hw , u8 p2p_ps_state)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw));
         struct rtl_p2p_ps_info  *p2pinfo = &(rtlpriv->psc.p2p_ps_info);
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, " p2p state %x\n", p2p_ps_state);
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, " p2p state %x\n" , p2p_ps_state);
         switch (p2p_ps_state) {
         case P2P_PS_DISABLE:
                 p2pinfo->p2p_ps_state = p2p_ps_state;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
                                               &p2p_ps_state);
-
                 p2pinfo->noa_index = 0;
                 p2pinfo->ctwindow = 0;
                 p2pinfo->opp_ps = 0;
                 p2pinfo->noa_num = 0;
                 p2pinfo->p2p_ps_mode = P2P_PS_NONE;
-                if (rtlps->fw_current_inpsmode == true) {
+                if (rtlps->fw_current_inpsmode) {
                         if (rtlps->smart_ps == 0) {
                                 rtlps->smart_ps = 2;
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                          HW_VAR_H2C_FW_PWRMODE,
                                          &rtlps->pwr_mode);
                         }
+
                 }
                 break;
         case P2P_PS_ENABLE:
@@ -982,6 +942,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                  HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
                                  &p2p_ps_state);
+
                 }
                 break;
         case P2P_PS_SCAN:
@@ -998,12 +959,16 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
                 break;
         }
         RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
-                 "ctwindow %x oppps %x\n", p2pinfo->ctwindow, p2pinfo->opp_ps);
+                 "ctwindow %x oppps %x\n",
+                 p2pinfo->ctwindow , p2pinfo->opp_ps);
         RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
                  "count %x duration %x index %x interval %x start time %x noa num %x\n",
-                 p2pinfo->noa_count_type[0], p2pinfo->noa_duration[0],
-                 p2pinfo->noa_index, p2pinfo->noa_interval[0],
-                 p2pinfo->noa_start_time[0], p2pinfo->noa_num);
+                 p2pinfo->noa_count_type[0],
+                 p2pinfo->noa_duration[0],
+                 p2pinfo->noa_index,
+                 p2pinfo->noa_interval[0],
+                 p2pinfo->noa_start_time[0],
+                 p2pinfo->noa_num);
         RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "end\n");
 }
 
@@ -1032,8 +997,8 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len)
                 return;
 
         if (ieee80211_is_action(hdr->frame_control))
-                rtl_p2p_action_ie(hw, data, len - FCS_LEN);
+                rtl_p2p_action_ie(hw , data , len - FCS_LEN);
         else
-                rtl_p2p_noa_ie(hw, data, len - FCS_LEN);
+                rtl_p2p_noa_ie(hw , data , len - FCS_LEN);
 }
 EXPORT_SYMBOL_GPL(rtl_p2p_info);
diff --git a/drivers/net/wireless/rtlwifi/ps.h b/drivers/net/wireless/rtlwifi/ps.h
index 3bd41f958974..29dfc514212d 100644
--- a/drivers/net/wireless/rtlwifi/ps.h
+++ b/drivers/net/wireless/rtlwifi/ps.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -32,68 +28,9 @@
 
 #define MAX_SW_LPS_SLEEP_INTV   5
 
-/*---------------------------------------------
- * 3 The value of cmd: 4 bits
- *---------------------------------------------
- */
-#define    PWR_CMD_READ         0x00
-#define    PWR_CMD_WRITE        0x01
-#define    PWR_CMD_POLLING      0x02
-#define    PWR_CMD_DELAY        0x03
-#define    PWR_CMD_END          0x04
-
-/* define the base address of each block */
-#define PWR_BASEADDR_MAC        0x00
-#define PWR_BASEADDR_USB        0x01
-#define PWR_BASEADDR_PCIE       0x02
-#define PWR_BASEADDR_SDIO       0x03
-
-#define PWR_FAB_ALL_MSK         (BIT(0)|BIT(1)|BIT(2)|BIT(3))
-#define PWR_CUT_TESTCHIP_MSK    BIT(0)
-#define PWR_CUT_A_MSK           BIT(1)
-#define PWR_CUT_B_MSK           BIT(2)
-#define PWR_CUT_C_MSK           BIT(3)
-#define PWR_CUT_D_MSK           BIT(4)
-#define PWR_CUT_E_MSK           BIT(5)
-#define PWR_CUT_F_MSK           BIT(6)
-#define PWR_CUT_G_MSK           BIT(7)
-#define PWR_CUT_ALL_MSK         0xFF
-#define PWR_INTF_SDIO_MSK       BIT(0)
-#define PWR_INTF_USB_MSK        BIT(1)
-#define PWR_INTF_PCI_MSK        BIT(2)
-#define PWR_INTF_ALL_MSK        (BIT(0)|BIT(1)|BIT(2)|BIT(3))
-
-enum pwrseq_delay_unit {
-        PWRSEQ_DELAY_US,
-        PWRSEQ_DELAY_MS,
-};
-
-struct wlan_pwr_cfg {
-        u16 offset;
-        u8 cut_msk;
-        u8 fab_msk:4;
-        u8 interface_msk:4;
-        u8 base:4;
-        u8 cmd:4;
-        u8 msk;
-        u8 value;
-};
-
-#define GET_PWR_CFG_OFFSET(__PWR_CMD)   (__PWR_CMD.offset)
-#define GET_PWR_CFG_CUT_MASK(__PWR_CMD) (__PWR_CMD.cut_msk)
-#define GET_PWR_CFG_FAB_MASK(__PWR_CMD) (__PWR_CMD.fab_msk)
-#define GET_PWR_CFG_INTF_MASK(__PWR_CMD)        (__PWR_CMD.interface_msk)
-#define GET_PWR_CFG_BASE(__PWR_CMD)     (__PWR_CMD.base)
-#define GET_PWR_CFG_CMD(__PWR_CMD)      (__PWR_CMD.cmd)
-#define GET_PWR_CFG_MASK(__PWR_CMD)     (__PWR_CMD.msk)
-#define GET_PWR_CFG_VALUE(__PWR_CMD)    (__PWR_CMD.value)
-
-bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
-                              u8 fab_version, u8 interface_type,
-                              struct wlan_pwr_cfg pwrcfgcmd[]);
-
 bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,
-                         enum rf_pwrstate state_toset, u32 changesource);
+                         enum rf_pwrstate state_toset, u32 changesource,
+                         bool protect_or_not);
 bool rtl_ps_enable_nic(struct ieee80211_hw *hw);
 bool rtl_ps_disable_nic(struct ieee80211_hw *hw);
 void rtl_ips_nic_off(struct ieee80211_hw *hw);
@@ -102,12 +39,14 @@ void rtl_ips_nic_off_wq_callback(void *data);
 void rtl_lps_enter(struct ieee80211_hw *hw);
 void rtl_lps_leave(struct ieee80211_hw *hw);
 
+void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode);
+
 void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len);
 void rtl_swlps_wq_callback(void *data);
 void rtl_swlps_rfon_wq_callback(void *data);
 void rtl_swlps_rf_awake(struct ieee80211_hw *hw);
 void rtl_swlps_rf_sleep(struct ieee80211_hw *hw);
-void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
+void rtl_p2p_ps_cmd(struct ieee80211_hw *hw , u8 p2p_ps_state);
 void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len);
 void rtl_lps_change_work_callback(struct work_struct *work);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.h b/drivers/net/wireless/rtlwifi/pwrseqcmd.h
index 6e0f3ea37ec0..17ce0cb2c35c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.h
+++ b/drivers/net/wireless/rtlwifi/pwrseqcmd.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,7 +26,7 @@
 #ifndef __RTL8723E_PWRSEQCMD_H__
 #define __RTL8723E_PWRSEQCMD_H__
 
-#include "../wifi.h"
+#include "wifi.h"
 /*---------------------------------------------
  * 3 The value of cmd: 4 bits
  *---------------------------------------------
diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c
index ee28a1a3d010..7863bd278b22 100644
--- a/drivers/net/wireless/rtlwifi/rc.c
+++ b/drivers/net/wireless/rtlwifi/rc.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -35,13 +31,13 @@
  *Finds the highest rate index we can use
  *if skb is special data like DHCP/EAPOL, we set should
  *it to lowest rate CCK_1M, otherwise we set rate to
- *CCK11M or OFDM_54M based on wireless mode.
+ *highest rate based on wireless mode used for iwconfig
+ *show Tx rate.
  */
 static u8 _rtl_rc_get_highest_rix(struct rtl_priv *rtlpriv,
                                   struct ieee80211_sta *sta,
                                   struct sk_buff *skb, bool not_data)
 {
-        struct rtl_mac *rtlmac = rtl_mac(rtlpriv);
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_sta_info *sta_entry = NULL;
@@ -54,21 +50,13 @@ static u8 _rtl_rc_get_highest_rix(struct rtl_priv *rtlpriv,
          *2.in rtl_get_tcb_desc when we check rate is
          *      1M we will not use FW rate but user rate.
          */
-        if (rtlmac->opmode == NL80211_IFTYPE_AP ||
-            rtlmac->opmode == NL80211_IFTYPE_ADHOC ||
-            rtlmac->opmode == NL80211_IFTYPE_MESH_POINT) {
-                if (sta) {
-                        sta_entry = (struct rtl_sta_info *) sta->drv_priv;
-                        wireless_mode = sta_entry->wireless_mode;
-                } else {
-                        return 0;
-                }
-        } else {
-                wireless_mode = rtlmac->mode;
+
+        if (sta) {
+                sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+                wireless_mode = sta_entry->wireless_mode;
         }
 
-        if (rtl_is_special_data(rtlpriv->mac80211.hw, skb, true) ||
-                        not_data) {
+        if (rtl_is_special_data(rtlpriv->mac80211.hw, skb, true) || not_data) {
                 return 0;
         } else {
                 if (rtlhal->current_bandtype == BAND_ON_2_4G) {
@@ -76,21 +64,27 @@ static u8 _rtl_rc_get_highest_rix(struct rtl_priv *rtlpriv,
                                 return B_MODE_MAX_RIX;
                         } else if (wireless_mode == WIRELESS_MODE_G) {
                                 return G_MODE_MAX_RIX;
-                        } else {
+                        } else if (wireless_mode == WIRELESS_MODE_N_24G) {
                                 if (get_rf_type(rtlphy) != RF_2T2R)
                                         return N_MODE_MCS7_RIX;
                                 else
                                         return N_MODE_MCS15_RIX;
+                        } else if (wireless_mode == WIRELESS_MODE_AC_24G) {
+                                return AC_MODE_MCS9_RIX;
                         }
+                        return 0;
                 } else {
                         if (wireless_mode == WIRELESS_MODE_A) {
                                 return A_MODE_MAX_RIX;
-                        } else {
+                        } else if (wireless_mode == WIRELESS_MODE_N_5G) {
                                 if (get_rf_type(rtlphy) != RF_2T2R)
                                         return N_MODE_MCS7_RIX;
                                 else
                                         return N_MODE_MCS15_RIX;
+                        } else if (wireless_mode == WIRELESS_MODE_AC_5G) {
+                                return AC_MODE_MCS9_RIX;
                         }
+                        return 0;
                 }
         }
 }
@@ -103,35 +97,52 @@ static void _rtl_rc_rate_set_series(struct rtl_priv *rtlpriv,
                                     bool not_data)
 {
         struct rtl_mac *mac = rtl_mac(rtlpriv);
-        u8 sgi_20 = 0, sgi_40 = 0;
+        struct rtl_sta_info *sta_entry = NULL;
+        u8 wireless_mode = 0;
+        u8 sgi_20 = 0, sgi_40 = 0, sgi_80 = 0;
 
         if (sta) {
                 sgi_20 = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20;
                 sgi_40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40;
+                sgi_80 = sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80;
+                sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+                wireless_mode = sta_entry->wireless_mode;
         }
         rate->count = tries;
         rate->idx = rix >= 0x00 ? rix : 0x00;
+        if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE &&
+            wireless_mode == WIRELESS_MODE_AC_5G)
+                rate->idx += 0x10;/*2NSS for 8812AE*/
 
         if (!not_data) {
                 if (txrc->short_preamble)
                         rate->flags |= IEEE80211_TX_RC_USE_SHORT_PREAMBLE;
                 if (mac->opmode == NL80211_IFTYPE_AP ||
-                    mac->opmode == NL80211_IFTYPE_ADHOC) {
-                        if (sta && (sta->bandwidth >= IEEE80211_STA_RX_BW_40))
+                        mac->opmode == NL80211_IFTYPE_ADHOC) {
+                        if (sta && (sta->ht_cap.cap &
+                                    IEEE80211_HT_CAP_SUP_WIDTH_20_40))
                                 rate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+                        if (sta && (sta->vht_cap.vht_supported))
+                                rate->flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;
                 } else {
                         if (mac->bw_40)
                                 rate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+                        if (mac->bw_80)
+                                rate->flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;
                 }
-                if (sgi_20 || sgi_40)
+
+                if (sgi_20 || sgi_40 || sgi_80)
                         rate->flags |= IEEE80211_TX_RC_SHORT_GI;
-                if (sta && sta->ht_cap.ht_supported)
+                if (sta && sta->ht_cap.ht_supported &&
+                    ((wireless_mode == WIRELESS_MODE_N_5G) ||
+                     (wireless_mode == WIRELESS_MODE_N_24G)))
                         rate->flags |= IEEE80211_TX_RC_MCS;
         }
 }
 
 static void rtl_get_rate(void *ppriv, struct ieee80211_sta *sta,
-                         void *priv_sta, struct ieee80211_tx_rate_control *txrc)
+                         void *priv_sta,
+                         struct ieee80211_tx_rate_control *txrc)
 {
         struct rtl_priv *rtlpriv = ppriv;
         struct sk_buff *skb = txrc->skb;
@@ -158,7 +169,7 @@ static void rtl_get_rate(void *ppriv, struct ieee80211_sta *sta,
 }
 
 static bool _rtl_tx_aggr_check(struct rtl_priv *rtlpriv,
-                struct rtl_sta_info *sta_entry, u16 tid)
+                               struct rtl_sta_info *sta_entry, u16 tid)
 {
         struct rtl_mac *mac = rtl_mac(rtlpriv);
 
@@ -166,7 +177,7 @@ static bool _rtl_tx_aggr_check(struct rtl_priv *rtlpriv,
                 return false;
 
         if (mac->opmode == NL80211_IFTYPE_STATION &&
-                mac->cnt_after_linked < 3)
+            mac->cnt_after_linked < 3)
                 return false;
 
         if (sta_entry->tids[tid].agg.agg_state == RTL_AGG_STOP)
@@ -193,23 +204,23 @@ static void rtl_tx_status(void *ppriv,
         if (rtl_is_special_data(mac->hw, skb, true))
                 return;
 
-        if (is_multicast_ether_addr(ieee80211_get_DA(hdr))
-            || is_broadcast_ether_addr(ieee80211_get_DA(hdr)))
+        if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||
+            is_broadcast_ether_addr(ieee80211_get_DA(hdr)))
                 return;
 
         if (sta) {
                 /* Check if aggregation has to be enabled for this tid */
                 sta_entry = (struct rtl_sta_info *) sta->drv_priv;
                 if ((sta->ht_cap.ht_supported) &&
-                                !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
+                    !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
                         if (ieee80211_is_data_qos(fc)) {
                                 u8 tid = rtl_get_tid(skb);
                                 if (_rtl_tx_aggr_check(rtlpriv, sta_entry,
-                                    tid)) {
+                                                       tid)) {
                                         sta_entry->tids[tid].agg.agg_state =
-                                                         RTL_AGG_PROGRESS;
-                                        ieee80211_start_tx_ba_session(sta,
-                                                                 tid, 5000);
+                                                RTL_AGG_PROGRESS;
+                                        ieee80211_start_tx_ba_session(sta, tid,
+                                                                      5000);
                                 }
                         }
                 }
@@ -223,8 +234,15 @@ static void rtl_rate_init(void *ppriv,
 {
 }
 
-static void *rtl_rate_alloc(struct ieee80211_hw *hw,
-                struct dentry *debugfsdir)
+static void rtl_rate_update(void *ppriv,
+                            struct ieee80211_supported_band *sband,
+                            struct cfg80211_chan_def *chandef,
+                            struct ieee80211_sta *sta, void *priv_sta,
+                            u32 changed)
+{
+}
+
+static void *rtl_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         return rtlpriv;
@@ -260,13 +278,14 @@ static void rtl_rate_free_sta(void *rtlpriv,
         kfree(rate_priv);
 }
 
-static const struct rate_control_ops rtl_rate_ops = {
+static struct rate_control_ops rtl_rate_ops = {
         .name = "rtl_rc",
         .alloc = rtl_rate_alloc,
         .free = rtl_rate_free,
         .alloc_sta = rtl_rate_alloc_sta,
         .free_sta = rtl_rate_free_sta,
         .rate_init = rtl_rate_init,
+        .rate_update = rtl_rate_update,
         .tx_status = rtl_tx_status,
         .get_rate = rtl_get_rate,
 };
diff --git a/drivers/net/wireless/rtlwifi/rc.h b/drivers/net/wireless/rtlwifi/rc.h
index 4d6176160610..f29643d60d6b 100644
--- a/drivers/net/wireless/rtlwifi/rc.h
+++ b/drivers/net/wireless/rtlwifi/rc.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -38,10 +34,15 @@
 #define N_MODE_MCS7_RIX 7
 #define N_MODE_MCS15_RIX 15
 
+#define AC_MODE_MCS7_RIX 7
+#define AC_MODE_MCS8_RIX 8
+#define AC_MODE_MCS9_RIX 9
+
 struct rtl_rate_priv {
         u8 ht_cap;
 };
 
 int rtl_rate_control_register(void);
 void rtl_rate_control_unregister(void);
+
 #endif
diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c
index a4eb9b271438..1893d01b9e78 100644
--- a/drivers/net/wireless/rtlwifi/regd.c
+++ b/drivers/net/wireless/rtlwifi/regd.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -59,26 +55,23 @@ static struct country_code_to_enum_rd allCountries[] = {
  */
 #define RTL819x_2GHZ_CH12_13    \
         REG_RULE(2467-10, 2472+10, 40, 0, 20,\
-                 NL80211_RRF_NO_IR)
+        NL80211_RRF_PASSIVE_SCAN)
 
 #define RTL819x_2GHZ_CH14       \
         REG_RULE(2484-10, 2484+10, 40, 0, 20, \
-                 NL80211_RRF_NO_IR | NL80211_RRF_NO_OFDM)
+        NL80211_RRF_PASSIVE_SCAN | \
+        NL80211_RRF_NO_OFDM)
+
 
 /* 5G chan 36 - chan 64*/
 #define RTL819x_5GHZ_5150_5350  \
-        REG_RULE(5150-10, 5350+10, 40, 0, 30, \
-                 NL80211_RRF_NO_IR)
-
+        REG_RULE(5150-10, 5350+10, 80, 0, 30, 0)
 /* 5G chan 100 - chan 165*/
 #define RTL819x_5GHZ_5470_5850  \
-        REG_RULE(5470-10, 5850+10, 40, 0, 30, \
-                 NL80211_RRF_NO_IR)
-
+        REG_RULE(5470-10, 5850+10, 80, 0, 30, 0)
 /* 5G chan 149 - chan 165*/
 #define RTL819x_5GHZ_5725_5850  \
-        REG_RULE(5725-10, 5850+10, 40, 0, 30, \
-                 NL80211_RRF_NO_IR)
+        REG_RULE(5725-10, 5850+10, 80, 0, 30, 0)
 
 #define RTL819x_5GHZ_ALL        \
         (RTL819x_5GHZ_5150_5350, RTL819x_5GHZ_5470_5850)
@@ -143,7 +136,7 @@ static const struct ieee80211_regdomain rtl_regdom_14 = {
 
 static bool _rtl_is_radar_freq(u16 center_freq)
 {
-        return (center_freq >= 5260 && center_freq <= 5700);
+        return center_freq >= 5260 && center_freq <= 5700;
 }
 
 static void _rtl_reg_apply_beaconing_flags(struct wiphy *wiphy,
@@ -169,10 +162,9 @@ static void _rtl_reg_apply_beaconing_flags(struct wiphy *wiphy,
                                 continue;
                         if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
                                 reg_rule = freq_reg_info(wiphy,
-                                                         MHZ_TO_KHZ(ch->center_freq));
+                                                         ch->center_freq);
                                 if (IS_ERR(reg_rule))
                                         continue;
-
                                 /*
                                  *If 11d had a rule for this channel ensure
                                  *we enable adhoc/beaconing if it allows us to
@@ -182,11 +174,16 @@ static void _rtl_reg_apply_beaconing_flags(struct wiphy *wiphy,
                                  *regulatory_hint().
                                  */
 
-                                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
-                                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
+                                if (!(reg_rule->flags & NL80211_RRF_NO_IBSS))
+                                        ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
+                                if (!(reg_rule->flags &
+                                      NL80211_RRF_PASSIVE_SCAN))
+                                        ch->flags &=
+                                            ~IEEE80211_CHAN_PASSIVE_SCAN;
                         } else {
                                 if (ch->beacon_found)
-                                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
+                                        ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
+                                                   IEEE80211_CHAN_PASSIVE_SCAN);
                         }
                 }
         }
@@ -211,35 +208,35 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy,
          */
         if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
                 ch = &sband->channels[11];      /* CH 12 */
-                if (ch->flags & IEEE80211_CHAN_NO_IR)
-                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
+                if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                        ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
                 ch = &sband->channels[12];      /* CH 13 */
-                if (ch->flags & IEEE80211_CHAN_NO_IR)
-                        ch->flags &= ~IEEE80211_CHAN_NO_IR;
+                if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                        ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
                 return;
         }
 
         /*
-         *If a country IE has been received check its rule for this
+         *If a country IE has been recieved check its rule for this
          *channel first before enabling active scan. The passive scan
          *would have been enforced by the initial processing of our
          *custom regulatory domain.
          */
 
         ch = &sband->channels[11];      /* CH 12 */
-        reg_rule = freq_reg_info(wiphy, MHZ_TO_KHZ(ch->center_freq));
+        reg_rule = freq_reg_info(wiphy, ch->center_freq);
         if (!IS_ERR(reg_rule)) {
-                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
-                        if (ch->flags & IEEE80211_CHAN_NO_IR)
-                                ch->flags &= ~IEEE80211_CHAN_NO_IR;
+                if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
+                        if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                                ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
         }
 
         ch = &sband->channels[12];      /* CH 13 */
-        reg_rule = freq_reg_info(wiphy, MHZ_TO_KHZ(ch->center_freq));
+        reg_rule = freq_reg_info(wiphy, ch->center_freq);
         if (!IS_ERR(reg_rule)) {
-                if (!(reg_rule->flags & NL80211_RRF_NO_IR))
-                        if (ch->flags & IEEE80211_CHAN_NO_IR)
-                                ch->flags &= ~IEEE80211_CHAN_NO_IR;
+                if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
+                        if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                                ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
         }
 }
 
@@ -276,7 +273,8 @@ static void _rtl_reg_apply_radar_flags(struct wiphy *wiphy)
                  */
                 if (!(ch->flags & IEEE80211_CHAN_DISABLED))
                         ch->flags |= IEEE80211_CHAN_RADAR |
-                                     IEEE80211_CHAN_NO_IR;
+                            IEEE80211_CHAN_NO_IBSS |
+                            IEEE80211_CHAN_PASSIVE_SCAN;
         }
 }
 
@@ -289,9 +287,25 @@ static void _rtl_reg_apply_world_flags(struct wiphy *wiphy,
         return;
 }
 
-static void _rtl_reg_notifier_apply(struct wiphy *wiphy,
-                                    struct regulatory_request *request,
-                                    struct rtl_regulatory *reg)
+static void _rtl_dump_channel_map(struct wiphy *wiphy)
+{
+        enum ieee80211_band band;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        unsigned int i;
+
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                if (!wiphy->bands[band])
+                        continue;
+                sband = wiphy->bands[band];
+                for (i = 0; i < sband->n_channels; i++)
+                        ch = &sband->channels[i];
+        }
+}
+
+static int _rtl_reg_notifier_apply(struct wiphy *wiphy,
+                                   struct regulatory_request *request,
+                                   struct rtl_regulatory *reg)
 {
         /* We always apply this */
         _rtl_reg_apply_radar_flags(wiphy);
@@ -305,10 +319,14 @@ static void _rtl_reg_notifier_apply(struct wiphy *wiphy,
                 _rtl_reg_apply_world_flags(wiphy, request->initiator, reg);
                 break;
         }
+
+        _rtl_dump_channel_map(wiphy);
+
+        return 0;
 }
 
 static const struct ieee80211_regdomain *_rtl_regdomain_select(
-                                               struct rtl_regulatory *reg)
+                                                struct rtl_regulatory *reg)
 {
         switch (reg->country_code) {
         case COUNTRY_CODE_FCC:
@@ -337,9 +355,9 @@ static const struct ieee80211_regdomain *_rtl_regdomain_select(
 
 static int _rtl_regd_init_wiphy(struct rtl_regulatory *reg,
                                 struct wiphy *wiphy,
-                                void (*reg_notifier) (struct wiphy *wiphy,
-                                                      struct regulatory_request *
-                                                      request))
+                                void (*reg_notifier)(struct wiphy *wiphy,
+                                                     struct regulatory_request *
+                                                     request))
 {
         const struct ieee80211_regdomain *regd;
 
@@ -348,7 +366,6 @@ static int _rtl_regd_init_wiphy(struct rtl_regulatory *reg,
         wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG;
         wiphy->regulatory_flags &= ~REGULATORY_STRICT_REG;
         wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS;
-
         regd = _rtl_regdomain_select(reg);
         wiphy_apply_custom_regulatory(wiphy, regd);
         _rtl_reg_apply_radar_flags(wiphy);
@@ -368,7 +385,7 @@ static struct country_code_to_enum_rd *_rtl_regd_find_country(u16 countrycode)
 }
 
 int rtl_regd_init(struct ieee80211_hw *hw,
-                  void (*reg_notifier) (struct wiphy *wiphy,
+                  void (*reg_notifier)(struct wiphy *wiphy,
                                        struct regulatory_request *request))
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -382,7 +399,8 @@ int rtl_regd_init(struct ieee80211_hw *hw,
         rtlpriv->regd.country_code = rtlpriv->efuse.channel_plan;
 
         RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE,
-                 "rtl: EEPROM regdomain: 0x%0x\n", rtlpriv->regd.country_code);
+                 "rtl: EEPROM regdomain: 0x%0x\n",
+                  rtlpriv->regd.country_code);
 
         if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) {
                 RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG,
@@ -403,7 +421,7 @@ int rtl_regd_init(struct ieee80211_hw *hw,
 
         RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE,
                  "rtl: Country alpha2 being used: %c%c\n",
-                 rtlpriv->regd.alpha2[0], rtlpriv->regd.alpha2[1]);
+                  rtlpriv->regd.alpha2[0], rtlpriv->regd.alpha2[1]);
 
         _rtl_regd_init_wiphy(&rtlpriv->regd, wiphy, reg_notifier);
 
diff --git a/drivers/net/wireless/rtlwifi/regd.h b/drivers/net/wireless/rtlwifi/regd.h
index 4e1f4f00e6e9..3bbbaaa68530 100644
--- a/drivers/net/wireless/rtlwifi/regd.h
+++ b/drivers/net/wireless/rtlwifi/regd.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,6 +26,10 @@
 #ifndef __RTL_REGD_H__
 #define __RTL_REGD_H__
 
+/* for kernel 3.14 , both value are changed to IEEE80211_CHAN_NO_IR*/
+#define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR
+#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR
+
 struct country_code_to_enum_rd {
         u16 countrycode;
         const char *iso_name;
@@ -56,6 +56,7 @@ enum country_code_type_t {
 
 int rtl_regd_init(struct ieee80211_hw *hw,
                   void (*reg_notifier) (struct wiphy *wiphy,
-                                        struct regulatory_request *request));
+                  struct regulatory_request *request));
 void rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
+
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/def.h b/drivers/net/wireless/rtlwifi/rtl8188ee/def.h
index c764fff9ebe6..d9ea9d0c79a5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/def.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -111,7 +107,6 @@
 
 #define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
 
-
 /* [15:12] IC version(CUT): A-cut=0, B-cut=1, C-cut=2, D-cut=3
  * [7] Manufacturer: TSMC=0, UMC=1
  * [6:4] RF type: 1T1R=0, 1T2R=1, 2T2R=2
@@ -130,7 +125,6 @@
 #define D_CUT_VERSION                   ((BIT(12)|BIT(13)))
 #define E_CUT_VERSION                   BIT(14)
 
-
 /* MASK */
 #define IC_TYPE_MASK                    (BIT(0)|BIT(1)|BIT(2))
 #define CHIP_TYPE_MASK                  BIT(3)
@@ -147,7 +141,6 @@
 #define GET_CVID_ROM_VERSION(version)   ((version) & ROM_VERSION_MASK)
 #define GET_CVID_CUT_VERSION(version)   ((version) & CUT_VERSION_MASK)
 
-
 #define IS_81XXC(version)                                               \
         ((GET_CVID_IC_TYPE(version) == 0) ? true : false)
 #define IS_8723_SERIES(version)                                         \
@@ -174,7 +167,7 @@
 #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)                              \
+#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        \
         : false) : false) : false)
@@ -225,44 +218,37 @@ enum power_polocy_config {
 };
 
 enum interface_select_pci {
-        INTF_SEL1_MINICARD,
-        INTF_SEL0_PCIE,
-        INTF_SEL2_RSV,
-        INTF_SEL3_RSV,
+        INTF_SEL1_MINICARD = 0,
+        INTF_SEL0_PCIE = 1,
+        INTF_SEL2_RSV = 2,
+        INTF_SEL3_RSV = 3,
 };
 
 enum hal_fw_c2h_cmd_id {
-        HAL_FW_C2H_CMD_Read_MACREG,
-        HAL_FW_C2H_CMD_Read_BBREG,
-        HAL_FW_C2H_CMD_Read_RFREG,
-        HAL_FW_C2H_CMD_Read_EEPROM,
-        HAL_FW_C2H_CMD_Read_EFUSE,
-        HAL_FW_C2H_CMD_Read_CAM,
-        HAL_FW_C2H_CMD_Get_BasicRate,
-        HAL_FW_C2H_CMD_Get_DataRate,
-        HAL_FW_C2H_CMD_Survey,
-        HAL_FW_C2H_CMD_SurveyDone,
-        HAL_FW_C2H_CMD_JoinBss,
-        HAL_FW_C2H_CMD_AddSTA,
-        HAL_FW_C2H_CMD_DelSTA,
-        HAL_FW_C2H_CMD_AtimDone,
-        HAL_FW_C2H_CMD_TX_Report,
-        HAL_FW_C2H_CMD_CCX_Report,
-        HAL_FW_C2H_CMD_DTM_Report,
-        HAL_FW_C2H_CMD_TX_Rate_Statistics,
-        HAL_FW_C2H_CMD_C2HLBK,
-        HAL_FW_C2H_CMD_C2HDBG,
-        HAL_FW_C2H_CMD_C2HFEEDBACK,
+        HAL_FW_C2H_CMD_READ_MACREG = 0,
+        HAL_FW_C2H_CMD_READ_BBREG = 1,
+        HAL_FW_C2H_CMD_READ_RFREG = 2,
+        HAL_FW_C2H_CMD_READ_EEPROM = 3,
+        HAL_FW_C2H_CMD_READ_EFUSE = 4,
+        HAL_FW_C2H_CMD_READ_CAM = 5,
+        HAL_FW_C2H_CMD_GET_BASICRATE = 6,
+        HAL_FW_C2H_CMD_GET_DATARATE = 7,
+        HAL_FW_C2H_CMD_SURVEY = 8,
+        HAL_FW_C2H_CMD_SURVEYDONE = 9,
+        HAL_FW_C2H_CMD_JOINBSS = 10,
+        HAL_FW_C2H_CMD_ADDSTA = 11,
+        HAL_FW_C2H_CMD_DELSTA = 12,
+        HAL_FW_C2H_CMD_ATIMDONE = 13,
+        HAL_FW_C2H_CMD_TX_REPORT = 14,
+        HAL_FW_C2H_CMD_CCX_REPORT = 15,
+        HAL_FW_C2H_CMD_DTM_REPORT = 16,
+        HAL_FW_C2H_CMD_TX_RATE_STATISTICS = 17,
+        HAL_FW_C2H_CMD_C2HLBK = 18,
+        HAL_FW_C2H_CMD_C2HDBG = 19,
+        HAL_FW_C2H_CMD_C2HFEEDBACK = 20,
         HAL_FW_C2H_CMD_MAX
 };
 
-enum wake_on_wlan_mode {
-        ewowlandisable,
-        ewakeonmagicpacketonly,
-        ewakeonpatternmatchonly,
-        ewakeonbothtypepacket
-};
-
 enum rtl_desc_qsel {
         QSLT_BK = 0x2,
         QSLT_BE = 0x0,
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
index f8daa61cf1c3..2aa34d9055f0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -188,21 +184,24 @@ static void rtl88e_set_iqk_matrix(struct ieee80211_hw *hw,
                 switch (rfpath) {
                 case RF90_PATH_A:
                         value32 = (ele_d << 22)|((ele_c & 0x3F)<<16) | ele_a;
-                        rtl_set_bbreg(hw, ROFDM0_XATXIQIMBAL, MASKDWORD,
-                                      value32);
+                        rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
+                                      MASKDWORD, value32);
                         value32 = (ele_c & 0x000003C0) >> 6;
-                        rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS, value32);
+                        rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS,
+                                      value32);
                         value32 = ((iqk_result_x * ele_d) >> 7) & 0x01;
-                        rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(24), value32);
+                        rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24),
+                                      value32);
                         break;
                 case RF90_PATH_B:
                         value32 = (ele_d << 22)|((ele_c & 0x3F)<<16) | ele_a;
-                        rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBAL,
-                                      MASKDWORD, value32);
+                        rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, MASKDWORD,
+                                      value32);
                         value32 = (ele_c & 0x000003C0) >> 6;
                         rtl_set_bbreg(hw, ROFDM0_XDTXAFE, MASKH4BITS, value32);
                         value32 = ((iqk_result_x * ele_d) >> 7) & 0x01;
-                        rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(28), value32);
+                        rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(28),
+                                      value32);
                         break;
                 default:
                         break;
@@ -210,16 +209,20 @@ static void rtl88e_set_iqk_matrix(struct ieee80211_hw *hw,
         } else {
                 switch (rfpath) {
                 case RF90_PATH_A:
-                        rtl_set_bbreg(hw, ROFDM0_XATXIQIMBAL, MASKDWORD,
-                                      ofdmswing_table[ofdm_index]);
-                        rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS, 0x00);
-                        rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(24), 0x00);
+                        rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
+                                      MASKDWORD, ofdmswing_table[ofdm_index]);
+                        rtl_set_bbreg(hw, ROFDM0_XCTXAFE,
+                                      MASKH4BITS, 0x00);
+                        rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD,
+                                      BIT(24), 0x00);
                         break;
                 case RF90_PATH_B:
-                        rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBAL, MASKDWORD,
-                                      ofdmswing_table[ofdm_index]);
-                        rtl_set_bbreg(hw, ROFDM0_XDTXAFE, MASKH4BITS, 0x00);
-                        rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(28), 0x00);
+                        rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE,
+                                      MASKDWORD, ofdmswing_table[ofdm_index]);
+                        rtl_set_bbreg(hw, ROFDM0_XDTXAFE,
+                                      MASKH4BITS, 0x00);
+                        rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD,
+                                      BIT(28), 0x00);
                         break;
                 default:
                         break;
@@ -244,7 +247,7 @@ void rtl88e_dm_txpower_track_adjust(struct ieee80211_hw *hw,
                         pwr_val = ofdm_base - ofdm_val;
                 } else {
                         *pdirection = 2;
-                        pwr_val = ofdm_val - ofdm_base;
+                        pwr_val = ofdm_base - ofdm_val;
                 }
         } else if (type == 1) {
                 if (cck_val <= cck_base) {
@@ -263,46 +266,75 @@ void rtl88e_dm_txpower_track_adjust(struct ieee80211_hw *hw,
                          (pwr_val << 24);
 }
 
-
-static void rtl88e_chk_tx_track(struct ieee80211_hw *hw,
-                                enum pwr_track_control_method method,
-                                u8 rfpath, u8 index)
+static void dm_tx_pwr_track_set_pwr(struct ieee80211_hw *hw,
+                                    enum pwr_track_control_method method,
+                                    u8 rfpath, u8 channel_mapped_index)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
-        int jj = rtldm->swing_idx_cck;
-        int i;
 
         if (method == TXAGC) {
-                if (rtldm->swing_flag_ofdm == true ||
-                    rtldm->swing_flag_cck == true) {
-                        u8 chan = rtlphy->current_channel;
-                        rtl88e_phy_set_txpower_level(hw, chan);
+                if (rtldm->swing_flag_ofdm ||
+                    rtldm->swing_flag_cck) {
+                        rtl88e_phy_set_txpower_level(hw,
+                                                     rtlphy->current_channel);
                         rtldm->swing_flag_ofdm = false;
                         rtldm->swing_flag_cck = false;
                 }
         } else if (method == BBSWING) {
                 if (!rtldm->cck_inch14) {
-                        for (i = 0; i < 8; i++)
-                                rtl_write_byte(rtlpriv, 0xa22 + i,
-                                               cck_tbl_ch1_13[jj][i]);
+                        rtl_write_byte(rtlpriv, 0xa22,
+                                       cck_tbl_ch1_13[rtldm->swing_idx_cck][0]);
+                        rtl_write_byte(rtlpriv, 0xa23,
+                                       cck_tbl_ch1_13[rtldm->swing_idx_cck][1]);
+                        rtl_write_byte(rtlpriv, 0xa24,
+                                       cck_tbl_ch1_13[rtldm->swing_idx_cck][2]);
+                        rtl_write_byte(rtlpriv, 0xa25,
+                                       cck_tbl_ch1_13[rtldm->swing_idx_cck][3]);
+                        rtl_write_byte(rtlpriv, 0xa26,
+                                       cck_tbl_ch1_13[rtldm->swing_idx_cck][4]);
+                        rtl_write_byte(rtlpriv, 0xa27,
+                                       cck_tbl_ch1_13[rtldm->swing_idx_cck][5]);
+                        rtl_write_byte(rtlpriv, 0xa28,
+                                       cck_tbl_ch1_13[rtldm->swing_idx_cck][6]);
+                        rtl_write_byte(rtlpriv, 0xa29,
+                                       cck_tbl_ch1_13[rtldm->swing_idx_cck][7]);
                 } else {
-                        for (i = 0; i < 8; i++)
-                                rtl_write_byte(rtlpriv, 0xa22 + i,
-                                               cck_tbl_ch14[jj][i]);
+                        rtl_write_byte(rtlpriv, 0xa22,
+                                       cck_tbl_ch14[rtldm->swing_idx_cck][0]);
+                        rtl_write_byte(rtlpriv, 0xa23,
+                                       cck_tbl_ch14[rtldm->swing_idx_cck][1]);
+                        rtl_write_byte(rtlpriv, 0xa24,
+                                       cck_tbl_ch14[rtldm->swing_idx_cck][2]);
+                        rtl_write_byte(rtlpriv, 0xa25,
+                                       cck_tbl_ch14[rtldm->swing_idx_cck][3]);
+                        rtl_write_byte(rtlpriv, 0xa26,
+                                       cck_tbl_ch14[rtldm->swing_idx_cck][4]);
+                        rtl_write_byte(rtlpriv, 0xa27,
+                                       cck_tbl_ch14[rtldm->swing_idx_cck][5]);
+                        rtl_write_byte(rtlpriv, 0xa28,
+                                       cck_tbl_ch14[rtldm->swing_idx_cck][6]);
+                        rtl_write_byte(rtlpriv, 0xa29,
+                                       cck_tbl_ch14[rtldm->swing_idx_cck][7]);
                 }
 
                 if (rfpath == RF90_PATH_A) {
-                        long x = rtlphy->iqk_matrix[index].value[0][0];
-                        long y = rtlphy->iqk_matrix[index].value[0][1];
-                        u8 indx = rtldm->swing_idx_ofdm[rfpath];
-                        rtl88e_set_iqk_matrix(hw, indx, rfpath, x, y);
+                        rtl88e_set_iqk_matrix(hw, rtldm->swing_idx_ofdm[rfpath],
+                                              rfpath, rtlphy->iqk_matrix
+                                              [channel_mapped_index].
+                                              value[0][0],
+                                              rtlphy->iqk_matrix
+                                              [channel_mapped_index].
+                                              value[0][1]);
                 } else if (rfpath == RF90_PATH_B) {
-                        u8 indx = rtldm->swing_idx_ofdm[rfpath];
-                        long x = rtlphy->iqk_matrix[indx].value[0][4];
-                        long y = rtlphy->iqk_matrix[indx].value[0][5];
-                        rtl88e_set_iqk_matrix(hw, indx, rfpath, x, y);
+                        rtl88e_set_iqk_matrix(hw, rtldm->swing_idx_ofdm[rfpath],
+                                              rfpath, rtlphy->iqk_matrix
+                                              [channel_mapped_index].
+                                              value[0][4],
+                                              rtlphy->iqk_matrix
+                                              [channel_mapped_index].
+                                              value[0][5]);
                 }
         } else {
                 return;
@@ -317,7 +349,7 @@ static void rtl88e_dm_diginit(struct ieee80211_hw *hw)
         dm_dig->dig_enable_flag = true;
         dm_dig->cur_igvalue = rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f);
         dm_dig->pre_igvalue = 0;
-        dm_dig->cursta_cstate = DIG_STA_DISCONNECT;
+        dm_dig->cur_sta_cstate = DIG_STA_DISCONNECT;
         dm_dig->presta_cstate = DIG_STA_DISCONNECT;
         dm_dig->curmultista_cstate = DIG_MULTISTA_DISCONNECT;
         dm_dig->rssi_lowthresh = DM_DIG_THRESH_LOW;
@@ -348,22 +380,23 @@ static u8 rtl88e_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw)
         long rssi_val_min = 0;
 
         if ((dm_dig->curmultista_cstate == DIG_MULTISTA_CONNECT) &&
-            (dm_dig->cursta_cstate == DIG_STA_CONNECT)) {
+            (dm_dig->cur_sta_cstate == DIG_STA_CONNECT)) {
                 if (rtlpriv->dm.entry_min_undec_sm_pwdb != 0)
                         rssi_val_min =
                             (rtlpriv->dm.entry_min_undec_sm_pwdb >
-                            rtlpriv->dm.undec_sm_pwdb) ?
+                             rtlpriv->dm.undec_sm_pwdb) ?
                             rtlpriv->dm.undec_sm_pwdb :
                             rtlpriv->dm.entry_min_undec_sm_pwdb;
                 else
                         rssi_val_min = rtlpriv->dm.undec_sm_pwdb;
-        } else if (dm_dig->cursta_cstate == DIG_STA_CONNECT ||
-                   dm_dig->cursta_cstate == DIG_STA_BEFORE_CONNECT) {
+        } else if (dm_dig->cur_sta_cstate == DIG_STA_CONNECT ||
+                   dm_dig->cur_sta_cstate == DIG_STA_BEFORE_CONNECT) {
                 rssi_val_min = rtlpriv->dm.undec_sm_pwdb;
         } else if (dm_dig->curmultista_cstate ==
                 DIG_MULTISTA_CONNECT) {
                 rssi_val_min = rtlpriv->dm.entry_min_undec_sm_pwdb;
         }
+
         return (u8)rssi_val_min;
 }
 
@@ -371,57 +404,58 @@ static void rtl88e_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
 {
         u32 ret_value;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct false_alarm_statistics *alm_cnt = &(rtlpriv->falsealm_cnt);
+        struct false_alarm_statistics *falsealm_cnt = &rtlpriv->falsealm_cnt;
 
         rtl_set_bbreg(hw, ROFDM0_LSTF, BIT(31), 1);
         rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(31), 1);
 
         ret_value = rtl_get_bbreg(hw, ROFDM0_FRAMESYNC, MASKDWORD);
-        alm_cnt->cnt_fast_fsync_fail = (ret_value&0xffff);
-        alm_cnt->cnt_sb_search_fail = ((ret_value&0xffff0000)>>16);
+        falsealm_cnt->cnt_fast_fsync_fail = (ret_value&0xffff);
+        falsealm_cnt->cnt_sb_search_fail = ((ret_value&0xffff0000)>>16);
 
         ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER1, MASKDWORD);
-        alm_cnt->cnt_ofdm_cca = (ret_value&0xffff);
-        alm_cnt->cnt_parity_fail = ((ret_value & 0xffff0000) >> 16);
+        falsealm_cnt->cnt_ofdm_cca = (ret_value&0xffff);
+        falsealm_cnt->cnt_parity_fail = ((ret_value & 0xffff0000) >> 16);
 
         ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER2, MASKDWORD);
-        alm_cnt->cnt_rate_illegal = (ret_value & 0xffff);
-        alm_cnt->cnt_crc8_fail = ((ret_value & 0xffff0000) >> 16);
+        falsealm_cnt->cnt_rate_illegal = (ret_value & 0xffff);
+        falsealm_cnt->cnt_crc8_fail = ((ret_value & 0xffff0000) >> 16);
 
         ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER3, MASKDWORD);
-        alm_cnt->cnt_mcs_fail = (ret_value & 0xffff);
-        alm_cnt->cnt_ofdm_fail = alm_cnt->cnt_parity_fail +
-                                 alm_cnt->cnt_rate_illegal +
-                                 alm_cnt->cnt_crc8_fail +
-                                 alm_cnt->cnt_mcs_fail +
-                                 alm_cnt->cnt_fast_fsync_fail +
-                                 alm_cnt->cnt_sb_search_fail;
+        falsealm_cnt->cnt_mcs_fail = (ret_value & 0xffff);
+        falsealm_cnt->cnt_ofdm_fail = falsealm_cnt->cnt_parity_fail +
+                falsealm_cnt->cnt_rate_illegal +
+                falsealm_cnt->cnt_crc8_fail +
+                falsealm_cnt->cnt_mcs_fail +
+                falsealm_cnt->cnt_fast_fsync_fail +
+                falsealm_cnt->cnt_sb_search_fail;
 
         ret_value = rtl_get_bbreg(hw, REG_SC_CNT, MASKDWORD);
-        alm_cnt->cnt_bw_lsc = (ret_value & 0xffff);
-        alm_cnt->cnt_bw_usc = ((ret_value & 0xffff0000) >> 16);
+        falsealm_cnt->cnt_bw_lsc = (ret_value & 0xffff);
+        falsealm_cnt->cnt_bw_usc = ((ret_value & 0xffff0000) >> 16);
 
         rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(12), 1);
         rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(14), 1);
 
         ret_value = rtl_get_bbreg(hw, RCCK0_FACOUNTERLOWER, MASKBYTE0);
-        alm_cnt->cnt_cck_fail = ret_value;
+        falsealm_cnt->cnt_cck_fail = ret_value;
 
         ret_value = rtl_get_bbreg(hw, RCCK0_FACOUNTERUPPER, MASKBYTE3);
-        alm_cnt->cnt_cck_fail += (ret_value & 0xff) << 8;
+        falsealm_cnt->cnt_cck_fail += (ret_value & 0xff) << 8;
 
         ret_value = rtl_get_bbreg(hw, RCCK0_CCA_CNT, MASKDWORD);
-        alm_cnt->cnt_cck_cca = ((ret_value & 0xff) << 8) |
-                                ((ret_value&0xFF00)>>8);
-
-        alm_cnt->cnt_all = alm_cnt->cnt_fast_fsync_fail +
-                           alm_cnt->cnt_sb_search_fail +
-                           alm_cnt->cnt_parity_fail +
-                           alm_cnt->cnt_rate_illegal +
-                           alm_cnt->cnt_crc8_fail +
-                           alm_cnt->cnt_mcs_fail +
-                           alm_cnt->cnt_cck_fail;
-        alm_cnt->cnt_cca_all = alm_cnt->cnt_ofdm_cca + alm_cnt->cnt_cck_cca;
+        falsealm_cnt->cnt_cck_cca = ((ret_value & 0xff) << 8) |
+                ((ret_value&0xFF00)>>8);
+
+        falsealm_cnt->cnt_all = (falsealm_cnt->cnt_fast_fsync_fail +
+                                falsealm_cnt->cnt_sb_search_fail +
+                                falsealm_cnt->cnt_parity_fail +
+                                falsealm_cnt->cnt_rate_illegal +
+                                falsealm_cnt->cnt_crc8_fail +
+                                falsealm_cnt->cnt_mcs_fail +
+                                falsealm_cnt->cnt_cck_fail);
+        falsealm_cnt->cnt_cca_all = falsealm_cnt->cnt_ofdm_cca +
+                falsealm_cnt->cnt_cck_cca;
 
         rtl_set_bbreg(hw, ROFDM0_TRSWISOLATION, BIT(31), 1);
         rtl_set_bbreg(hw, ROFDM0_TRSWISOLATION, BIT(31), 0);
@@ -435,16 +469,15 @@ static void rtl88e_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, BIT(15)|BIT(14), 2);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, "
-                 "cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
-                 alm_cnt->cnt_parity_fail,
-                 alm_cnt->cnt_rate_illegal,
-                 alm_cnt->cnt_crc8_fail, alm_cnt->cnt_mcs_fail);
+                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
+                 falsealm_cnt->cnt_parity_fail,
+                 falsealm_cnt->cnt_rate_illegal,
+                 falsealm_cnt->cnt_crc8_fail, falsealm_cnt->cnt_mcs_fail);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
                  "cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",
-                 alm_cnt->cnt_ofdm_fail,
-                 alm_cnt->cnt_cck_fail, alm_cnt->cnt_all);
+                 falsealm_cnt->cnt_ofdm_fail,
+                 falsealm_cnt->cnt_cck_fail, falsealm_cnt->cnt_all);
 }
 
 static void rtl88e_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
@@ -453,7 +486,7 @@ static void rtl88e_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
         struct dig_t *dm_dig = &rtlpriv->dm_digtable;
         u8 cur_cck_cca_thresh;
 
-        if (dm_dig->cursta_cstate == DIG_STA_CONNECT) {
+        if (dm_dig->cur_sta_cstate == DIG_STA_CONNECT) {
                 dm_dig->rssi_val_min = rtl88e_dm_initial_gain_min_pwdb(hw);
                 if (dm_dig->rssi_val_min > 25) {
                         cur_cck_cca_thresh = 0xcd;
@@ -486,10 +519,10 @@ static void rtl88e_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
 static void rtl88e_dm_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-        u8 dig_min, dig_maxofmin;
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        u8 dig_dynamic_min, dig_maxofmin;
         bool bfirstconnect;
         u8 dm_dig_max, dm_dig_min;
         u8 current_igi = dm_dig->cur_igvalue;
@@ -502,19 +535,19 @@ static void rtl88e_dm_dig(struct ieee80211_hw *hw)
                 return;
 
         if (mac->link_state >= MAC80211_LINKED)
-                dm_dig->cursta_cstate = DIG_STA_CONNECT;
+                dm_dig->cur_sta_cstate = DIG_STA_CONNECT;
         else
-                dm_dig->cursta_cstate = DIG_STA_DISCONNECT;
+                dm_dig->cur_sta_cstate = DIG_STA_DISCONNECT;
         if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP ||
             rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC)
-                dm_dig->cursta_cstate = DIG_STA_DISCONNECT;
+                dm_dig->cur_sta_cstate = DIG_STA_DISCONNECT;
 
         dm_dig_max = DM_DIG_MAX;
         dm_dig_min = DM_DIG_MIN;
         dig_maxofmin = DM_DIG_MAX_AP;
-        dig_min = dm_dig->dig_min_0;
+        dig_dynamic_min = dm_dig->dig_min_0;
         bfirstconnect = ((mac->link_state >= MAC80211_LINKED) ? true : false) &&
-                         (dm_dig->media_connect_0 == false);
+                         !dm_dig->media_connect_0;
 
         dm_dig->rssi_val_min =
                 rtl88e_dm_initial_gain_min_pwdb(hw);
@@ -528,18 +561,18 @@ static void rtl88e_dm_dig(struct ieee80211_hw *hw)
                         dm_dig->rx_gain_max = dm_dig->rssi_val_min + 20;
 
                 if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) {
-                        dig_min  = dm_dig->antdiv_rssi_max;
+                        dig_dynamic_min  = dm_dig->antdiv_rssi_max;
                 } else {
                         if (dm_dig->rssi_val_min < dm_dig_min)
-                                dig_min = dm_dig_min;
+                                dig_dynamic_min = dm_dig_min;
                         else if (dm_dig->rssi_val_min < dig_maxofmin)
-                                dig_min = dig_maxofmin;
+                                dig_dynamic_min = dig_maxofmin;
                         else
-                                dig_min = dm_dig->rssi_val_min;
+                                dig_dynamic_min = dm_dig->rssi_val_min;
                 }
         } else {
                 dm_dig->rx_gain_max = dm_dig_max;
-                dig_min = dm_dig_min;
+                dig_dynamic_min = dm_dig_min;
                 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "no link\n");
         }
 
@@ -551,10 +584,13 @@ static void rtl88e_dm_dig(struct ieee80211_hw *hw)
                 }
 
                 if (dm_dig->large_fa_hit >= 3) {
-                        if ((dm_dig->forbidden_igi + 1) > dm_dig->rx_gain_max)
-                                dm_dig->rx_gain_min = dm_dig->rx_gain_max;
+                        if ((dm_dig->forbidden_igi + 1) >
+                                dm_dig->rx_gain_max)
+                                dm_dig->rx_gain_min =
+                                        dm_dig->rx_gain_max;
                         else
-                                dm_dig->rx_gain_min = dm_dig->forbidden_igi + 1;
+                                dm_dig->rx_gain_min =
+                                        dm_dig->forbidden_igi + 1;
                         dm_dig->recover_cnt = 3600;
                 }
         } else {
@@ -562,13 +598,14 @@ static void rtl88e_dm_dig(struct ieee80211_hw *hw)
                         dm_dig->recover_cnt--;
                 } else {
                         if (dm_dig->large_fa_hit == 0) {
-                                if ((dm_dig->forbidden_igi - 1) < dig_min) {
-                                        dm_dig->forbidden_igi = dig_min;
-                                        dm_dig->rx_gain_min = dig_min;
+                                if ((dm_dig->forbidden_igi - 1) <
+                                    dig_dynamic_min) {
+                                        dm_dig->forbidden_igi = dig_dynamic_min;
+                                        dm_dig->rx_gain_min = dig_dynamic_min;
                                 } else {
                                         dm_dig->forbidden_igi--;
                                         dm_dig->rx_gain_min =
-                                                 dm_dig->forbidden_igi + 1;
+                                                dm_dig->forbidden_igi + 1;
                                 }
                         } else if (dm_dig->large_fa_hit == 3) {
                                 dm_dig->large_fa_hit = 0;
@@ -576,7 +613,7 @@ static void rtl88e_dm_dig(struct ieee80211_hw *hw)
                 }
         }
 
-        if (dm_dig->cursta_cstate == DIG_STA_CONNECT) {
+        if (dm_dig->cur_sta_cstate == DIG_STA_CONNECT) {
                 if (bfirstconnect) {
                         current_igi = dm_dig->rssi_val_min;
                 } else {
@@ -606,9 +643,9 @@ static void rtl88e_dm_dig(struct ieee80211_hw *hw)
 
         dm_dig->cur_igvalue = current_igi;
         rtl88e_dm_write_dig(hw);
-        dm_dig->media_connect_0 = ((mac->link_state >= MAC80211_LINKED) ?
-                                    true : false);
-        dm_dig->dig_min_0 = dig_min;
+        dm_dig->media_connect_0 =
+                ((mac->link_state >= MAC80211_LINKED) ? true : false);
+        dm_dig->dig_min_0 = dig_dynamic_min;
 
         rtl88e_dm_cck_packet_detection_thresh(hw);
 }
@@ -626,7 +663,7 @@ static void rtl88e_dm_init_dynamic_txpower(struct ieee80211_hw *hw)
 static void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         long undec_sm_pwdb;
 
@@ -641,7 +678,7 @@ static void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         "Not connected\n");
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -664,10 +701,12 @@ static void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
                                   undec_sm_pwdb);
                 }
         } else {
-                undec_sm_pwdb = rtlpriv->dm.entry_min_undec_sm_pwdb;
+                undec_sm_pwdb =
+                    rtlpriv->dm.entry_min_undec_sm_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         "AP Ext Port PWDB = 0x%lx\n", undec_sm_pwdb);
+                         "AP Ext Port PWDB = 0x%lx\n",
+                          undec_sm_pwdb);
         }
 
         if (undec_sm_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
@@ -676,17 +715,20 @@ static void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
                          "TXHIGHPWRLEVEL_LEVEL1 (TxPwr = 0x0)\n");
         } else if ((undec_sm_pwdb <
                     (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
-                   (undec_sm_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL1)) {
+                   (undec_sm_pwdb >=
+                    TX_POWER_NEAR_FIELD_THRESH_LVL1)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "TXHIGHPWRLEVEL_LEVEL1 (TxPwr = 0x10)\n");
-        } else if (undec_sm_pwdb < (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
+        } else if (undec_sm_pwdb <
+                   (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
-        if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
+        if ((rtlpriv->dm.dynamic_txhighpower_lvl !=
+                rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "PHY_SetTxPowerLevel8192S() Channel = %d\n",
                           rtlphy->current_channel);
@@ -702,10 +744,9 @@ void rtl88e_dm_write_dig(struct ieee80211_hw *hw)
         struct dig_t *dm_dig = &rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 "cur_igvalue = 0x%x, "
-                  "pre_igvalue = 0x%x, back_val = %d\n",
-                  dm_dig->cur_igvalue, dm_dig->pre_igvalue,
-                  dm_dig->back_val);
+                 "cur_igvalue = 0x%x, pre_igvalue = 0x%x, backoff_val = %d\n",
+                 dm_dig->cur_igvalue, dm_dig->pre_igvalue,
+                 dm_dig->back_val);
 
         if (dm_dig->cur_igvalue > 0x3f)
                 dm_dig->cur_igvalue = 0x3f;
@@ -722,17 +763,19 @@ static void rtl88e_dm_pwdb_monitor(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_sta_info *drv_priv;
-        static u64 last_txok;
-        static u64 last_rx;
+        static u64 last_record_txok_cnt;
+        static u64 last_record_rxok_cnt;
         long tmp_entry_max_pwdb = 0, tmp_entry_min_pwdb = 0xff;
 
         if (rtlhal->oem_id == RT_CID_819X_HP) {
                 u64 cur_txok_cnt = 0;
                 u64 cur_rxok_cnt = 0;
-                cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok;
-                cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rx;
-                last_txok = cur_txok_cnt;
-                last_rx = cur_rxok_cnt;
+                cur_txok_cnt = rtlpriv->stats.txbytesunicast -
+                        last_record_txok_cnt;
+                cur_rxok_cnt = rtlpriv->stats.rxbytesunicast -
+                        last_record_rxok_cnt;
+                last_record_txok_cnt = cur_txok_cnt;
+                last_record_rxok_cnt = cur_rxok_cnt;
 
                 if (cur_rxok_cnt > (cur_txok_cnt * 6))
                         rtl_write_dword(rtlpriv, REG_ARFR0, 0x8f015);
@@ -743,9 +786,11 @@ static void rtl88e_dm_pwdb_monitor(struct ieee80211_hw *hw)
         /* AP & ADHOC & MESH */
         spin_lock_bh(&rtlpriv->locks.entry_list_lock);
         list_for_each_entry(drv_priv, &rtlpriv->entry_list, list) {
-                if (drv_priv->rssi_stat.undec_sm_pwdb < tmp_entry_min_pwdb)
+                if (drv_priv->rssi_stat.undec_sm_pwdb <
+                        tmp_entry_min_pwdb)
                         tmp_entry_min_pwdb = drv_priv->rssi_stat.undec_sm_pwdb;
-                if (drv_priv->rssi_stat.undec_sm_pwdb > tmp_entry_max_pwdb)
+                if (drv_priv->rssi_stat.undec_sm_pwdb >
+                        tmp_entry_max_pwdb)
                         tmp_entry_max_pwdb = drv_priv->rssi_stat.undec_sm_pwdb;
         }
         spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
@@ -762,13 +807,19 @@ static void rtl88e_dm_pwdb_monitor(struct ieee80211_hw *hw)
         if (tmp_entry_min_pwdb != 0xff) {
                 rtlpriv->dm.entry_min_undec_sm_pwdb = tmp_entry_min_pwdb;
                 RTPRINT(rtlpriv, FDM, DM_PWDB, "EntryMinPWDB = 0x%lx(%ld)\n",
-                        tmp_entry_min_pwdb, tmp_entry_min_pwdb);
+                                        tmp_entry_min_pwdb, tmp_entry_min_pwdb);
         } else {
                 rtlpriv->dm.entry_min_undec_sm_pwdb = 0;
         }
         /* Indicate Rx signal strength to FW. */
-        if (!rtlpriv->dm.useramask)
+        if (rtlpriv->dm.useramask) {
+                u8 h2c_parameter[3] = { 0 };
+
+                h2c_parameter[2] = (u8)(rtlpriv->dm.undec_sm_pwdb & 0xFF);
+                h2c_parameter[0] = 0x20;
+        } else {
                 rtl_write_byte(rtlpriv, 0x4fe, rtlpriv->dm.undec_sm_pwdb);
+        }
 }
 
 void rtl88e_dm_init_edca_turbo(struct ieee80211_hw *hw)
@@ -783,7 +834,6 @@ void rtl88e_dm_init_edca_turbo(struct ieee80211_hw *hw)
 static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         static u64 last_txok_cnt;
         static u64 last_rxok_cnt;
@@ -793,40 +843,33 @@ static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw)
         u64 cur_rxok_cnt = 0;
         u32 edca_be_ul = 0x5ea42b;
         u32 edca_be_dl = 0x5ea42b;
-        bool change_edca = false;
+        bool bt_change_edca = false;
 
-        if ((last_bt_edca_ul != rtlpcipriv->bt_coexist.bt_edca_ul) ||
-            (last_bt_edca_dl != rtlpcipriv->bt_coexist.bt_edca_dl)) {
+        if ((last_bt_edca_ul != rtlpriv->btcoexist.bt_edca_ul) ||
+            (last_bt_edca_dl != rtlpriv->btcoexist.bt_edca_dl)) {
                 rtlpriv->dm.current_turbo_edca = false;
-                last_bt_edca_ul = rtlpcipriv->bt_coexist.bt_edca_ul;
-                last_bt_edca_dl = rtlpcipriv->bt_coexist.bt_edca_dl;
+                last_bt_edca_ul = rtlpriv->btcoexist.bt_edca_ul;
+                last_bt_edca_dl = rtlpriv->btcoexist.bt_edca_dl;
         }
 
-        if (rtlpcipriv->bt_coexist.bt_edca_ul != 0) {
-                edca_be_ul = rtlpcipriv->bt_coexist.bt_edca_ul;
-                change_edca = true;
+        if (rtlpriv->btcoexist.bt_edca_ul != 0) {
+                edca_be_ul = rtlpriv->btcoexist.bt_edca_ul;
+                bt_change_edca = true;
         }
 
-        if (rtlpcipriv->bt_coexist.bt_edca_dl != 0) {
-                edca_be_ul = rtlpcipriv->bt_coexist.bt_edca_dl;
-                change_edca = true;
+        if (rtlpriv->btcoexist.bt_edca_dl != 0) {
+                edca_be_ul = rtlpriv->btcoexist.bt_edca_dl;
+                bt_change_edca = true;
         }
 
         if (mac->link_state != MAC80211_LINKED) {
                 rtlpriv->dm.current_turbo_edca = false;
                 return;
         }
+        if ((bt_change_edca) ||
+            ((!rtlpriv->dm.is_any_nonbepkts) &&
+             (!rtlpriv->dm.disable_framebursting))) {
 
-        if ((!mac->ht_enable) && (!rtlpcipriv->bt_coexist.bt_coexistence)) {
-                if (!(edca_be_ul & 0xffff0000))
-                        edca_be_ul |= 0x005e0000;
-
-                if (!(edca_be_dl & 0xffff0000))
-                        edca_be_dl |= 0x005e0000;
-        }
-
-        if ((change_edca) || ((!rtlpriv->dm.is_any_nonbepkts) &&
-                              (!rtlpriv->dm.disable_framebursting))) {
                 cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok_cnt;
                 cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rxok_cnt;
 
@@ -851,7 +894,9 @@ static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw)
         } else {
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
+
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_AC_PARAM,
                                                       &tmp);
                         rtlpriv->dm.current_turbo_edca = false;
                 }
@@ -862,29 +907,29 @@ static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw)
         last_rxok_cnt = rtlpriv->stats.rxbytesunicast;
 }
 
-static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
-                                                             *hw)
+static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 thermalvalue = 0, delta, delta_lck, delta_iqk, off;
-        u8 th_avg_cnt = 0;
+        u8 thermalvalue = 0, delta, delta_lck, delta_iqk, offset;
+        u8 thermalvalue_avg_count = 0;
         u32 thermalvalue_avg = 0;
         long  ele_d, temp_cck;
-        char ofdm_index[2], cck_index = 0, ofdm_old[2] = {0, 0}, cck_old = 0;
+        char ofdm_index[2], cck_index = 0,
+                ofdm_index_old[2] = {0, 0}, cck_index_old = 0;
         int i = 0;
-        bool is2t = false;
+        /*bool is2t = false;*/
 
-        u8 ofdm_min_index = 6, rf = (is2t) ? 2 : 1;
-        u8 index_for_channel;
-        enum _dec_inc {dec, power_inc};
+        u8 ofdm_min_index = 6, rf = 1;
+        /*u8 index_for_channel;*/
+        enum _power_dec_inc {power_dec, power_inc};
 
-        /* 0.1 the following TWO tables decide the final index of
-         * OFDM/CCK swing table
+        /*0.1 the following TWO tables decide the
+         *final index of OFDM/CCK swing table
          */
-        char del_tbl_idx[2][15] = {
+        char delta_swing_table_idx[2][15]  = {
                 {0, 0, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11},
                 {0, 0, -1, -2, -3, -4, -4, -4, -4, -5, -7, -8, -9, -9, -10}
         };
@@ -896,9 +941,10 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
         /*Initilization (7 steps in total) */
         rtlpriv->dm.txpower_trackinginit = true;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 "rtl88e_dm_txpower_tracking_callback_thermalmeter\n");
+                 "dm_txpower_track_cb_therm\n");
 
-        thermalvalue = (u8) rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0xfc00);
+        thermalvalue = (u8)rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER,
+                                         0xfc00);
         if (!thermalvalue)
                 return;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
@@ -907,55 +953,44 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                  rtlefuse->eeprom_thermalmeter);
 
         /*1. Query OFDM Default Setting: Path A*/
-        ele_d = rtl_get_bbreg(hw, ROFDM0_XATXIQIMBAL, MASKDWORD) & MASKOFDM_D;
+        ele_d = rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE, MASKDWORD) &
+                              MASKOFDM_D;
         for (i = 0; i < OFDM_TABLE_LENGTH; i++) {
                 if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) {
-                        ofdm_old[0] = (u8) i;
-                        rtldm->swing_idx_ofdm_base[0] = (u8)i;
+                        ofdm_index_old[0] = (u8)i;
+                        rtldm->swing_idx_ofdm_base[RF90_PATH_A] = (u8)i;
                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                                  "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index = 0x%x\n",
-                                 ROFDM0_XATXIQIMBAL,
-                                 ele_d, ofdm_old[0]);
+                                 ROFDM0_XATXIQIMBALANCE,
+                                 ele_d, ofdm_index_old[0]);
                         break;
                 }
         }
 
-        if (is2t) {
-                ele_d = rtl_get_bbreg(hw, ROFDM0_XBTXIQIMBAL,
-                                      MASKDWORD) & MASKOFDM_D;
-                for (i = 0; i < OFDM_TABLE_LENGTH; i++) {
-                        if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) {
-                                ofdm_old[1] = (u8)i;
-
-                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
-                                         DBG_LOUD,
-                                         "Initial pathB ele_d reg0x%x = 0x%lx, ofdm_index = 0x%x\n",
-                                         ROFDM0_XBTXIQIMBAL, ele_d,
-                                         ofdm_old[1]);
-                                break;
-                        }
-                }
-        }
         /*2.Query CCK default setting From 0xa24*/
         temp_cck = rtl_get_bbreg(hw, RCCK0_TXFILTER2, MASKDWORD) & MASKCCK;
         for (i = 0; i < CCK_TABLE_LENGTH; i++) {
                 if (rtlpriv->dm.cck_inch14) {
                         if (memcmp(&temp_cck, &cck_tbl_ch14[i][2], 4) == 0) {
-                                cck_old = (u8)i;
+                                cck_index_old = (u8)i;
                                 rtldm->swing_idx_cck_base = (u8)i;
-                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
+                                         DBG_LOUD,
                                          "Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch 14 %d\n",
-                                         RCCK0_TXFILTER2, temp_cck, cck_old,
+                                         RCCK0_TXFILTER2, temp_cck,
+                                         cck_index_old,
                                          rtlpriv->dm.cck_inch14);
                                 break;
                         }
                 } else {
                         if (memcmp(&temp_cck, &cck_tbl_ch1_13[i][2], 4) == 0) {
-                                cck_old = (u8)i;
+                                cck_index_old = (u8)i;
                                 rtldm->swing_idx_cck_base = (u8)i;
-                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
+                                         DBG_LOUD,
                                          "Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch14 %d\n",
-                                         RCCK0_TXFILTER2, temp_cck, cck_old,
+                                         RCCK0_TXFILTER2, temp_cck,
+                                         cck_index_old,
                                          rtlpriv->dm.cck_inch14);
                                 break;
                         }
@@ -968,8 +1003,8 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                 rtlpriv->dm.thermalvalue_lck = thermalvalue;
                 rtlpriv->dm.thermalvalue_iqk = thermalvalue;
                 for (i = 0; i < rf; i++)
-                        rtlpriv->dm.ofdm_index[i] = ofdm_old[i];
-                rtlpriv->dm.cck_index = cck_old;
+                        rtlpriv->dm.ofdm_index[i] = ofdm_index_old[i];
+                rtlpriv->dm.cck_index = cck_index_old;
         }
 
         /*4 Calculate average thermal meter*/
@@ -981,12 +1016,12 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
         for (i = 0; i < AVG_THERMAL_NUM_88E; i++) {
                 if (rtldm->thermalvalue_avg[i]) {
                         thermalvalue_avg += rtldm->thermalvalue_avg[i];
-                        th_avg_cnt++;
+                        thermalvalue_avg_count++;
                 }
         }
 
-        if (th_avg_cnt)
-                thermalvalue = (u8)(thermalvalue_avg / th_avg_cnt);
+        if (thermalvalue_avg_count)
+                thermalvalue = (u8)(thermalvalue_avg / thermalvalue_avg_count);
 
         /* 5 Calculate delta, delta_LCK, delta_IQK.*/
         if (rtlhal->reloadtxpowerindex) {
@@ -997,24 +1032,22 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                 rtlpriv->dm.done_txpower = false;
         } else if (rtlpriv->dm.done_txpower) {
                 delta = (thermalvalue > rtlpriv->dm.thermalvalue) ?
-                        (thermalvalue - rtlpriv->dm.thermalvalue) :
-                        (rtlpriv->dm.thermalvalue - thermalvalue);
+                    (thermalvalue - rtlpriv->dm.thermalvalue) :
+                    (rtlpriv->dm.thermalvalue - thermalvalue);
         } else {
                 delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ?
-                        (thermalvalue - rtlefuse->eeprom_thermalmeter) :
-                        (rtlefuse->eeprom_thermalmeter - thermalvalue);
+                    (thermalvalue - rtlefuse->eeprom_thermalmeter) :
+                    (rtlefuse->eeprom_thermalmeter - thermalvalue);
         }
         delta_lck = (thermalvalue > rtlpriv->dm.thermalvalue_lck) ?
-                    (thermalvalue - rtlpriv->dm.thermalvalue_lck) :
-                    (rtlpriv->dm.thermalvalue_lck - thermalvalue);
+            (thermalvalue - rtlpriv->dm.thermalvalue_lck) :
+            (rtlpriv->dm.thermalvalue_lck - thermalvalue);
         delta_iqk = (thermalvalue > rtlpriv->dm.thermalvalue_iqk) ?
-                    (thermalvalue - rtlpriv->dm.thermalvalue_iqk) :
-                    (rtlpriv->dm.thermalvalue_iqk - thermalvalue);
+            (thermalvalue - rtlpriv->dm.thermalvalue_iqk) :
+            (rtlpriv->dm.thermalvalue_iqk - thermalvalue);
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                 "eeprom_thermalmeter 0x%x delta 0x%x "
-                 "delta_lck 0x%x delta_iqk 0x%x\n",
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x delta 0x%x delta_lck 0x%x delta_iqk 0x%x\n",
                  thermalvalue, rtlpriv->dm.thermalvalue,
                  rtlefuse->eeprom_thermalmeter, delta, delta_lck,
                  delta_iqk);
@@ -1024,28 +1057,35 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                 rtl88e_phy_lc_calibrate(hw);
         }
 
-        /* 7 If necessary, move the index of swing table to adjust Tx power. */
+        /* 7 If necessary, move the index of
+         * swing table to adjust Tx power.
+         */
         if (delta > 0 && rtlpriv->dm.txpower_track_control) {
                 delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ?
-                        (thermalvalue - rtlefuse->eeprom_thermalmeter) :
-                        (rtlefuse->eeprom_thermalmeter - thermalvalue);
+                    (thermalvalue - rtlefuse->eeprom_thermalmeter) :
+                    (rtlefuse->eeprom_thermalmeter - thermalvalue);
 
                 /* 7.1 Get the final CCK_index and OFDM_index for each
                  * swing table.
                  */
                 if (thermalvalue > rtlefuse->eeprom_thermalmeter) {
-                        CAL_SWING_OFF(off, power_inc, IDX_MAP, delta);
+                        CAL_SWING_OFF(offset, power_inc, INDEX_MAPPING_NUM,
+                                      delta);
                         for (i = 0; i < rf; i++)
-                                ofdm_index[i] = rtldm->ofdm_index[i] +
-                                                del_tbl_idx[power_inc][off];
+                                ofdm_index[i] =
+                                  rtldm->ofdm_index[i] +
+                                  delta_swing_table_idx[power_inc][offset];
                         cck_index = rtldm->cck_index +
-                                    del_tbl_idx[power_inc][off];
+                                delta_swing_table_idx[power_inc][offset];
                 } else {
-                        CAL_SWING_OFF(off, dec, IDX_MAP, delta);
+                        CAL_SWING_OFF(offset, power_dec, INDEX_MAPPING_NUM,
+                                      delta);
                         for (i = 0; i < rf; i++)
-                                ofdm_index[i] = rtldm->ofdm_index[i] +
-                                                del_tbl_idx[dec][off];
-                        cck_index = rtldm->cck_index + del_tbl_idx[dec][off];
+                                ofdm_index[i] =
+                                  rtldm->ofdm_index[i] +
+                                  delta_swing_table_idx[power_dec][offset];
+                        cck_index = rtldm->cck_index +
+                                delta_swing_table_idx[power_dec][offset];
                 }
 
                 /* 7.2 Handle boundary conditions of index.*/
@@ -1056,8 +1096,8 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                 ofdm_index[i] = ofdm_min_index;
                 }
 
-                if (cck_index > CCK_TABLE_SIZE - 1)
-                        cck_index = CCK_TABLE_SIZE - 1;
+                if (cck_index > CCK_TABLE_SIZE-1)
+                        cck_index = CCK_TABLE_SIZE-1;
                 else if (cck_index < 0)
                         cck_index = 0;
 
@@ -1065,10 +1105,7 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                 if (rtlpriv->dm.txpower_track_control) {
                         rtldm->done_txpower = true;
                         rtldm->swing_idx_ofdm[RF90_PATH_A] =
-                                 (u8)ofdm_index[RF90_PATH_A];
-                        if (is2t)
-                                rtldm->swing_idx_ofdm[RF90_PATH_B] =
-                                         (u8)ofdm_index[RF90_PATH_B];
+                                (u8)ofdm_index[RF90_PATH_A];
                         rtldm->swing_idx_cck = cck_index;
                         if (rtldm->swing_idx_ofdm_cur !=
                             rtldm->swing_idx_ofdm[0]) {
@@ -1082,12 +1119,7 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                 rtldm->swing_flag_cck = true;
                         }
 
-                        rtl88e_chk_tx_track(hw, TXAGC, 0, 0);
-
-                        if (is2t)
-                                rtl88e_chk_tx_track(hw, BBSWING,
-                                                    RF90_PATH_B,
-                                                    index_for_channel);
+                        dm_tx_pwr_track_set_pwr(hw, TXAGC, 0, 0);
                 }
         }
 
@@ -1115,7 +1147,7 @@ static void rtl88e_dm_init_txpower_tracking(struct ieee80211_hw *hw)
         rtlpriv->dm.swing_idx_ofdm_cur = 12;
         rtlpriv->dm.swing_flag_ofdm = false;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 "  rtlpriv->dm.txpower_tracking = %d\n",
+                 "rtlpriv->dm.txpower_tracking = %d\n",
                  rtlpriv->dm.txpower_tracking);
 }
 
@@ -1137,7 +1169,7 @@ void rtl88e_dm_check_txpower_tracking(struct ieee80211_hw *hw)
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Schedule TxPowerTracking !!\n");
-                rtl88e_dm_txpower_tracking_callback_thermalmeter(hw);
+                                dm_txpower_track_cb_therm(hw);
                 tm_trigger = 0;
         }
 }
@@ -1145,7 +1177,7 @@ void rtl88e_dm_check_txpower_tracking(struct ieee80211_hw *hw)
 void rtl88e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rate_adaptive *p_ra = &(rtlpriv->ra);
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
 
         p_ra->ratr_state = DM_RATR_STA_INIT;
         p_ra->pre_ratr_state = DM_RATR_STA_INIT;
@@ -1161,9 +1193,9 @@ static void rtl88e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct rate_adaptive *p_ra = &(rtlpriv->ra);
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
+        u32 low_rssithresh_for_ra, high_rssithresh_for_ra;
         struct ieee80211_sta *sta = NULL;
-        u32 low_rssi, hi_rssi;
 
         if (is_hal_stop(rtlhal)) {
                 RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
@@ -1181,26 +1213,28 @@ static void rtl88e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
             mac->opmode == NL80211_IFTYPE_STATION) {
                 switch (p_ra->pre_ratr_state) {
                 case DM_RATR_STA_HIGH:
-                        hi_rssi = 50;
-                        low_rssi = 20;
+                        high_rssithresh_for_ra = 50;
+                        low_rssithresh_for_ra = 20;
                         break;
                 case DM_RATR_STA_MIDDLE:
-                        hi_rssi = 55;
-                        low_rssi = 20;
+                        high_rssithresh_for_ra = 55;
+                        low_rssithresh_for_ra = 20;
                         break;
                 case DM_RATR_STA_LOW:
-                        hi_rssi = 50;
-                        low_rssi = 25;
+                        high_rssithresh_for_ra = 50;
+                        low_rssithresh_for_ra = 25;
                         break;
                 default:
-                        hi_rssi = 50;
-                        low_rssi = 20;
+                        high_rssithresh_for_ra = 50;
+                        low_rssithresh_for_ra = 20;
                         break;
                 }
 
-                if (rtlpriv->dm.undec_sm_pwdb > (long)hi_rssi)
+                if (rtlpriv->dm.undec_sm_pwdb >
+                    (long)high_rssithresh_for_ra)
                         p_ra->ratr_state = DM_RATR_STA_HIGH;
-                else if (rtlpriv->dm.undec_sm_pwdb > (long)low_rssi)
+                else if (rtlpriv->dm.undec_sm_pwdb >
+                         (long)low_rssithresh_for_ra)
                         p_ra->ratr_state = DM_RATR_STA_MIDDLE;
                 else
                         p_ra->ratr_state = DM_RATR_STA_LOW;
@@ -1208,7 +1242,7 @@ static void rtl88e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
                 if (p_ra->pre_ratr_state != p_ra->ratr_state) {
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
                                  "RSSI = %ld\n",
-                                 rtlpriv->dm.undec_sm_pwdb);
+                                  rtlpriv->dm.undec_sm_pwdb);
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
                                  "RSSI_LEVEL = %d\n", p_ra->ratr_state);
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
@@ -1219,7 +1253,7 @@ static void rtl88e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
                         sta = rtl_find_sta(hw, mac->bssid);
                         if (sta)
                                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
-                                                   p_ra->ratr_state);
+                                                                   p_ra->ratr_state);
                         rcu_read_unlock();
 
                         p_ra->pre_ratr_state = p_ra->ratr_state;
@@ -1239,56 +1273,62 @@ static void rtl92c_dm_init_dynamic_bb_powersaving(struct ieee80211_hw *hw)
         dm_pstable->rssi_val_min = 0;
 }
 
-static void rtl88e_dm_update_rx_idle_ant(struct ieee80211_hw *hw, u8 ant)
+static void rtl88e_dm_update_rx_idle_ant(struct ieee80211_hw *hw,
+                                         u8 ant)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
-        u32 def_ant, opt_ant;
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
+        u32 default_ant, optional_ant;
 
-        if (fat_tbl->rx_idle_ant != ant) {
+        if (pfat_table->rx_idle_ant != ant) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "need to update rx idle ant\n");
                 if (ant == MAIN_ANT) {
-                        def_ant = (fat_tbl->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
-                                   MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
-                        opt_ant = (fat_tbl->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
-                                   AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
+                        default_ant =
+                          (pfat_table->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
+                          MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
+                        optional_ant =
+                          (pfat_table->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
+                          AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
                 } else {
-                        def_ant = (fat_tbl->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
-                                   AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
-                        opt_ant = (fat_tbl->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
-                                   MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
+                        default_ant =
+                           (pfat_table->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
+                           AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
+                        optional_ant =
+                           (pfat_table->rx_idle_ant == CG_TRX_HW_ANTDIV) ?
+                           MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
                 }
 
                 if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) {
-                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(5) |
-                                      BIT(4) | BIT(3), def_ant);
-                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(8) |
-                                      BIT(7) | BIT(6), opt_ant);
-                        rtl_set_bbreg(hw, DM_REG_ANTSEL_CTRL_11N, BIT(14) |
-                                      BIT(13) | BIT(12), def_ant);
-                        rtl_set_bbreg(hw, DM_REG_RESP_TX_11N, BIT(6) | BIT(7),
-                                      def_ant);
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N,
+                                      BIT(5) | BIT(4) | BIT(3), default_ant);
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N,
+                                      BIT(8) | BIT(7) | BIT(6), optional_ant);
+                        rtl_set_bbreg(hw, DM_REG_ANTSEL_CTRL_11N,
+                                      BIT(14) | BIT(13) | BIT(12),
+                                      default_ant);
+                        rtl_set_bbreg(hw, DM_REG_RESP_TX_11N,
+                                      BIT(6) | BIT(7), default_ant);
                 } else if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV) {
-                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(5) |
-                                      BIT(4) | BIT(3), def_ant);
-                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(8) |
-                                      BIT(7) | BIT(6), opt_ant);
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N,
+                                      BIT(5) | BIT(4) | BIT(3), default_ant);
+                        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N,
+                                      BIT(8) | BIT(7) | BIT(6), optional_ant);
                 }
         }
-        fat_tbl->rx_idle_ant = ant;
+        pfat_table->rx_idle_ant = ant;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "RxIdleAnt %s\n",
-                 ((ant == MAIN_ANT) ? ("MAIN_ANT") : ("AUX_ANT")));
+                 (ant == MAIN_ANT) ? ("MAIN_ANT") : ("AUX_ANT"));
 }
 
 static void rtl88e_dm_update_tx_ant(struct ieee80211_hw *hw,
-        u8 ant, u32 mac_id)
+                                    u8 ant, u32 mac_id)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
         u8 target_ant;
 
         if (ant == MAIN_ANT)
@@ -1296,23 +1336,25 @@ static void rtl88e_dm_update_tx_ant(struct ieee80211_hw *hw,
         else
                 target_ant = AUX_ANT_CG_TRX;
 
-        fat_tbl->antsel_a[mac_id] = target_ant & BIT(0);
-        fat_tbl->antsel_b[mac_id] = (target_ant & BIT(1)) >> 1;
-        fat_tbl->antsel_c[mac_id] = (target_ant & BIT(2)) >> 2;
+        pfat_table->antsel_a[mac_id] = target_ant & BIT(0);
+        pfat_table->antsel_b[mac_id] = (target_ant & BIT(1)) >> 1;
+        pfat_table->antsel_c[mac_id] = (target_ant & BIT(2)) >> 2;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "txfrominfo target ant %s\n",
-                 ((ant == MAIN_ANT) ? ("MAIN_ANT") : ("AUX_ANT")));
+                (ant == MAIN_ANT) ? ("MAIN_ANT") : ("AUX_ANT"));
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "antsel_tr_mux = 3'b%d%d%d\n",
-                 fat_tbl->antsel_c[mac_id],
-                 fat_tbl->antsel_b[mac_id], fat_tbl->antsel_a[mac_id]);
+                pfat_table->antsel_c[mac_id],
+                pfat_table->antsel_b[mac_id],
+                pfat_table->antsel_a[mac_id]);
 }
 
 static void rtl88e_dm_rx_hw_antena_div_init(struct ieee80211_hw *hw)
 {
         u32  value32;
+
         /*MAC Setting*/
         value32 = rtl_get_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD);
-        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD, value32 |
-                     (BIT(23) | BIT(25)));
+        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N,
+                      MASKDWORD, value32 | (BIT(23) | BIT(25)));
         /*Pin Setting*/
         rtl_set_bbreg(hw, DM_REG_PIN_CTRL_11N, BIT(9) | BIT(8), 0);
         rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(10), 0);
@@ -1333,8 +1375,8 @@ static void rtl88e_dm_trx_hw_antenna_div_init(struct ieee80211_hw *hw)
 
         /*MAC Setting*/
         value32 = rtl_get_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD);
-        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD, value32 |
-                     (BIT(23) | BIT(25)));
+        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD,
+                      value32 | (BIT(23) | BIT(25)));
         /*Pin Setting*/
         rtl_set_bbreg(hw, DM_REG_PIN_CTRL_11N, BIT(9) | BIT(8), 0);
         rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(10), 0);
@@ -1354,28 +1396,30 @@ static void rtl88e_dm_trx_hw_antenna_div_init(struct ieee80211_hw *hw)
 static void rtl88e_dm_fast_training_init(struct ieee80211_hw *hw)
 {
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
-        u32 ant_combo = 2;
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
+        u32 ant_combination = 2;
         u32 value32, i;
 
         for (i = 0; i < 6; i++) {
-                fat_tbl->bssid[i] = 0;
-                fat_tbl->ant_sum[i] = 0;
-                fat_tbl->ant_cnt[i] = 0;
-                fat_tbl->ant_ave[i] = 0;
+                pfat_table->bssid[i] = 0;
+                pfat_table->ant_sum[i] = 0;
+                pfat_table->ant_cnt[i] = 0;
+                pfat_table->ant_ave[i] = 0;
         }
-        fat_tbl->train_idx = 0;
-        fat_tbl->fat_state = FAT_NORMAL_STATE;
+        pfat_table->train_idx = 0;
+        pfat_table->fat_state = FAT_NORMAL_STATE;
 
         /*MAC Setting*/
         value32 = rtl_get_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD);
-        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N, MASKDWORD, value32 | (BIT(23) |
-                      BIT(25)));
-        value32 = rtl_get_bbreg(hw, DM_REG_ANT_TRAIN_2, MASKDWORD);
-        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_2, MASKDWORD, value32 | (BIT(16) |
-                      BIT(17)));
-        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_2, MASKLWORD, 0);
-        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_1, MASKDWORD, 0);
+        rtl_set_bbreg(hw, DM_REG_ANTSEL_PIN_11N,
+                      MASKDWORD, value32 | (BIT(23) | BIT(25)));
+        value32 = rtl_get_bbreg(hw, DM_REG_ANT_TRAIN_PARA2_11N, MASKDWORD);
+        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_PARA2_11N,
+                      MASKDWORD, value32 | (BIT(16) | BIT(17)));
+        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_PARA2_11N,
+                      MASKLWORD, 0);
+        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_PARA1_11N,
+                      MASKDWORD, 0);
 
         /*Pin Setting*/
         rtl_set_bbreg(hw, DM_REG_PIN_CTRL_11N, BIT(9) | BIT(8), 0);
@@ -1386,26 +1430,17 @@ static void rtl88e_dm_fast_training_init(struct ieee80211_hw *hw)
         /*OFDM Setting*/
         rtl_set_bbreg(hw, DM_REG_ANTDIV_PARA1_11N, MASKDWORD, 0x000000a0);
         /*antenna mapping table*/
-        if (ant_combo == 2) {
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE0, 1);
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE1, 2);
-        } else if (ant_combo == 7) {
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE0, 1);
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE1, 2);
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE2, 2);
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE3, 3);
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING2_11N, MASKBYTE0, 4);
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING2_11N, MASKBYTE1, 5);
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING2_11N, MASKBYTE2, 6);
-                rtl_set_bbreg(hw, DM_REG_ANT_MAPPING2_11N, MASKBYTE3, 7);
-        }
+        rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE0, 1);
+        rtl_set_bbreg(hw, DM_REG_ANT_MAPPING1_11N, MASKBYTE1, 2);
 
         /*TX Setting*/
         rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N, BIT(21), 1);
-        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(5) | BIT(4) | BIT(3), 0);
-        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(8) | BIT(7) | BIT(6), 1);
-        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(2) | BIT(1) | BIT(0),
-                      (ant_combo - 1));
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N,
+                      BIT(5) | BIT(4) | BIT(3), 0);
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N,
+                      BIT(8) | BIT(7) | BIT(6), 1);
+        rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N,
+                      BIT(2) | BIT(1) | BIT(0), (ant_combination - 1));
 
         rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 1);
 }
@@ -1420,6 +1455,7 @@ static void rtl88e_dm_antenna_div_init(struct ieee80211_hw *hw)
                 rtl88e_dm_trx_hw_antenna_div_init(hw);
         else if (rtlefuse->antenna_div_type == CG_TRX_SMART_ANTDIV)
                 rtl88e_dm_fast_training_init(hw);
+
 }
 
 void rtl88e_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw,
@@ -1427,38 +1463,39 @@ void rtl88e_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw,
 {
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
 
         if ((rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) ||
-            (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)) {
-                SET_TX_DESC_ANTSEL_A(pdesc, fat_tbl->antsel_a[mac_id]);
-                SET_TX_DESC_ANTSEL_B(pdesc, fat_tbl->antsel_b[mac_id]);
-                SET_TX_DESC_ANTSEL_C(pdesc, fat_tbl->antsel_c[mac_id]);
+            (rtlefuse->antenna_div_type == CG_TRX_SMART_ANTDIV)) {
+                SET_TX_DESC_ANTSEL_A(pdesc, pfat_table->antsel_a[mac_id]);
+                SET_TX_DESC_ANTSEL_B(pdesc, pfat_table->antsel_b[mac_id]);
+                SET_TX_DESC_ANTSEL_C(pdesc, pfat_table->antsel_c[mac_id]);
         }
 }
 
 void rtl88e_dm_ant_sel_statistics(struct ieee80211_hw *hw,
-                                  u8 antsel_tr_mux, u32 mac_id, u32 rx_pwdb_all)
+                                  u8 antsel_tr_mux, u32 mac_id,
+                                  u32 rx_pwdb_all)
 {
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
 
         if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) {
                 if (antsel_tr_mux == MAIN_ANT_CG_TRX) {
-                        fat_tbl->main_ant_sum[mac_id] += rx_pwdb_all;
-                        fat_tbl->main_ant_cnt[mac_id]++;
+                        pfat_table->main_ant_sum[mac_id] += rx_pwdb_all;
+                        pfat_table->main_ant_cnt[mac_id]++;
                 } else {
-                        fat_tbl->aux_ant_sum[mac_id] += rx_pwdb_all;
-                        fat_tbl->aux_ant_cnt[mac_id]++;
+                        pfat_table->aux_ant_sum[mac_id] += rx_pwdb_all;
+                        pfat_table->aux_ant_cnt[mac_id]++;
                 }
         } else if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV) {
                 if (antsel_tr_mux == MAIN_ANT_CGCS_RX) {
-                        fat_tbl->main_ant_sum[mac_id] += rx_pwdb_all;
-                        fat_tbl->main_ant_cnt[mac_id]++;
+                        pfat_table->main_ant_sum[mac_id] += rx_pwdb_all;
+                        pfat_table->main_ant_cnt[mac_id]++;
                 } else {
-                        fat_tbl->aux_ant_sum[mac_id] += rx_pwdb_all;
-                        fat_tbl->aux_ant_cnt[mac_id]++;
+                        pfat_table->aux_ant_sum[mac_id] += rx_pwdb_all;
+                        pfat_table->aux_ant_cnt[mac_id]++;
                 }
         }
 }
@@ -1466,43 +1503,43 @@ void rtl88e_dm_ant_sel_statistics(struct ieee80211_hw *hw,
 static void rtl88e_dm_hw_ant_div(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
         struct rtl_sta_info *drv_priv;
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
-        u32 i, min_rssi = 0xff, ant_div_max_rssi = 0, max_rssi = 0;
-        u32 local_min_rssi, local_max_rssi;
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        u32 i, min_rssi = 0xff, ant_div_max_rssi = 0;
+        u32 max_rssi = 0, local_min_rssi, local_max_rssi;
         u32 main_rssi, aux_rssi;
         u8 rx_idle_ant = 0, target_ant = 7;
 
+        /*for sta its self*/
         i = 0;
-        main_rssi = (fat_tbl->main_ant_cnt[i] != 0) ?
-                    (fat_tbl->main_ant_sum[i] /
-                     fat_tbl->main_ant_cnt[i]) : 0;
-        aux_rssi = (fat_tbl->aux_ant_cnt[i] != 0) ?
-                (fat_tbl->aux_ant_sum[i] / fat_tbl->aux_ant_cnt[i]) : 0;
+        main_rssi = (pfat_table->main_ant_cnt[i] != 0) ?
+                (pfat_table->main_ant_sum[i] / pfat_table->main_ant_cnt[i]) : 0;
+        aux_rssi = (pfat_table->aux_ant_cnt[i] != 0) ?
+                (pfat_table->aux_ant_sum[i] / pfat_table->aux_ant_cnt[i]) : 0;
         target_ant = (main_rssi == aux_rssi) ?
-                     fat_tbl->rx_idle_ant : ((main_rssi >= aux_rssi) ?
-                     MAIN_ANT : AUX_ANT);
+                pfat_table->rx_idle_ant : ((main_rssi >= aux_rssi) ?
+                MAIN_ANT : AUX_ANT);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "main_ant_sum %d main_ant_cnt %d\n",
-                 fat_tbl->main_ant_sum[i], fat_tbl->main_ant_cnt[i]);
+                "main_ant_sum %d main_ant_cnt %d\n",
+                pfat_table->main_ant_sum[i],
+                pfat_table->main_ant_cnt[i]);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "aux_ant_sum %d aux_ant_cnt %d\n",
-                 fat_tbl->aux_ant_sum[i],
-                 fat_tbl->aux_ant_cnt[i]);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "main_rssi %d aux_rssi%d\n", main_rssi, aux_rssi);
+                 pfat_table->aux_ant_sum[i], pfat_table->aux_ant_cnt[i]);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "main_rssi %d aux_rssi%d\n",
+                 main_rssi, aux_rssi);
         local_max_rssi = (main_rssi > aux_rssi) ? main_rssi : aux_rssi;
         if ((local_max_rssi > ant_div_max_rssi) && (local_max_rssi < 40))
                 ant_div_max_rssi = local_max_rssi;
         if (local_max_rssi > max_rssi)
                 max_rssi = local_max_rssi;
 
-        if ((fat_tbl->rx_idle_ant == MAIN_ANT) && (main_rssi == 0))
+        if ((pfat_table->rx_idle_ant == MAIN_ANT) && (main_rssi == 0))
                 main_rssi = aux_rssi;
-        else if ((fat_tbl->rx_idle_ant == AUX_ANT) && (aux_rssi == 0))
+        else if ((pfat_table->rx_idle_ant == AUX_ANT) && (aux_rssi == 0))
                 aux_rssi = main_rssi;
 
         local_min_rssi = (main_rssi > aux_rssi) ? aux_rssi : main_rssi;
@@ -1518,32 +1555,33 @@ static void rtl88e_dm_hw_ant_div(struct ieee80211_hw *hw)
                 spin_lock_bh(&rtlpriv->locks.entry_list_lock);
                 list_for_each_entry(drv_priv, &rtlpriv->entry_list, list) {
                         i++;
-                        main_rssi = (fat_tbl->main_ant_cnt[i] != 0) ?
-                                (fat_tbl->main_ant_sum[i] /
-                                 fat_tbl->main_ant_cnt[i]) : 0;
-                        aux_rssi = (fat_tbl->aux_ant_cnt[i] != 0) ?
-                                   (fat_tbl->aux_ant_sum[i] /
-                                    fat_tbl->aux_ant_cnt[i]) : 0;
+                        main_rssi = (pfat_table->main_ant_cnt[i] != 0) ?
+                                (pfat_table->main_ant_sum[i] /
+                                pfat_table->main_ant_cnt[i]) : 0;
+                        aux_rssi = (pfat_table->aux_ant_cnt[i] != 0) ?
+                                (pfat_table->aux_ant_sum[i] /
+                                pfat_table->aux_ant_cnt[i]) : 0;
                         target_ant = (main_rssi == aux_rssi) ?
-                                      fat_tbl->rx_idle_ant : ((main_rssi >=
-                                      aux_rssi) ? MAIN_ANT : AUX_ANT);
-
+                                pfat_table->rx_idle_ant : ((main_rssi >=
+                                aux_rssi) ? MAIN_ANT : AUX_ANT);
 
-                        local_max_rssi = max_t(u32, main_rssi, aux_rssi);
+                        local_max_rssi = (main_rssi > aux_rssi) ?
+                                         main_rssi : aux_rssi;
                         if ((local_max_rssi > ant_div_max_rssi) &&
                             (local_max_rssi < 40))
                                 ant_div_max_rssi = local_max_rssi;
                         if (local_max_rssi > max_rssi)
                                 max_rssi = local_max_rssi;
 
-                        if ((fat_tbl->rx_idle_ant == MAIN_ANT) && !main_rssi)
+                        if ((pfat_table->rx_idle_ant == MAIN_ANT) &&
+                            (main_rssi == 0))
                                 main_rssi = aux_rssi;
-                        else if ((fat_tbl->rx_idle_ant == AUX_ANT) &&
+                        else if ((pfat_table->rx_idle_ant == AUX_ANT) &&
                                  (aux_rssi == 0))
                                 aux_rssi = main_rssi;
 
                         local_min_rssi = (main_rssi > aux_rssi) ?
-                                          aux_rssi : main_rssi;
+                                aux_rssi : main_rssi;
                         if (local_min_rssi < min_rssi) {
                                 min_rssi = local_min_rssi;
                                 rx_idle_ant = target_ant;
@@ -1555,10 +1593,10 @@ static void rtl88e_dm_hw_ant_div(struct ieee80211_hw *hw)
         }
 
         for (i = 0; i < ASSOCIATE_ENTRY_NUM; i++) {
-                fat_tbl->main_ant_sum[i] = 0;
-                fat_tbl->aux_ant_sum[i] = 0;
-                fat_tbl->main_ant_cnt[i] = 0;
-                fat_tbl->aux_ant_cnt[i] = 0;
+                pfat_table->main_ant_sum[i] = 0;
+                pfat_table->aux_ant_sum[i] = 0;
+                pfat_table->main_ant_cnt[i] = 0;
+                pfat_table->aux_ant_cnt[i] = 0;
         }
 
         rtl88e_dm_update_rx_idle_ant(hw, rx_idle_ant);
@@ -1573,27 +1611,27 @@ static void rtl88e_set_next_mac_address_target(struct ieee80211_hw *hw)
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
         struct rtl_sta_info *drv_priv;
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
         u32 value32, i, j = 0;
 
         if (mac->link_state >= MAC80211_LINKED) {
                 for (i = 0; i < ASSOCIATE_ENTRY_NUM; i++) {
-                        if ((fat_tbl->train_idx + 1) == ASSOCIATE_ENTRY_NUM)
-                                fat_tbl->train_idx = 0;
+                        if ((pfat_table->train_idx + 1) == ASSOCIATE_ENTRY_NUM)
+                                pfat_table->train_idx = 0;
                         else
-                                fat_tbl->train_idx++;
+                                pfat_table->train_idx++;
 
-                        if (fat_tbl->train_idx == 0) {
+                        if (pfat_table->train_idx == 0) {
                                 value32 = (mac->mac_addr[5] << 8) |
-                                           mac->mac_addr[4];
-                                rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_2,
+                                          mac->mac_addr[4];
+                                rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_PARA2_11N,
                                               MASKLWORD, value32);
 
                                 value32 = (mac->mac_addr[3] << 24) |
                                           (mac->mac_addr[2] << 16) |
                                           (mac->mac_addr[1] << 8) |
-                                           mac->mac_addr[0];
-                                rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_1,
+                                          mac->mac_addr[0];
+                                rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_PARA1_11N,
                                               MASKDWORD, value32);
                                 break;
                         }
@@ -1602,28 +1640,29 @@ static void rtl88e_set_next_mac_address_target(struct ieee80211_hw *hw)
                             NL80211_IFTYPE_STATION) {
                                 spin_lock_bh(&rtlpriv->locks.entry_list_lock);
                                 list_for_each_entry(drv_priv,
-                                                    &rtlpriv->entry_list,
-                                                    list) {
+                                                    &rtlpriv->entry_list, list) {
                                         j++;
-                                        if (j != fat_tbl->train_idx)
+                                        if (j != pfat_table->train_idx)
                                                 continue;
 
                                         value32 = (drv_priv->mac_addr[5] << 8) |
-                                                   drv_priv->mac_addr[4];
-                                        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_2,
+                                                  drv_priv->mac_addr[4];
+                                        rtl_set_bbreg(hw,
+                                                      DM_REG_ANT_TRAIN_PARA2_11N,
                                                       MASKLWORD, value32);
 
-                                        value32 = (drv_priv->mac_addr[3]<<24) |
-                                                  (drv_priv->mac_addr[2]<<16) |
-                                                  (drv_priv->mac_addr[1]<<8) |
-                                                   drv_priv->mac_addr[0];
-                                        rtl_set_bbreg(hw, DM_REG_ANT_TRAIN_1,
+                                        value32 = (drv_priv->mac_addr[3] << 24) |
+                                                  (drv_priv->mac_addr[2] << 16) |
+                                                  (drv_priv->mac_addr[1] << 8) |
+                                                  drv_priv->mac_addr[0];
+                                        rtl_set_bbreg(hw,
+                                                      DM_REG_ANT_TRAIN_PARA1_11N,
                                                       MASKDWORD, value32);
                                         break;
                                 }
                                 spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
                                 /*find entry, break*/
-                                if (j == fat_tbl->train_idx)
+                                if (j == pfat_table->train_idx)
                                         break;
                         }
                 }
@@ -1634,23 +1673,24 @@ static void rtl88e_dm_fast_ant_training(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
         u32 i, max_rssi = 0;
         u8 target_ant = 2;
         bool bpkt_filter_match = false;
 
-        if (fat_tbl->fat_state == FAT_TRAINING_STATE) {
+        if (pfat_table->fat_state == FAT_TRAINING_STATE) {
                 for (i = 0; i < 7; i++) {
-                        if (fat_tbl->ant_cnt[i] == 0) {
-                                fat_tbl->ant_ave[i] = 0;
+                        if (pfat_table->ant_cnt[i] == 0) {
+                                pfat_table->ant_ave[i] = 0;
                         } else {
-                                fat_tbl->ant_ave[i] = fat_tbl->ant_sum[i] /
-                                        fat_tbl->ant_cnt[i];
+                                pfat_table->ant_ave[i] =
+                                        pfat_table->ant_sum[i] /
+                                        pfat_table->ant_cnt[i];
                                 bpkt_filter_match = true;
                         }
 
-                        if (fat_tbl->ant_ave[i] > max_rssi) {
-                                max_rssi = fat_tbl->ant_ave[i];
+                        if (pfat_table->ant_ave[i] > max_rssi) {
+                                max_rssi = pfat_table->ant_ave[i];
                                 target_ant = (u8) i;
                         }
                 }
@@ -1664,32 +1704,33 @@ static void rtl88e_dm_fast_ant_training(struct ieee80211_hw *hw)
                                       BIT(16), 0);
                         rtl_set_bbreg(hw, DM_REG_RX_ANT_CTRL_11N, BIT(8) |
                                       BIT(7) | BIT(6), target_ant);
-                        rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N, BIT(21), 1);
+                        rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N,
+                                      BIT(21), 1);
 
-                        fat_tbl->antsel_a[fat_tbl->train_idx] =
-                                  target_ant & BIT(0);
-                        fat_tbl->antsel_b[fat_tbl->train_idx] =
-                                 (target_ant & BIT(1)) >> 1;
-                        fat_tbl->antsel_c[fat_tbl->train_idx] =
-                                 (target_ant & BIT(2)) >> 2;
+                        pfat_table->antsel_a[pfat_table->train_idx] =
+                                target_ant & BIT(0);
+                        pfat_table->antsel_b[pfat_table->train_idx] =
+                                (target_ant & BIT(1)) >> 1;
+                        pfat_table->antsel_c[pfat_table->train_idx] =
+                                (target_ant & BIT(2)) >> 2;
 
                         if (target_ant == 0)
                                 rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 0);
                 }
 
                 for (i = 0; i < 7; i++) {
-                        fat_tbl->ant_sum[i] = 0;
-                        fat_tbl->ant_cnt[i] = 0;
+                        pfat_table->ant_sum[i] = 0;
+                        pfat_table->ant_cnt[i] = 0;
                 }
 
-                fat_tbl->fat_state = FAT_NORMAL_STATE;
+                pfat_table->fat_state = FAT_NORMAL_STATE;
                 return;
         }
 
-        if (fat_tbl->fat_state == FAT_NORMAL_STATE) {
+        if (pfat_table->fat_state == FAT_NORMAL_STATE) {
                 rtl88e_set_next_mac_address_target(hw);
 
-                fat_tbl->fat_state = FAT_TRAINING_STATE;
+                pfat_table->fat_state = FAT_TRAINING_STATE;
                 rtl_set_bbreg(hw, DM_REG_TXAGC_A_1_MCS32_11N, BIT(16), 1);
                 rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 1);
 
@@ -1711,11 +1752,11 @@ static void rtl88e_dm_antenna_diversity(struct ieee80211_hw *hw)
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
-        struct fast_ant_training *fat_tbl = &(rtldm->fat_table);
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
 
         if (mac->link_state < MAC80211_LINKED) {
                 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "No Link\n");
-                if (fat_tbl->becomelinked == true) {
+                if (pfat_table->becomelinked) {
                         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                                  "need to turn off HW AntDiv\n");
                         rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 0);
@@ -1724,12 +1765,13 @@ static void rtl88e_dm_antenna_diversity(struct ieee80211_hw *hw)
                         if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
                                 rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N,
                                               BIT(21), 0);
-                        fat_tbl->becomelinked =
-                          (mac->link_state == MAC80211_LINKED) ? true : false;
+                        pfat_table->becomelinked =
+                                (mac->link_state == MAC80211_LINKED) ?
+                                true : false;
                 }
                 return;
         } else {
-                if (fat_tbl->becomelinked == false) {
+                if (!pfat_table->becomelinked) {
                         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                                  "Need to turn on HW AntDiv\n");
                         rtl_set_bbreg(hw, DM_REG_IGI_A_11N, BIT(7), 1);
@@ -1738,8 +1780,9 @@ static void rtl88e_dm_antenna_diversity(struct ieee80211_hw *hw)
                         if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
                                 rtl_set_bbreg(hw, DM_REG_TX_ANT_CTRL_11N,
                                               BIT(21), 1);
-                        fat_tbl->becomelinked =
-                           (mac->link_state >= MAC80211_LINKED) ? true : false;
+                        pfat_table->becomelinked =
+                                (mac->link_state >= MAC80211_LINKED) ?
+                                true : false;
                 }
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h
index 0e07f72ea158..64f1f3ea9807 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h
@@ -156,7 +156,6 @@
 #define DM_REG_SLEEP_11N                                0xEE0
 #define DM_REG_PMPD_ANAEN_11N                           0xEEC
 
-
 /*MAC REG LIST*/
 #define DM_REG_BB_RST_11N                               0x02
 #define DM_REG_ANTSEL_PIN_11N                           0x4C
@@ -168,8 +167,9 @@
 #define DM_REG_EDCA_BK_11N                              0x50C
 #define DM_REG_TXPAUSE_11N                              0x522
 #define DM_REG_RESP_TX_11N                              0x6D8
-#define DM_REG_ANT_TRAIN_1                              0x7b0
-#define DM_REG_ANT_TRAIN_2                              0x7b4
+#define DM_REG_ANT_TRAIN_PARA1_11N                      0x7b0
+#define DM_REG_ANT_TRAIN_PARA2_11N                      0x7b4
+
 
 /*DIG Related*/
 #define DM_BIT_IGI_11N                                  0x0000007F
@@ -208,7 +208,7 @@
 #define DM_DIG_BACKOFF_MIN                              -4
 #define DM_DIG_BACKOFF_DEFAULT                          10
 
-#define RXPATHSELECTION_SS_TH_LOW                       30
+#define RXPATHSELECTION_SS_TH_W                         30
 #define RXPATHSELECTION_DIFF_TH                         18
 
 #define DM_RATR_STA_INIT                                0
@@ -232,20 +232,22 @@
 
 #define TX_POWER_NEAR_FIELD_THRESH_LVL2                 74
 #define TX_POWER_NEAR_FIELD_THRESH_LVL1                 67
-#define TXPWRTRACK_MAX_IDX                              6
+#define TXPWRTRACK_MAX_IDX                               6
 
 struct swat_t {
         u8 failure_cnt;
         u8 try_flag;
         u8 stop_trying;
+
         long pre_rssi;
         long trying_threshold;
         u8 cur_antenna;
         u8 pre_antenna;
+
 };
 
 enum FAT_STATE {
-        FAT_NORMAL_STATE        = 0,
+        FAT_NORMAL_STATE = 0,
         FAT_TRAINING_STATE = 1,
 };
 
@@ -310,8 +312,9 @@ enum pwr_track_control_method {
 
 void rtl88e_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw,
                                      u8 *pdesc, u32 mac_id);
-void rtl88e_dm_ant_sel_statistics(struct ieee80211_hw *hw, u8 antsel_tr_mux,
-                                  u32 mac_id, u32 rx_pwdb_all);
+void rtl88e_dm_ant_sel_statistics(struct ieee80211_hw *hw,
+                                  u8 antsel_tr_mux, u32 mac_id,
+                                  u32 rx_pwdb_all);
 void rtl88e_dm_fast_antenna_training_callback(unsigned long data);
 void rtl88e_dm_init(struct ieee80211_hw *hw);
 void rtl88e_dm_watchdog(struct ieee80211_hw *hw);
@@ -320,7 +323,5 @@ void rtl88e_dm_init_edca_turbo(struct ieee80211_hw *hw);
 void rtl88e_dm_check_txpower_tracking(struct ieee80211_hw *hw);
 void rtl88e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw);
 void rtl88e_dm_txpower_track_adjust(struct ieee80211_hw *hw,
-                                    u8 type, u8 *pdirection,
-                                    u32 *poutwrite_val);
-
+        u8 type, u8 *pdirection, u32 *poutwrite_val);
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c
index 4f9376ad4739..c8058aa73ecf 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,12 +26,11 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "fw.h"
 
-#include <linux/kmemleak.h>
-
 static void _rtl88e_enable_fw_download(struct ieee80211_hw *hw, bool enable)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -62,26 +57,26 @@ static void _rtl88e_fw_block_write(struct ieee80211_hw *hw,
                                    const u8 *buffer, u32 size)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 blk_sz = sizeof(u32);
-        u8 *buf_ptr = (u8 *)buffer;
+        u32 blocksize = sizeof(u32);
+        u8 *bufferptr = (u8 *)buffer;
         u32 *pu4BytePtr = (u32 *)buffer;
-        u32 i, offset, blk_cnt, remain;
+        u32 i, offset, blockcount, remainsize;
 
-        blk_cnt = size / blk_sz;
-        remain = size % blk_sz;
+        blockcount = size / blocksize;
+        remainsize = size % blocksize;
 
-        for (i = 0; i < blk_cnt; i++) {
-                offset = i * blk_sz;
+        for (i = 0; i < blockcount; i++) {
+                offset = i * blocksize;
                 rtl_write_dword(rtlpriv, (FW_8192C_START_ADDRESS + offset),
                                 *(pu4BytePtr + i));
         }
 
-        if (remain) {
-                offset = blk_cnt * blk_sz;
-                buf_ptr += offset;
-                for (i = 0; i < remain; i++) {
+        if (remainsize) {
+                offset = blockcount * blocksize;
+                bufferptr += offset;
+                for (i = 0; i < remainsize; i++) {
                         rtl_write_byte(rtlpriv, (FW_8192C_START_ADDRESS +
-                                                 offset + i), *(buf_ptr + i));
+                                                 offset + i), *(bufferptr + i));
                 }
         }
 }
@@ -119,32 +114,33 @@ static void _rtl88e_write_fw(struct ieee80211_hw *hw,
                              enum version_8188e version, u8 *buffer, u32 size)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 *buf_ptr = buffer;
-        u32 page_no, remain;
+        u8 *bufferptr = (u8 *)buffer;
+        u32 pagenums, remainsize;
         u32 page, offset;
 
         RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "FW size is %d bytes,\n", size);
 
-        _rtl88e_fill_dummy(buf_ptr, &size);
+        _rtl88e_fill_dummy(bufferptr, &size);
 
-        page_no = size / FW_8192C_PAGE_SIZE;
-        remain = size % FW_8192C_PAGE_SIZE;
+        pagenums = size / FW_8192C_PAGE_SIZE;
+        remainsize = size % FW_8192C_PAGE_SIZE;
 
-        if (page_no > 8) {
+        if (pagenums > 8) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Page numbers should not greater then 8\n");
         }
 
-        for (page = 0; page < page_no; page++) {
+        for (page = 0; page < pagenums; page++) {
                 offset = page * FW_8192C_PAGE_SIZE;
-                _rtl88e_fw_page_write(hw, page, (buf_ptr + offset),
+                _rtl88e_fw_page_write(hw, page, (bufferptr + offset),
                                       FW_8192C_PAGE_SIZE);
         }
 
-        if (remain) {
-                offset = page_no * FW_8192C_PAGE_SIZE;
-                page = page_no;
-                _rtl88e_fw_page_write(hw, page, (buf_ptr + offset), remain);
+        if (remainsize) {
+                offset = pagenums * FW_8192C_PAGE_SIZE;
+                page = pagenums;
+                _rtl88e_fw_page_write(hw, page, (bufferptr + offset),
+                                      remainsize);
         }
 }
 
@@ -199,7 +195,8 @@ exit:
         return err;
 }
 
-int rtl88e_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
+int rtl88e_download_fw(struct ieee80211_hw *hw,
+                       bool buse_wake_on_wlan_fw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -221,8 +218,8 @@ int rtl88e_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
                          "Firmware Version(%d), Signature(%#x), Size(%d)\n",
-                         pfwheader->version, pfwheader->signature,
-                         (int)sizeof(struct rtl92c_firmware_header));
+                          pfwheader->version, pfwheader->signature,
+                          (int)sizeof(struct rtl92c_firmware_header));
 
                 pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
                 fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
@@ -237,9 +234,14 @@ int rtl88e_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
         _rtl88e_enable_fw_download(hw, false);
 
         err = _rtl88e_fw_free_to_go(hw);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Firmware is not ready to run!\n");
+        } else {
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                         "Firmware is ready to run!\n");
+        }
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                 "Firmware is%s ready to run!\n", err ? " not" : "");
         return 0;
 }
 
@@ -266,9 +268,9 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
         bool isfw_read = false;
         u8 buf_index = 0;
         bool write_sucess = false;
-        u8 wait_h2c_limit = 100;
+        u8 wait_h2c_limmit = 100;
         u8 wait_writeh2c_limit = 100;
-        u8 boxc[4], boxext[2];
+        u8 boxcontent[4], boxextcontent[4];
         u32 h2c_waitcounter = 0;
         unsigned long flag;
         u8 idx;
@@ -331,18 +333,17 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
                         box_extreg = REG_HMEBOX_EXT_3;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
                         break;
                 }
-
                 isfw_read = _rtl88e_check_fw_read_last_h2c(hw, boxnum);
                 while (!isfw_read) {
-                        wait_h2c_limit--;
-                        if (wait_h2c_limit == 0) {
+                        wait_h2c_limmit--;
+                        if (wait_h2c_limmit == 0) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         "Waiting too long for FW read "
-                                         "clear HMEBox(%d)!\n", boxnum);
+                                         "Waiting too long for FW read clear HMEBox(%d)!\n",
+                                         boxnum);
                                 break;
                         }
 
@@ -351,20 +352,20 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
                         isfw_read = _rtl88e_check_fw_read_last_h2c(hw, boxnum);
                         u1b_tmp = rtl_read_byte(rtlpriv, 0x130);
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "Waiting for FW read clear HMEBox(%d)!!! "
-                                 "0x130 = %2x\n", boxnum, u1b_tmp);
+                                 "Waiting for FW read clear HMEBox(%d)!!! 0x130 = %2x\n",
+                                 boxnum, u1b_tmp);
                 }
 
                 if (!isfw_read) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "Write H2C register BOX[%d] fail!!!!! "
-                                 "Fw do not read.\n", boxnum);
+                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
+                                 boxnum);
                         break;
                 }
 
-                memset(boxc, 0, sizeof(boxc));
-                memset(boxext, 0, sizeof(boxext));
-                boxc[0] = element_id;
+                memset(boxcontent, 0, sizeof(boxcontent));
+                memset(boxextcontent, 0, sizeof(boxextcontent));
+                boxcontent[0] = element_id;
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                          "Write element_id box_reg(%4x) = %2x\n",
                          box_reg, element_id);
@@ -373,33 +374,38 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
                 case 1:
                 case 2:
                 case 3:
-                        /*boxc[0] &= ~(BIT(7));*/
-                        memcpy((u8 *)(boxc) + 1, cmd_b + buf_index, cmd_len);
+                        /*boxcontent[0] &= ~(BIT(7));*/
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmd_b + buf_index, cmd_len);
 
-                        for (idx = 0; idx < 4; idx++)
-                                rtl_write_byte(rtlpriv, box_reg+idx, boxc[idx]);
+                        for (idx = 0; idx < 4; idx++) {
+                                rtl_write_byte(rtlpriv, box_reg + idx,
+                                               boxcontent[idx]);
+                        }
                         break;
                 case 4:
                 case 5:
                 case 6:
                 case 7:
-                        /*boxc[0] |= (BIT(7));*/
-                        memcpy((u8 *)(boxext), cmd_b + buf_index+3, cmd_len-3);
-                        memcpy((u8 *)(boxc) + 1, cmd_b + buf_index, 3);
+                        /*boxcontent[0] |= (BIT(7));*/
+                        memcpy((u8 *)(boxextcontent),
+                               cmd_b + buf_index+3, cmd_len-3);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmd_b + buf_index, 3);
 
                         for (idx = 0; idx < 2; idx++) {
                                 rtl_write_byte(rtlpriv, box_extreg + idx,
-                                               boxext[idx]);
+                                               boxextcontent[idx]);
                         }
 
                         for (idx = 0; idx < 4; idx++) {
                                 rtl_write_byte(rtlpriv, box_reg + idx,
-                                               boxc[idx]);
+                                               boxcontent[idx]);
                         }
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
                         break;
                 }
 
@@ -411,7 +417,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
 
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                          "pHalData->last_hmeboxnum  = %d\n",
-                         rtlhal->last_hmeboxnum);
+                          rtlhal->last_hmeboxnum);
         }
 
         spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
@@ -422,18 +428,19 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
 }
 
 void rtl88e_fill_h2c_cmd(struct ieee80211_hw *hw,
-                         u8 element_id, u32 cmd_len, u8 *cmd_b)
+                         u8 element_id, u32 cmd_len, u8 *cmdbuffer)
 {
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 tmp_cmdbuf[2];
 
-        if (rtlhal->fw_ready == false) {
-                RT_ASSERT(false, "fail H2C cmd - Fw download fail!!!\n");
+        if (!rtlhal->fw_ready) {
+                RT_ASSERT(false,
+                          "return H2C cmd because of Fw download fail!!!\n");
                 return;
         }
 
         memset(tmp_cmdbuf, 0, 8);
-        memcpy(tmp_cmdbuf, cmd_b, cmd_len);
+        memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
         _rtl88e_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
 
         return;
@@ -448,7 +455,8 @@ void rtl88e_firmware_selfreset(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp & (~BIT(2))));
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp | BIT(2)));
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "8051Reset88E(): 8051 reset success.\n");
+                 "8051Reset88E(): 8051 reset success\n");
+
 }
 
 void rtl88e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
@@ -456,28 +464,29 @@ void rtl88e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 u1_h2c_set_pwrmode[H2C_88E_PWEMODE_LENGTH] = { 0 };
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        u8 power_state = 0;
-
+        u8 rlbm, power_state = 0;
         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
+
         SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));
-        SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, 0);
+        rlbm = 0;/*YJ, temp, 120316. FW now not support RLBM=2.*/
+        SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, rlbm);
         SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
-                                         (rtlpriv->mac80211.p2p) ?
-                                         ppsc->smart_ps : 1);
+                (rtlpriv->mac80211.p2p) ? ppsc->smart_ps : 1);
         SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(u1_h2c_set_pwrmode,
-                                               ppsc->reg_max_lps_awakeintvl);
+                ppsc->reg_max_lps_awakeintvl);
         SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(u1_h2c_set_pwrmode, 0);
         if (mode == FW_PS_ACTIVE_MODE)
                 power_state |= FW_PWR_STATE_ACTIVE;
         else
                 power_state |= FW_PWR_STATE_RF_OFF;
+
         SET_H2CCMD_PWRMODE_PARM_PWR_STATE(u1_h2c_set_pwrmode, power_state);
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                       "rtl92c_set_fw_pwrmode(): u1_h2c_set_pwrmode\n",
                       u1_h2c_set_pwrmode, H2C_88E_PWEMODE_LENGTH);
-        rtl88e_fill_h2c_cmd(hw, H2C_88E_SETPWRMODE, H2C_88E_PWEMODE_LENGTH,
-                            u1_h2c_set_pwrmode);
+        rtl88e_fill_h2c_cmd(hw, H2C_88E_SETPWRMODE,
+                            H2C_88E_PWEMODE_LENGTH, u1_h2c_set_pwrmode);
 }
 
 void rtl88e_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
@@ -499,39 +508,9 @@ void rtl88e_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,
         SET_H2CCMD_AP_OFFLOAD_HIDDEN(u1_apoffload_parm, mac->hiddenssid);
         SET_H2CCMD_AP_OFFLOAD_DENYANY(u1_apoffload_parm, 0);
 
-        rtl88e_fill_h2c_cmd(hw, H2C_88E_AP_OFFLOAD, H2C_88E_AP_OFFLOAD_LENGTH,
-                            u1_apoffload_parm);
-}
+        rtl88e_fill_h2c_cmd(hw, H2C_88E_AP_OFFLOAD,
+                            H2C_88E_AP_OFFLOAD_LENGTH, u1_apoffload_parm);
 
-static bool _rtl88e_cmd_send_packet(struct ieee80211_hw *hw,
-                                    struct sk_buff *skb)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        struct rtl8192_tx_ring *ring;
-        struct rtl_tx_desc *pdesc;
-        struct sk_buff *pskb = NULL;
-        unsigned long flags;
-
-        ring = &rtlpci->tx_ring[BEACON_QUEUE];
-
-        pskb = __skb_dequeue(&ring->queue);
-        if (pskb)
-                kfree_skb(pskb);
-
-        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
-
-        pdesc = &ring->desc[0];
-
-        rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *)pdesc, 1, 1, skb);
-
-        __skb_queue_tail(&ring->queue, skb);
-
-        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-
-        rtlpriv->cfg->ops->tx_polling(hw, BEACON_QUEUE);
-
-        return true;
 }
 
 #define BEACON_PG               0 /* ->1 */
@@ -656,14 +635,15 @@ void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct sk_buff *skb = NULL;
-
         u32 totalpacketlen;
-        u8 u1RsvdPageLoc[5] = { 0 };
-
+        bool rtstatus;
+        u8 u1rsvdpageloc[5] = { 0 };
+        bool b_dlok = false;
         u8 *beacon;
-        u8 *pspoll;
+        u8 *p_pspoll;
         u8 *nullfunc;
-        u8 *probersp;
+        u8 *p_probersp;
+
         /*---------------------------------------------------------
          *                      (1) beacon
          *---------------------------------------------------------
@@ -676,12 +656,12 @@ void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
          *                      (2) ps-poll
          *--------------------------------------------------------
          */
-        pspoll = &reserved_page_packet[PSPOLL_PG * 128];
-        SET_80211_PS_POLL_AID(pspoll, (mac->assoc_id | 0xc000));
-        SET_80211_PS_POLL_BSSID(pspoll, mac->bssid);
-        SET_80211_PS_POLL_TA(pspoll, mac->mac_addr);
+        p_pspoll = &reserved_page_packet[PSPOLL_PG * 128];
+        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
@@ -692,18 +672,18 @@ void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
         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
          *----------------------------------------------------------
          */
-        probersp = &reserved_page_packet[PROBERSP_PG * 128];
-        SET_80211_HDR_ADDRESS1(probersp, mac->bssid);
-        SET_80211_HDR_ADDRESS2(probersp, mac->mac_addr);
-        SET_80211_HDR_ADDRESS3(probersp, mac->bssid);
+        p_probersp = &reserved_page_packet[PROBERSP_PG * 128];
+        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;
 
@@ -712,33 +692,36 @@ void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                       "rtl88e_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
-                      u1RsvdPageLoc, 3);
+                      u1rsvdpageloc, 3);
 
         skb = dev_alloc_skb(totalpacketlen);
-        if (!skb)
-                return;
-        kmemleak_not_leak(skb);
         memcpy(skb_put(skb, totalpacketlen),
                &reserved_page_packet, totalpacketlen);
 
-        if (_rtl88e_cmd_send_packet(hw, skb)) {
+        rtstatus = rtl_cmd_send_packet(hw, skb);
+
+        if (rtstatus)
+                b_dlok = true;
+
+        if (b_dlok) {
                 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, 3);
+                              "H2C_RSVDPAGE:\n", u1rsvdpageloc, 3);
                 rtl88e_fill_h2c_cmd(hw, H2C_88E_RSVDPAGE,
-                                    sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
+                                    sizeof(u1rsvdpageloc), u1rsvdpageloc);
         } else
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Set RSVD page location to Fw FAIL!!!!!!.\n");
 }
 
-/*Shoud check FW support p2p or not.*/
+/*Should check FW support p2p or not.*/
 static void rtl88e_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw, u8 ctwindow)
 {
-        u8 u1_ctwindow_period[1] = {ctwindow};
+        u8 u1_ctwindow_period[1] = { ctwindow};
 
         rtl88e_fill_h2c_cmd(hw, H2C_88E_P2P_PS_CTW_CMD, 1, u1_ctwindow_period);
+
 }
 
 void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
@@ -755,7 +738,7 @@ void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
         switch (p2p_ps_state) {
         case P2P_PS_DISABLE:
                 RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
-                memset(p2p_ps_offload, 0, sizeof(struct p2p_ps_offload_t));
+                memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));
                 break;
         case P2P_PS_ENABLE:
                 RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
@@ -765,8 +748,9 @@ void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
                         ctwindow = p2pinfo->ctwindow;
                         rtl88e_set_p2p_ctw_period_cmd(hw, ctwindow);
                 }
+
                 /* hw only support 2 set of NoA */
-                for (i = 0; i < p2pinfo->noa_num; i++) {
+                for (i = 0 ; i < p2pinfo->noa_num; i++) {
                         /* To control the register setting for which NOA*/
                         rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
                         if (i == 0)
@@ -785,7 +769,7 @@ void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
 
                         start_time = p2pinfo->noa_start_time[i];
                         if (p2pinfo->noa_count_type[i] != 1) {
-                                while (start_time <= (tsf_low + (50 * 1024))) {
+                                while (start_time <= (tsf_low+(50*1024))) {
                                         start_time += p2pinfo->noa_interval[i];
                                         if (p2pinfo->noa_count_type[i] != 255)
                                                 p2pinfo->noa_count_type[i]--;
@@ -804,7 +788,7 @@ void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
 
                         if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
                                 p2p_ps_offload->role = 1;
-                                p2p_ps_offload->allstasleep = 0;
+                                p2p_ps_offload->allstasleep = -1;
                         } else {
                                 p2p_ps_offload->role = 0;
                         }
@@ -827,4 +811,5 @@ void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
 
         rtl88e_fill_h2c_cmd(hw, H2C_88E_P2P_PS_OFFLOAD, 1,
                             (u8 *)p2p_ps_offload);
+
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.h b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.h
index 854a9875cd5f..05e944e451f4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.h
@@ -55,10 +55,11 @@
 #define H2C_88E_AOAC_RSVDPAGE_LOC_LEN           7
 
 /* Fw PS state for RPWM.
- * BIT[2:0] = HW state
- * BIT[3] = Protocol PS state, 1: register active state, 0: register sleep state
- * BIT[4] = sub-state
- */
+*BIT[2:0] = HW state
+*BIT[3] = Protocol PS state,
+*1: register active state , 0: register sleep state
+*BIT[4] = sub-state
+*/
 #define FW_PS_GO_ON                     BIT(0)
 #define FW_PS_TX_NULL                   BIT(1)
 #define FW_PS_RF_ON                     BIT(2)
@@ -98,10 +99,13 @@
 #define FW_PS_STATE_S2                  (FW_PS_RF_OFF)
 #define FW_PS_STATE_S3                  (FW_PS_ALL_ON)
 #define FW_PS_STATE_S4                  ((FW_PS_ST_ACTIVE) | (FW_PS_ALL_ON))
-
+/* ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))*/
 #define FW_PS_STATE_ALL_ON_88E          (FW_PS_CLOCK_ON)
+/* (FW_PS_RF_ON)*/
 #define FW_PS_STATE_RF_ON_88E           (FW_PS_CLOCK_ON)
-#define FW_PS_STATE_RF_OFF_88E          (FW_PS_CLOCK_ON)
+/* 0x0*/
+#define FW_PS_STATE_RF_OFF_88E  (FW_PS_CLOCK_ON)
+/* (FW_PS_STATE_RF_OFF)*/
 #define FW_PS_STATE_RF_OFF_LOW_PWR_88E  (FW_PS_CLOCK_OFF)
 
 #define FW_PS_STATE_ALL_ON_92C          (FW_PS_STATE_S4)
@@ -146,7 +150,7 @@ struct rtl92c_firmware_header {
         u32 rsvd5;
 };
 
-enum rtl8192c_h2c_cmd {
+enum rtl8188e_h2c_cmd {
         H2C_88E_RSVDPAGE = 0,
         H2C_88E_JOINBSSRPT = 1,
         H2C_88E_SCAN = 2,
@@ -175,7 +179,7 @@ enum rtl8192c_h2c_cmd {
         H2C_88E_AOAC_GLOBAL_INFO = 0x82,
         H2C_88E_AOAC_RSVDPAGE = 0x83,
 #endif
-        /* Not defined in new 88E H2C CMD Format */
+        /*Not defined in new 88E H2C CMD Format*/
         H2C_88E_RA_MASK,
         H2C_88E_SELECTIVE_SUSPEND_ROF_CMD,
         H2C_88E_P2P_PS_MODE,
@@ -289,13 +293,12 @@ enum rtl8192c_h2c_cmd {
 int rtl88e_download_fw(struct ieee80211_hw *hw,
                        bool buse_wake_on_wlan_fw);
 void rtl88e_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
-                         u32 cmd_len, u8 *p_cmdbuffer);
+                         u32 cmd_len, u8 *cmdbuffer);
 void rtl88e_firmware_selfreset(struct ieee80211_hw *hw);
 void rtl88e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
-void rtl88e_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw,
-                                      u8 mstatus);
-void rtl88e_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,  u8 enable);
+void rtl88e_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);
+void rtl88e_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,
+                                   u8 ap_offload_enable);
 void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
 void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
-
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
index d840ad7bdf65..f2b9713c456e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -93,7 +89,9 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE];
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
         while (skb_queue_len(&ring->queue)) {
                 struct rtl_tx_desc *entry = &ring->desc[ring->idx];
                 struct sk_buff *skb = __skb_dequeue(&ring->queue);
@@ -105,6 +103,7 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw)
                 kfree_skb(skb);
                 ring->idx = (ring->idx + 1) % ring->entries;
         }
+        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
 }
 
 static void _rtl88ee_disable_bcn_sub_func(struct ieee80211_hw *hw)
@@ -113,16 +112,16 @@ static void _rtl88ee_disable_bcn_sub_func(struct ieee80211_hw *hw)
 }
 
 static void _rtl88ee_set_fw_clock_on(struct ieee80211_hw *hw,
-                                     u8 rpwm_val, bool need_turn_off_ckk)
+                                     u8 rpwm_val, bool b_need_turn_off_ckk)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        bool support_remote_wake_up;
+        bool b_support_remote_wake_up;
         u32 count = 0, isr_regaddr, content;
-        bool schedule_timer = need_turn_off_ckk;
-
+        bool schedule_timer = b_need_turn_off_ckk;
         rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
-                                      (u8 *)(&support_remote_wake_up));
+                                        (u8 *)(&b_support_remote_wake_up));
+
         if (!rtlhal->fw_ready)
                 return;
         if (!rtlpriv->psc.fw_current_inpsmode)
@@ -133,8 +132,9 @@ static void _rtl88ee_set_fw_clock_on(struct ieee80211_hw *hw,
                 if (rtlhal->fw_clk_change_in_progress) {
                         while (rtlhal->fw_clk_change_in_progress) {
                                 spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                                count++;
                                 udelay(100);
-                                if (++count > 1000)
+                                if (count > 1000)
                                         return;
                                 spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
                         }
@@ -173,6 +173,7 @@ static void _rtl88ee_set_fw_clock_on(struct ieee80211_hw *hw,
                         mod_timer(&rtlpriv->works.fw_clockoff_timer,
                                   jiffies + MSECS(10));
                 }
+
         } else  {
                 spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
                 rtlhal->fw_clk_change_in_progress = false;
@@ -247,11 +248,9 @@ static void _rtl88ee_set_fw_ps_rf_on(struct ieee80211_hw *hw)
 static void _rtl88ee_set_fw_ps_rf_off_low_power(struct ieee80211_hw *hw)
 {
         u8 rpwm_val = 0;
-
         rpwm_val |= FW_PS_STATE_RF_OFF_LOW_PWR_88E;
         _rtl88ee_set_fw_clock_off(hw, rpwm_val);
 }
-
 void rtl88ee_fw_clk_off_timer_callback(unsigned long data)
 {
         struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
@@ -325,23 +324,23 @@ void rtl88ee_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;
-                        u32 val_rcr;
-
-                        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE,
-                                                      (u8 *)(&rfstate));
-                        if (rfstate == ERFOFF) {
+                enum rf_pwrstate rfstate;
+                u32 val_rcr;
+
+                rtlpriv->cfg->ops->get_hw_reg(hw,
+                                              HW_VAR_RF_STATE,
+                                              (u8 *)(&rfstate));
+                if (rfstate == ERFOFF) {
+                        *((bool *)(val)) = true;
+                } else {
+                        val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
+                        val_rcr &= 0x00070000;
+                        if (val_rcr)
+                                *((bool *)(val)) = false;
+                        else
                                 *((bool *)(val)) = true;
-                        } else {
-                                val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
-                                val_rcr &= 0x00070000;
-                                if (val_rcr)
-                                        *((bool *)(val)) = false;
-                                else
-                                        *((bool *)(val)) = true;
-                        }
-                        break;
                 }
+                break; }
         case HW_VAR_FW_PSMODE_STATUS:
                 *((bool *)(val)) = ppsc->fw_current_inpsmode;
                 break;
@@ -373,25 +372,32 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
         switch (variable) {
         case HW_VAR_ETHER_ADDR:
-                for (idx = 0; idx < ETH_ALEN; idx++)
-                        rtl_write_byte(rtlpriv, (REG_MACID + idx), val[idx]);
+                for (idx = 0; idx < ETH_ALEN; idx++) {
+                        rtl_write_byte(rtlpriv, (REG_MACID + idx),
+                                       val[idx]);
+                }
                 break;
         case HW_VAR_BASIC_RATE:{
-                u16 rate_cfg = ((u16 *)val)[0];
+                u16 b_rate_cfg = ((u16 *)val)[0];
                 u8 rate_index = 0;
-                rate_cfg = rate_cfg & 0x15f;
-                rate_cfg |= 0x01;
-                rtl_write_byte(rtlpriv, REG_RRSR, rate_cfg & 0xff);
-                rtl_write_byte(rtlpriv, REG_RRSR + 1, (rate_cfg >> 8) & 0xff);
-                while (rate_cfg > 0x1) {
-                        rate_cfg = (rate_cfg >> 1);
+                b_rate_cfg = b_rate_cfg & 0x15f;
+                b_rate_cfg |= 0x01;
+                rtl_write_byte(rtlpriv, REG_RRSR, b_rate_cfg & 0xff);
+                rtl_write_byte(rtlpriv, REG_RRSR + 1,
+                               (b_rate_cfg >> 8) & 0xff);
+                while (b_rate_cfg > 0x1) {
+                        b_rate_cfg = (b_rate_cfg >> 1);
                         rate_index++;
                 }
-                rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, rate_index);
-                break; }
+                rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL,
+                               rate_index);
+                break;
+                }
         case HW_VAR_BSSID:
-                for (idx = 0; idx < ETH_ALEN; idx++)
-                        rtl_write_byte(rtlpriv, (REG_BSSID + idx), val[idx]);
+                for (idx = 0; idx < ETH_ALEN; idx++) {
+                        rtl_write_byte(rtlpriv, (REG_BSSID + idx),
+                                       val[idx]);
+                }
                 break;
         case HW_VAR_SIFS:
                 rtl_write_byte(rtlpriv, REG_SIFS_CTX + 1, val[0]);
@@ -401,7 +407,8 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
 
                 if (!mac->ht_enable)
-                        rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM, 0x0e0e);
+                        rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
+                                       0x0e0e);
                 else
                         rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
                                        *((u16 *)val));
@@ -418,17 +425,20 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
                                                       &e_aci);
                 }
-                break; }
+                break;
+                }
         case HW_VAR_ACK_PREAMBLE:{
                 u8 reg_tmp;
                 u8 short_preamble = (bool)*val;
                 reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL+2);
                 if (short_preamble) {
                         reg_tmp |= 0x02;
-                        rtl_write_byte(rtlpriv, REG_TRXPTCL_CTL + 2, reg_tmp);
+                        rtl_write_byte(rtlpriv, REG_TRXPTCL_CTL +
+                                       2, reg_tmp);
                 } else {
                         reg_tmp |= 0xFD;
-                        rtl_write_byte(rtlpriv, REG_TRXPTCL_CTL + 2, reg_tmp);
+                        rtl_write_byte(rtlpriv, REG_TRXPTCL_CTL +
+                                       2, reg_tmp);
                 }
                 break; }
         case HW_VAR_WPA_CONFIG:
@@ -446,7 +456,8 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 min_spacing_to_set = sec_min_space;
 
                         mac->min_space_cfg = ((mac->min_space_cfg &
-                                               0xf8) | min_spacing_to_set);
+                                               0xf8) |
+                                              min_spacing_to_set);
 
                         *val = min_spacing_to_set;
 
@@ -470,35 +481,44 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                mac->min_space_cfg);
-                break; }
+                break;
+                }
         case HW_VAR_AMPDU_FACTOR:{
                 u8 regtoset_normal[4] = { 0x41, 0xa8, 0x72, 0xb9 };
-                u8 factor;
-                u8 *reg = NULL;
-                u8 id = 0;
-
-                reg = regtoset_normal;
-
-                factor = *val;
-                if (factor <= 3) {
-                        factor = (1 << (factor + 2));
-                        if (factor > 0xf)
-                                factor = 0xf;
-
-                        for (id = 0; id < 4; id++) {
-                                if ((reg[id] & 0xf0) > (factor << 4))
-                                        reg[id] = (reg[id] & 0x0f) |
-                                                  (factor << 4);
+                u8 factor_toset;
+                u8 *p_regtoset = NULL;
+                u8 index = 0;
+
+                p_regtoset = regtoset_normal;
+
+                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++) {
+                                if ((p_regtoset[index] & 0xf0) >
+                                    (factor_toset << 4))
+                                        p_regtoset[index] =
+                                            (p_regtoset[index] & 0x0f) |
+                                            (factor_toset << 4);
+
+                                if ((p_regtoset[index] & 0x0f) >
+                                    factor_toset)
+                                        p_regtoset[index] =
+                                            (p_regtoset[index] & 0xf0) |
+                                            (factor_toset);
+
+                                rtl_write_byte(rtlpriv,
+                                               (REG_AGGLEN_LMT + index),
+                                               p_regtoset[index]);
 
-                                if ((reg[id] & 0x0f) > factor)
-                                        reg[id] = (reg[id] & 0xf0) | (factor);
-
-                                rtl_write_byte(rtlpriv, (REG_AGGLEN_LMT + id),
-                                               reg[id]);
                         }
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 "Set HW_VAR_AMPDU_FACTOR: %#x\n", factor);
+                                 "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                  factor_toset);
                 }
                 break; }
         case HW_VAR_AC_PARAM:{
@@ -506,7 +526,8 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtl88e_dm_init_edca_turbo(hw);
 
                 if (rtlpci->acm_method != EACMWAY2_SW)
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL,
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_ACM_CTRL,
                                                       &e_aci);
                 break; }
         case HW_VAR_ACM_CTRL:{
@@ -516,7 +537,8 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 u8 acm = p_aci_aifsn->f.acm;
                 u8 acm_ctrl = rtl_read_byte(rtlpriv, REG_ACMHWCTRL);
 
-                acm_ctrl = acm_ctrl | ((rtlpci->acm_method == 2) ? 0x0 : 0x1);
+                acm_ctrl = acm_ctrl |
+                           ((rtlpci->acm_method == 2) ? 0x0 : 0x1);
 
                 if (acm) {
                         switch (e_aci) {
@@ -609,66 +631,76 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         _rtl88ee_fwlps_enter(hw);
                  else
                         _rtl88ee_fwlps_leave(hw);
+
                  break; }
         case HW_VAR_H2C_FW_JOINBSSRPT:{
                 u8 mstatus = *val;
-                u8 tmp, tmp_reg422, uval;
+                u8 tmp_regcr, tmp_reg422, bcnvalid_reg;
                 u8 count = 0, dlbcn_count = 0;
-                bool recover = false;
+                bool b_recover = false;
 
                 if (mstatus == RT_MEDIA_CONNECT) {
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID, NULL);
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID,
+                                                      NULL);
 
-                        tmp = rtl_read_byte(rtlpriv, REG_CR + 1);
-                        rtl_write_byte(rtlpriv, REG_CR + 1, (tmp | BIT(0)));
+                        tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
+                        rtl_write_byte(rtlpriv, REG_CR + 1,
+                                       (tmp_regcr | BIT(0)));
 
                         _rtl88ee_set_bcn_ctrl_reg(hw, 0, BIT(3));
                         _rtl88ee_set_bcn_ctrl_reg(hw, BIT(4), 0);
 
-                        tmp_reg422 = rtl_read_byte(rtlpriv,
-                                                   REG_FWHW_TXQ_CTRL + 2);
+                        tmp_reg422 =
+                            rtl_read_byte(rtlpriv,
+                                          REG_FWHW_TXQ_CTRL + 2);
                         rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
                                        tmp_reg422 & (~BIT(6)));
                         if (tmp_reg422 & BIT(6))
-                                recover = true;
+                                b_recover = true;
 
                         do {
-                                uval = rtl_read_byte(rtlpriv, REG_TDECTRL+2);
+                                bcnvalid_reg = rtl_read_byte(rtlpriv,
+                                                             REG_TDECTRL+2);
                                 rtl_write_byte(rtlpriv, REG_TDECTRL+2,
-                                               (uval | BIT(0)));
+                                               (bcnvalid_reg | BIT(0)));
                                 _rtl88ee_return_beacon_queue_skb(hw);
 
                                 rtl88e_set_fw_rsvdpagepkt(hw, 0);
-                                uval = rtl_read_byte(rtlpriv, REG_TDECTRL+2);
+                                bcnvalid_reg = rtl_read_byte(rtlpriv,
+                                                             REG_TDECTRL+2);
                                 count = 0;
-                                while (!(uval & BIT(0)) && count < 20) {
+                                while (!(bcnvalid_reg & BIT(0)) && count < 20) {
                                         count++;
                                         udelay(10);
-                                        uval = rtl_read_byte(rtlpriv,
-                                                             REG_TDECTRL+2);
+                                        bcnvalid_reg =
+                                          rtl_read_byte(rtlpriv, REG_TDECTRL+2);
                                 }
                                 dlbcn_count++;
-                        } while (!(uval & BIT(0)) && dlbcn_count < 5);
+                        } while (!(bcnvalid_reg & BIT(0)) && dlbcn_count < 5);
 
-                        if (uval & BIT(0))
+                        if (bcnvalid_reg & BIT(0))
                                 rtl_write_byte(rtlpriv, REG_TDECTRL+2, BIT(0));
 
                         _rtl88ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
                         _rtl88ee_set_bcn_ctrl_reg(hw, 0, BIT(4));
 
-                        if (recover) {
-                                rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
+                        if (b_recover) {
+                                rtl_write_byte(rtlpriv,
+                                               REG_FWHW_TXQ_CTRL + 2,
                                                tmp_reg422);
                         }
-                        rtl_write_byte(rtlpriv, REG_CR + 1, (tmp & ~(BIT(0))));
+
+                        rtl_write_byte(rtlpriv, REG_CR + 1,
+                                       (tmp_regcr & ~(BIT(0))));
                 }
-                rtl88e_set_fw_joinbss_report_cmd(hw, *val);
+                rtl88e_set_fw_joinbss_report_cmd(hw, (*(u8 *)val));
                 break; }
         case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
                 rtl88e_set_p2p_ps_offload_cmd(hw, *val);
                 break;
         case HW_VAR_AID:{
                 u16 u2btmp;
+
                 u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
                 u2btmp &= 0xC000;
                 rtl_write_word(rtlpriv, REG_BCN_PSR_RPT, (u2btmp |
@@ -677,21 +709,29 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_CORRECT_TSF:{
                 u8 btype_ibss = *val;
 
-                if (btype_ibss == true)
+                if (btype_ibss)
                         _rtl88ee_stop_tx_beacon(hw);
 
                 _rtl88ee_set_bcn_ctrl_reg(hw, 0, BIT(3));
 
                 rtl_write_dword(rtlpriv, REG_TSFTR,
-                                (u32) (mac->tsf & 0xffffffff));
+                                (u32)(mac->tsf & 0xffffffff));
                 rtl_write_dword(rtlpriv, REG_TSFTR + 4,
-                                (u32) ((mac->tsf >> 32) & 0xffffffff));
+                                (u32)((mac->tsf >> 32) & 0xffffffff));
 
                 _rtl88ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
 
-                if (btype_ibss == true)
+                if (btype_ibss)
                         _rtl88ee_resume_tx_beacon(hw);
                 break; }
+        case HW_VAR_KEEP_ALIVE: {
+                u8 array[2];
+
+                array[0] = 0xff;
+                array[1] = *((u8 *)val);
+                rtl88e_fill_h2c_cmd(hw, H2C_88E_KEEP_ALIVE_CTRL,
+                                    2, array);
+                break; }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "switch case not process %x\n", variable);
@@ -740,7 +780,7 @@ static bool _rtl88ee_llt_table_init(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_RQPN_NPQ, 0x01);
         rtl_write_dword(rtlpriv, REG_RQPN, 0x80730d29);
 
-
+        /*0x2600   MaxRxBuff=10k-max(TxReportSize(64*8), WOLPattern(16*24)) */
         rtl_write_dword(rtlpriv, REG_TRXFF_BNDY, (0x25FF0000 | txpktbuf_bndy));
         rtl_write_byte(rtlpriv, REG_TDECTRL + 1, txpktbuf_bndy);
 
@@ -797,10 +837,11 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
         u8 bytetmp;
         u16 wordtmp;
 
-        /*Disable XTAL OUTPUT for power saving. YJ, add, 111206. */
+        /*Disable XTAL OUTPUT for power saving. YJ,add,111206. */
         bytetmp = rtl_read_byte(rtlpriv, REG_XCK_OUT_CTRL) & (~BIT(0));
         rtl_write_byte(rtlpriv, REG_XCK_OUT_CTRL, bytetmp);
         /*Auto Power Down to CHIP-off State*/
@@ -811,7 +852,7 @@ static bool _rtl88ee_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,
-                                      Rtl8188E_NIC_ENABLE_FLOW)) {
+                                      RTL8188EE_NIC_ENABLE_FLOW)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "init MAC Fail as rtl_hal_pwrseqcmdparsing\n");
                 return false;
@@ -853,8 +894,6 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
                         return false;
                 }
         }
-
-
         rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff);
         rtl_write_dword(rtlpriv, REG_HISRE, 0xffffffff);
 
@@ -889,9 +928,8 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
                         DMA_BIT_MASK(32));
 
         /* if we want to support 64 bit DMA, we should set it here,
-         * but at the moment we do not support 64 bit DMA
+         * but now we do not support 64 bit DMA
          */
-
         rtl_write_dword(rtlpriv, REG_INT_MIG, 0);
 
         rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0);
@@ -910,8 +948,12 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
 static void _rtl88ee_hw_configure(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 reg_prsr;
+        u8 reg_bw_opmode;
+        u32 reg_ratr, reg_prsr;
 
+        reg_bw_opmode = BW_OPMODE_20MHZ;
+        reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
+            RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
         reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
 
         rtl_write_dword(rtlpriv, REG_RRSR, reg_prsr);
@@ -923,7 +965,7 @@ static void _rtl88ee_enable_aspm_back_door(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         u8 tmp1byte = 0;
-        u32 tmp4Byte = 0, count;
+        u32 tmp4byte = 0, count = 0;
 
         rtl_write_word(rtlpriv, 0x354, 0x8104);
         rtl_write_word(rtlpriv, 0x358, 0x24);
@@ -938,8 +980,8 @@ static void _rtl88ee_enable_aspm_back_door(struct ieee80211_hw *hw)
                 count++;
         }
         if (0 == tmp1byte) {
-                tmp4Byte = rtl_read_dword(rtlpriv, 0x34c);
-                rtl_write_dword(rtlpriv, 0x348, tmp4Byte|BIT(31));
+                tmp4byte = rtl_read_dword(rtlpriv, 0x34c);
+                rtl_write_dword(rtlpriv, 0x348, tmp4byte|BIT(31));
                 rtl_write_word(rtlpriv, 0x350, 0xf70c);
                 rtl_write_byte(rtlpriv, 0x352, 0x1);
         }
@@ -961,12 +1003,14 @@ static void _rtl88ee_enable_aspm_back_door(struct ieee80211_hw *hw)
                 tmp1byte = rtl_read_byte(rtlpriv, 0x352);
                 count++;
         }
+
         if (ppsc->support_backdoor || (0 == tmp1byte)) {
-                tmp4Byte = rtl_read_dword(rtlpriv, 0x34c);
-                rtl_write_dword(rtlpriv, 0x348, tmp4Byte|BIT(11)|BIT(12));
+                tmp4byte = rtl_read_dword(rtlpriv, 0x34c);
+                rtl_write_dword(rtlpriv, 0x348, tmp4byte|BIT(11)|BIT(12));
                 rtl_write_word(rtlpriv, 0x350, 0xf718);
                 rtl_write_byte(rtlpriv, 0x352, 0x1);
         }
+
         tmp1byte = rtl_read_byte(rtlpriv, 0x352);
         count = 0;
         while (tmp1byte && count < 20) {
@@ -983,14 +1027,15 @@ void rtl88ee_enable_hw_security_config(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                 rtlpriv->sec.pairwise_enc_algorithm,
-                 rtlpriv->sec.group_enc_algorithm);
+                  rtlpriv->sec.pairwise_enc_algorithm,
+                  rtlpriv->sec.group_enc_algorithm);
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                          "not open hw encryption\n");
                 return;
         }
+
         sec_reg_value = SCR_TXENCENABLE | SCR_RXDECENABLE;
 
         if (rtlpriv->sec.use_defaultkey) {
@@ -1004,6 +1049,7 @@ void rtl88ee_enable_hw_security_config(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                  "The SECR-value %x\n", sec_reg_value);
+
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 }
 
@@ -1021,7 +1067,6 @@ int rtl88ee_hw_init(struct ieee80211_hw *hw)
         u8 tmp_u1b, u1byte;
         unsigned long flags;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Rtl8188EE hw init\n");
         rtlpriv->rtlhal.being_init_adapter = true;
         /* As this function can take a very long time (up to 350 ms)
          * and can be called with irqs disabled, reenable the irqs
@@ -1032,6 +1077,7 @@ int rtl88ee_hw_init(struct ieee80211_hw *hw)
          */
         local_save_flags(flags);
         local_irq_enable();
+        rtlhal->fw_ready = false;
 
         rtlpriv->intf_ops->disable_aspm(hw);
 
@@ -1057,9 +1103,8 @@ int rtl88ee_hw_init(struct ieee80211_hw *hw)
                          "Failed to download FW. Init HW without FW now..\n");
                 err = 1;
                 goto exit;
-        } else {
-                rtlhal->fw_ready = true;
         }
+        rtlhal->fw_ready = true;
         /*fw related variable initialize */
         rtlhal->last_hmeboxnum = 0;
         rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON_88E;
@@ -1068,10 +1113,10 @@ int rtl88ee_hw_init(struct ieee80211_hw *hw)
         ppsc->fw_current_inpsmode = false;
 
         rtl88e_phy_mac_config(hw);
-        /* because last function modifies RCR, we update
-         * rcr var here, or TP will be unstable for receive_config
-         * is wrong, RX RCR_ACRC32 will cause TP unstable & Rx
-         * RCR_APP_ICV will cause mac80211 disassoc for cisco 1252
+        /* because last function modify RCR, so we update
+         * rcr var here, or TP will unstable for receive_config
+         * is wrong, RX RCR_ACRC32 will cause TP unstabel & Rx
+         * RCR_APP_ICV will cause mac80211 unassoc for cisco 1252
          */
         rtlpci->receive_config &= ~(RCR_ACRC32 | RCR_AICV);
         rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
@@ -1101,15 +1146,14 @@ int rtl88ee_hw_init(struct ieee80211_hw *hw)
         if (ppsc->rfpwr_state == ERFON) {
                 if ((rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV) ||
                     ((rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) &&
-                    (rtlhal->oem_id == RT_CID_819X_HP))) {
+                     (rtlhal->oem_id == RT_CID_819X_HP))) {
                         rtl88e_phy_set_rfpath_switch(hw, true);
                         rtlpriv->dm.fat_table.rx_idle_ant = MAIN_ANT;
                 } else {
                         rtl88e_phy_set_rfpath_switch(hw, false);
                         rtlpriv->dm.fat_table.rx_idle_ant = AUX_ANT;
                 }
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         "rx idle ant %s\n",
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "rx idle ant %s\n",
                          (rtlpriv->dm.fat_table.rx_idle_ant == MAIN_ANT) ?
                          ("MAIN_ANT") : ("AUX_ANT"));
 
@@ -1119,6 +1163,7 @@ int rtl88ee_hw_init(struct ieee80211_hw *hw)
                         rtl88e_phy_iq_calibrate(hw, false);
                         rtlphy->iqk_initialized = true;
                 }
+
                 rtl88e_dm_check_txpower_tracking(hw);
                 rtl88e_phy_lc_calibrate(hw);
         }
@@ -1142,8 +1187,6 @@ int rtl88ee_hw_init(struct ieee80211_hw *hw)
 exit:
         local_irq_restore(flags);
         rtlpriv->rtlhal.being_init_adapter = false;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "end of Rtl8188EE hw init %x\n",
-                 err);
         return err;
 }
 
@@ -1176,62 +1219,67 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw,
                                      enum nl80211_iftype type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 bt_msr = rtl_read_byte(rtlpriv, MSR);
+        u8 bt_msr = rtl_read_byte(rtlpriv, MSR) & 0xfc;
         enum led_ctl_mode ledaction = LED_CTL_NO_LINK;
-        bt_msr &= 0xfc;
-
-        if (type == NL80211_IFTYPE_UNSPECIFIED ||
-            type == NL80211_IFTYPE_STATION) {
-                _rtl88ee_stop_tx_beacon(hw);
-                _rtl88ee_enable_bcn_sub_func(hw);
-        } else if (type == NL80211_IFTYPE_ADHOC ||
-                type == NL80211_IFTYPE_AP ||
-                type == NL80211_IFTYPE_MESH_POINT) {
-                _rtl88ee_resume_tx_beacon(hw);
-                _rtl88ee_disable_bcn_sub_func(hw);
-        } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
-                         type);
-        }
+        u8 mode = MSR_NOLINK;
 
         switch (type) {
         case NL80211_IFTYPE_UNSPECIFIED:
-                bt_msr |= MSR_NOLINK;
-                ledaction = LED_CTL_LINK;
+                mode = MSR_NOLINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
-                bt_msr |= MSR_ADHOC;
+        case NL80211_IFTYPE_MESH_POINT:
+                mode = MSR_ADHOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
-                bt_msr |= MSR_INFRA;
+                mode = MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
-                bt_msr |= MSR_AP;
+                mode = MSR_AP;
+                ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to AP!\n");
                 break;
-        case NL80211_IFTYPE_MESH_POINT:
-                bt_msr |= MSR_ADHOC;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Set Network type to Mesh Point!\n");
-                break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Network type %d not support!\n", type);
                 return 1;
+                break;
+        }
+
+        /* MSR_INFRA == Link in infrastructure network;
+         * MSR_ADHOC == Link in ad hoc network;
+         * Therefore, check link state is necessary.
+         *
+         * MSR_AP == AP mode; link state is not cared here.
+         */
+        if (mode != MSR_AP && rtlpriv->mac80211.link_state < MAC80211_LINKED) {
+                mode = MSR_NOLINK;
+                ledaction = LED_CTL_NO_LINK;
+        }
+
+        if (mode == MSR_NOLINK || mode == MSR_INFRA) {
+                _rtl88ee_stop_tx_beacon(hw);
+                _rtl88ee_enable_bcn_sub_func(hw);
+        } else if (mode == MSR_ADHOC || mode == MSR_AP) {
+                _rtl88ee_resume_tx_beacon(hw);
+                _rtl88ee_disable_bcn_sub_func(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
+                         mode);
         }
 
-        rtl_write_byte(rtlpriv, (MSR), bt_msr);
+        rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
-        if ((bt_msr & MSR_MASK) == MSR_AP)
+        if (mode == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
         else
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);
@@ -1241,13 +1289,12 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw,
 void rtl88ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 reg_rcr;
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 reg_rcr = rtlpci->receive_config;
 
         if (rtlpriv->psc.rfpwr_state != ERFON)
                 return;
 
-        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
-
         if (check_bssid == true) {
                 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
@@ -1259,9 +1306,11 @@ void rtl88ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
                 rtlpriv->cfg->ops->set_hw_reg(hw,
                         HW_VAR_RCR, (u8 *)(&reg_rcr));
         }
+
 }
 
-int rtl88ee_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
+int rtl88ee_set_network_type(struct ieee80211_hw *hw,
+                             enum nl80211_iftype type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
@@ -1279,7 +1328,9 @@ int rtl88ee_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
         return 0;
 }
 
-/* don't set REG_EDCA_BE_PARAM here because mac80211 will send pkt when scan */
+/* don't set REG_EDCA_BE_PARAM here
+ * because mac80211 will send pkt when scan
+ */
 void rtl88ee_set_qos(struct ieee80211_hw *hw, int aci)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1302,22 +1353,41 @@ void rtl88ee_set_qos(struct ieee80211_hw *hw, int aci)
         }
 }
 
+static void rtl88ee_clear_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 tmp;
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISR);
+        rtl_write_dword(rtlpriv, REG_HISR, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISRE);
+        rtl_write_dword(rtlpriv, REG_HISRE, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HSISR);
+        rtl_write_dword(rtlpriv, REG_HSISR, tmp);
+}
+
 void rtl88ee_enable_interrupt(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
-        rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
+        rtl88ee_clear_interrupt(hw);/*clear it here first*/
+        rtl_write_dword(rtlpriv, REG_HIMR,
+                        rtlpci->irq_mask[0] & 0xFFFFFFFF);
+        rtl_write_dword(rtlpriv, REG_HIMRE,
+                        rtlpci->irq_mask[1] & 0xFFFFFFFF);
         rtlpci->irq_enabled = true;
-        /* there are some C2H CMDs have been sent before system interrupt
-         * is enabled, e.g., C2H, CPWM.
-         * So we need to clear all C2H events that FW has notified, otherwise
-         * FW won't schedule any commands anymore.
+        /* there are some C2H CMDs have been sent
+         * before system interrupt is enabled, e.g., C2H, CPWM.
+         * So we need to clear all C2H events that FW has notified,
+         * otherwise FW won't schedule any commands anymore.
          */
         rtl_write_byte(rtlpriv, REG_C2HEVT_CLEAR, 0);
         /*enable system interrupt*/
-        rtl_write_dword(rtlpriv, REG_HSIMR, rtlpci->sys_irq_mask & 0xFFFFFFFF);
+        rtl_write_dword(rtlpriv, REG_HSIMR,
+                        rtlpci->sys_irq_mask & 0xFFFFFFFF);
 }
 
 void rtl88ee_disable_interrupt(struct ieee80211_hw *hw)
@@ -1328,7 +1398,7 @@ void rtl88ee_disable_interrupt(struct ieee80211_hw *hw)
         rtl_write_dword(rtlpriv, REG_HIMR, IMR_DISABLED);
         rtl_write_dword(rtlpriv, REG_HIMRE, IMR_DISABLED);
         rtlpci->irq_enabled = false;
-        synchronize_irq(rtlpci->pdev->irq);
+        /*synchronize_irq(rtlpci->pdev->irq);*/
 }
 
 static void _rtl88ee_poweroff_adapter(struct ieee80211_hw *hw)
@@ -1354,7 +1424,7 @@ static void _rtl88ee_poweroff_adapter(struct ieee80211_hw *hw)
 
         rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
                                  PWR_INTF_PCI_MSK,
-                                 Rtl8188E_NIC_LPS_ENTER_FLOW);
+                                 RTL8188EE_NIC_LPS_ENTER_FLOW);
 
         rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x00);
 
@@ -1369,7 +1439,7 @@ static void _rtl88ee_poweroff_adapter(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_32K_CTRL, (u1b_tmp & (~BIT(0))));
 
         rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-                                 PWR_INTF_PCI_MSK, Rtl8188E_NIC_DISABLE_FLOW);
+                                 PWR_INTF_PCI_MSK, RTL8188EE_NIC_DISABLE_FLOW);
 
         u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL+1);
         rtl_write_byte(rtlpriv, REG_RSV_CTRL+1, (u1b_tmp & (~BIT(3))));
@@ -1426,6 +1496,7 @@ void rtl88ee_interrupt_recognized(struct ieee80211_hw *hw,
 
         *p_intb = rtl_read_dword(rtlpriv, REG_HISRE) & rtlpci->irq_mask[1];
         rtl_write_dword(rtlpriv, REG_HISRE, *p_intb);
+
 }
 
 void rtl88ee_set_beacon_related_registers(struct ieee80211_hw *hw)
@@ -1471,233 +1542,241 @@ void rtl88ee_update_interrupt_mask(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
                  "add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);
 
-        rtl88ee_disable_interrupt(hw);
         if (add_msr)
                 rtlpci->irq_mask[0] |= add_msr;
         if (rm_msr)
                 rtlpci->irq_mask[0] &= (~rm_msr);
+        rtl88ee_disable_interrupt(hw);
         rtl88ee_enable_interrupt(hw);
 }
 
-static inline u8 get_chnl_group(u8 chnl)
+static u8 _rtl88e_get_chnl_group(u8 chnl)
 {
-        u8 group;
-
-        group = chnl / 3;
-        if (chnl == 14)
+        u8 group = 0;
+
+        if (chnl < 3)
+                group = 0;
+        else if (chnl < 6)
+                group = 1;
+        else if (chnl < 9)
+                group = 2;
+        else if (chnl < 12)
+                group = 3;
+        else if (chnl < 14)
+                group = 4;
+        else if (chnl == 14)
                 group = 5;
 
         return group;
 }
 
-static void set_diff0_2g(struct txpower_info_2g *pwr2g, u8 *hwinfo, u32 path,
-                         u32 i, u32 eadr)
-{
-        pwr2g->bw40_diff[path][i] = 0;
-        if (hwinfo[eadr] == 0xFF) {
-                pwr2g->bw20_diff[path][i] = 0x02;
-        } else {
-                pwr2g->bw20_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
-                /*bit sign number to 8 bit sign number*/
-                if (pwr2g->bw20_diff[path][i] & BIT(3))
-                        pwr2g->bw20_diff[path][i] |= 0xF0;
-        }
-
-        if (hwinfo[eadr] == 0xFF) {
-                pwr2g->ofdm_diff[path][i] = 0x04;
-        } else {
-                pwr2g->ofdm_diff[path][i] = (hwinfo[eadr] & 0x0f);
-                /*bit sign number to 8 bit sign number*/
-                if (pwr2g->ofdm_diff[path][i] & BIT(3))
-                        pwr2g->ofdm_diff[path][i] |= 0xF0;
-        }
-        pwr2g->cck_diff[path][i] = 0;
-}
-
-static void set_diff0_5g(struct txpower_info_5g *pwr5g, u8 *hwinfo, u32 path,
-                         u32 i, u32 eadr)
-{
-        pwr5g->bw40_diff[path][i] = 0;
-        if (hwinfo[eadr] == 0xFF) {
-                pwr5g->bw20_diff[path][i] = 0;
-        } else {
-                pwr5g->bw20_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
-                /*bit sign number to 8 bit sign number*/
-                if (pwr5g->bw20_diff[path][i] & BIT(3))
-                        pwr5g->bw20_diff[path][i] |= 0xF0;
-        }
-
-        if (hwinfo[eadr] == 0xFF) {
-                pwr5g->ofdm_diff[path][i] = 0x04;
-        } else {
-                pwr5g->ofdm_diff[path][i] = (hwinfo[eadr] & 0x0f);
-                /*bit sign number to 8 bit sign number*/
-                if (pwr5g->ofdm_diff[path][i] & BIT(3))
-                        pwr5g->ofdm_diff[path][i] |= 0xF0;
-        }
-}
-
-static void set_diff1_2g(struct txpower_info_2g *pwr2g, u8 *hwinfo, u32 path,
-                         u32 i, u32 eadr)
-{
-        if (hwinfo[eadr] == 0xFF) {
-                pwr2g->bw40_diff[path][i] = 0xFE;
-        } else {
-                pwr2g->bw40_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
-                if (pwr2g->bw40_diff[path][i] & BIT(3))
-                        pwr2g->bw40_diff[path][i] |= 0xF0;
-        }
-
-        if (hwinfo[eadr] == 0xFF) {
-                pwr2g->bw20_diff[path][i] = 0xFE;
-        } else {
-                pwr2g->bw20_diff[path][i] = (hwinfo[eadr]&0x0f);
-                if (pwr2g->bw20_diff[path][i] & BIT(3))
-                        pwr2g->bw20_diff[path][i] |= 0xF0;
-        }
-}
-
-static void set_diff1_5g(struct txpower_info_5g *pwr5g, u8 *hwinfo, u32 path,
-                         u32 i, u32 eadr)
+static void set_24g_base(struct txpower_info_2g *pwrinfo24g, u32 rfpath)
 {
-        if (hwinfo[eadr] == 0xFF) {
-                pwr5g->bw40_diff[path][i] = 0xFE;
-        } else {
-                pwr5g->bw40_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
-                if (pwr5g->bw40_diff[path][i] & BIT(3))
-                        pwr5g->bw40_diff[path][i] |= 0xF0;
-        }
+        int group, txcnt;
 
-        if (hwinfo[eadr] == 0xFF) {
-                pwr5g->bw20_diff[path][i] = 0xFE;
-        } else {
-                pwr5g->bw20_diff[path][i] = (hwinfo[eadr] & 0x0f);
-                if (pwr5g->bw20_diff[path][i] & BIT(3))
-                        pwr5g->bw20_diff[path][i] |= 0xF0;
+        for (group = 0 ; group < MAX_CHNL_GROUP_24G; group++) {
+                pwrinfo24g->index_cck_base[rfpath][group] = 0x2D;
+                pwrinfo24g->index_bw40_base[rfpath][group] = 0x2D;
         }
-}
-
-static void set_diff2_2g(struct txpower_info_2g *pwr2g, u8 *hwinfo, u32 path,
-                         u32 i, u32 eadr)
-{
-        if (hwinfo[eadr] == 0xFF) {
-                pwr2g->ofdm_diff[path][i] = 0xFE;
-        } else {
-                pwr2g->ofdm_diff[path][i] = (hwinfo[eadr]&0xf0)>>4;
-                if (pwr2g->ofdm_diff[path][i] & BIT(3))
-                        pwr2g->ofdm_diff[path][i] |= 0xF0;
-        }
-
-        if (hwinfo[eadr] == 0xFF) {
-                pwr2g->cck_diff[path][i] = 0xFE;
-        } else {
-                pwr2g->cck_diff[path][i] = (hwinfo[eadr]&0x0f);
-                if (pwr2g->cck_diff[path][i] & BIT(3))
-                        pwr2g->cck_diff[path][i] |= 0xF0;
+        for (txcnt = 0; txcnt < MAX_TX_COUNT; txcnt++) {
+                if (txcnt == 0) {
+                        pwrinfo24g->bw20_diff[rfpath][0] = 0x02;
+                        pwrinfo24g->ofdm_diff[rfpath][0] = 0x04;
+                } else {
+                        pwrinfo24g->bw20_diff[rfpath][txcnt] = 0xFE;
+                        pwrinfo24g->bw40_diff[rfpath][txcnt] = 0xFE;
+                        pwrinfo24g->cck_diff[rfpath][txcnt] =   0xFE;
+                        pwrinfo24g->ofdm_diff[rfpath][txcnt] = 0xFE;
+                }
         }
 }
 
-static void _rtl8188e_read_power_value_fromprom(struct ieee80211_hw *hw,
-                                                struct txpower_info_2g *pwr2g,
-                                                struct txpower_info_5g *pwr5g,
-                                                bool autoload_fail,
-                                                u8 *hwinfo)
+static void read_power_value_fromprom(struct ieee80211_hw *hw,
+                                      struct txpower_info_2g *pwrinfo24g,
+                                      struct txpower_info_5g *pwrinfo5g,
+                                      bool autoload_fail, u8 *hwinfo)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 path, eadr = EEPROM_TX_PWR_INX, i;
+        u32 rfpath, eeaddr = EEPROM_TX_PWR_INX, group, txcnt = 0;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "hal_ReadPowerValueFromPROM88E(): PROMContent[0x%x]= 0x%x\n",
-                 (eadr+1), hwinfo[eadr+1]);
-        if (0xFF == hwinfo[eadr+1])
+                 "hal_ReadPowerValueFromPROM88E():PROMContent[0x%x]=0x%x\n",
+                 (eeaddr+1), hwinfo[eeaddr+1]);
+        if (0xFF == hwinfo[eeaddr+1])  /*YJ,add,120316*/
                 autoload_fail = true;
 
         if (autoload_fail) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "auto load fail : Use Default value!\n");
-                for (path = 0; path < MAX_RF_PATH; path++) {
+                for (rfpath = 0 ; rfpath < MAX_RF_PATH ; rfpath++) {
                         /* 2.4G default value */
-                        for (i = 0; i < MAX_CHNL_GROUP_24G; i++) {
-                                pwr2g->index_cck_base[path][i] = 0x2D;
-                                pwr2g->index_bw40_base[path][i] = 0x2D;
-                        }
-                        for (i = 0; i < MAX_TX_COUNT; i++) {
-                                if (i == 0) {
-                                        pwr2g->bw20_diff[path][0] = 0x02;
-                                        pwr2g->ofdm_diff[path][0] = 0x04;
-                                } else {
-                                        pwr2g->bw20_diff[path][i] = 0xFE;
-                                        pwr2g->bw40_diff[path][i] = 0xFE;
-                                        pwr2g->cck_diff[path][i] = 0xFE;
-                                        pwr2g->ofdm_diff[path][i] = 0xFE;
-                                }
-                        }
+                        set_24g_base(pwrinfo24g, rfpath);
                 }
                 return;
         }
 
-        for (path = 0; path < MAX_RF_PATH; path++) {
+        for (rfpath = 0 ; rfpath < MAX_RF_PATH ; rfpath++) {
                 /*2.4G default value*/
-                for (i = 0; i < MAX_CHNL_GROUP_24G; i++) {
-                        pwr2g->index_cck_base[path][i] = hwinfo[eadr++];
-                        if (pwr2g->index_cck_base[path][i] == 0xFF)
-                                pwr2g->index_cck_base[path][i] = 0x2D;
+                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;
                 }
-                for (i = 0; i < MAX_CHNL_GROUP_24G; i++) {
-                        pwr2g->index_bw40_base[path][i] = hwinfo[eadr++];
-                        if (pwr2g->index_bw40_base[path][i] == 0xFF)
-                                pwr2g->index_bw40_base[path][i] = 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;
                 }
-                for (i = 0; i < MAX_TX_COUNT; i++) {
-                        if (i == 0) {
-                                set_diff0_2g(pwr2g, hwinfo, path, i, eadr);
-                                eadr++;
+                pwrinfo24g->bw40_diff[rfpath][0] = 0;
+                if (hwinfo[eeaddr] == 0xFF) {
+                        pwrinfo24g->bw20_diff[rfpath][0] = 0x02;
+                } else {
+                        pwrinfo24g->bw20_diff[rfpath][0] =
+                                (hwinfo[eeaddr]&0xf0)>>4;
+                        /*bit sign number to 8 bit sign number*/
+                        if (pwrinfo24g->bw20_diff[rfpath][0] & BIT(3))
+                                pwrinfo24g->bw20_diff[rfpath][0] |= 0xF0;
+                }
+
+                if (hwinfo[eeaddr] == 0xFF) {
+                        pwrinfo24g->ofdm_diff[rfpath][0] = 0x04;
+                } else {
+                        pwrinfo24g->ofdm_diff[rfpath][0] =
+                                (hwinfo[eeaddr]&0x0f);
+                                /*bit sign number to 8 bit sign number*/
+                        if (pwrinfo24g->ofdm_diff[rfpath][0] & BIT(3))
+                                pwrinfo24g->ofdm_diff[rfpath][0] |= 0xF0;
+                }
+                pwrinfo24g->cck_diff[rfpath][0] = 0;
+                eeaddr++;
+                for (txcnt = 1; txcnt < MAX_TX_COUNT; txcnt++) {
+                        if (hwinfo[eeaddr] == 0xFF) {
+                                pwrinfo24g->bw40_diff[rfpath][txcnt] = 0xFE;
+                        } else {
+                                pwrinfo24g->bw40_diff[rfpath][txcnt] =
+                                  (hwinfo[eeaddr]&0xf0)>>4;
+                                if (pwrinfo24g->bw40_diff[rfpath][txcnt] &
+                                    BIT(3))
+                                        pwrinfo24g->bw40_diff[rfpath][txcnt] |=
+                                          0xF0;
+                        }
+
+                        if (hwinfo[eeaddr] == 0xFF) {
+                                pwrinfo24g->bw20_diff[rfpath][txcnt] =
+                                        0xFE;
                         } else {
-                                set_diff1_2g(pwr2g, hwinfo, path, i, eadr);
-                                eadr++;
+                                pwrinfo24g->bw20_diff[rfpath][txcnt] =
+                                  (hwinfo[eeaddr]&0x0f);
+                                if (pwrinfo24g->bw20_diff[rfpath][txcnt] &
+                                    BIT(3))
+                                        pwrinfo24g->bw20_diff[rfpath][txcnt] |=
+                                          0xF0;
+                        }
+                        eeaddr++;
 
-                                set_diff2_2g(pwr2g, hwinfo, path, i, eadr);
-                                eadr++;
+                        if (hwinfo[eeaddr] == 0xFF) {
+                                pwrinfo24g->ofdm_diff[rfpath][txcnt] = 0xFE;
+                        } else {
+                                pwrinfo24g->ofdm_diff[rfpath][txcnt] =
+                                  (hwinfo[eeaddr]&0xf0)>>4;
+                                if (pwrinfo24g->ofdm_diff[rfpath][txcnt] &
+                                    BIT(3))
+                                        pwrinfo24g->ofdm_diff[rfpath][txcnt] |=
+                                          0xF0;
                         }
+
+                        if (hwinfo[eeaddr] == 0xFF) {
+                                pwrinfo24g->cck_diff[rfpath][txcnt] =   0xFE;
+                        } else {
+                                pwrinfo24g->cck_diff[rfpath][txcnt] =
+                                  (hwinfo[eeaddr]&0x0f);
+                                if (pwrinfo24g->cck_diff[rfpath][txcnt] &
+                                    BIT(3))
+                                        pwrinfo24g->cck_diff[rfpath][txcnt] |=
+                                          0xF0;
+                        }
+                        eeaddr++;
                 }
 
                 /*5G default value*/
-                for (i = 0; i < MAX_CHNL_GROUP_5G; i++) {
-                        pwr5g->index_bw40_base[path][i] = hwinfo[eadr++];
-                        if (pwr5g->index_bw40_base[path][i] == 0xFF)
-                                pwr5g->index_bw40_base[path][i] = 0xFE;
+                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;
                 }
 
-                for (i = 0; i < MAX_TX_COUNT; i++) {
-                        if (i == 0) {
-                                set_diff0_5g(pwr5g, hwinfo, path, i, eadr);
-                                eadr++;
+                pwrinfo5g->bw40_diff[rfpath][0] = 0;
+
+                if (hwinfo[eeaddr] == 0xFF) {
+                        pwrinfo5g->bw20_diff[rfpath][0] = 0;
+                } else {
+                        pwrinfo5g->bw20_diff[rfpath][0] =
+                          (hwinfo[eeaddr]&0xf0)>>4;
+                        if (pwrinfo5g->bw20_diff[rfpath][0] & BIT(3))
+                                pwrinfo5g->bw20_diff[rfpath][0] |= 0xF0;
+                }
+
+                if (hwinfo[eeaddr] == 0xFF) {
+                        pwrinfo5g->ofdm_diff[rfpath][0] = 0x04;
+                } else {
+                        pwrinfo5g->ofdm_diff[rfpath][0] = (hwinfo[eeaddr]&0x0f);
+                        if (pwrinfo5g->ofdm_diff[rfpath][0] & BIT(3))
+                                pwrinfo5g->ofdm_diff[rfpath][0] |= 0xF0;
+                }
+                eeaddr++;
+                for (txcnt = 1; txcnt < MAX_TX_COUNT; txcnt++) {
+                        if (hwinfo[eeaddr] == 0xFF) {
+                                pwrinfo5g->bw40_diff[rfpath][txcnt] =   0xFE;
                         } else {
-                                set_diff1_5g(pwr5g, hwinfo, path, i, eadr);
-                                eadr++;
+                                pwrinfo5g->bw40_diff[rfpath][txcnt] =
+                                  (hwinfo[eeaddr]&0xf0)>>4;
+                                if (pwrinfo5g->bw40_diff[rfpath][txcnt] &
+                                    BIT(3))
+                                        pwrinfo5g->bw40_diff[rfpath][txcnt] |=
+                                          0xF0;
                         }
+
+                        if (hwinfo[eeaddr] == 0xFF) {
+                                pwrinfo5g->bw20_diff[rfpath][txcnt] =   0xFE;
+                        } else {
+                                pwrinfo5g->bw20_diff[rfpath][txcnt] =
+                                  (hwinfo[eeaddr]&0x0f);
+                                if (pwrinfo5g->bw20_diff[rfpath][txcnt] &
+                                    BIT(3))
+                                        pwrinfo5g->bw20_diff[rfpath][txcnt] |=
+                                          0xF0;
+                        }
+                        eeaddr++;
                 }
 
-                if (hwinfo[eadr] == 0xFF) {
-                        pwr5g->ofdm_diff[path][1] = 0xFE;
-                        pwr5g->ofdm_diff[path][2] = 0xFE;
+                if (hwinfo[eeaddr] == 0xFF) {
+                        pwrinfo5g->ofdm_diff[rfpath][1] = 0xFE;
+                        pwrinfo5g->ofdm_diff[rfpath][2] = 0xFE;
                 } else {
-                        pwr5g->ofdm_diff[path][1] = (hwinfo[eadr] & 0xf0) >> 4;
-                        pwr5g->ofdm_diff[path][2] = (hwinfo[eadr] & 0x0f);
+                        pwrinfo5g->ofdm_diff[rfpath][1] =
+                                        (hwinfo[eeaddr]&0xf0)>>4;
+                        pwrinfo5g->ofdm_diff[rfpath][2] =
+                                        (hwinfo[eeaddr]&0x0f);
                 }
-                eadr++;
+                eeaddr++;
 
-                if (hwinfo[eadr] == 0xFF)
-                        pwr5g->ofdm_diff[path][3] = 0xFE;
+                if (hwinfo[eeaddr] == 0xFF)
+                        pwrinfo5g->ofdm_diff[rfpath][3] = 0xFE;
                 else
-                        pwr5g->ofdm_diff[path][3] = (hwinfo[eadr]&0x0f);
-                eadr++;
-
-                for (i = 1; i < MAX_TX_COUNT; i++) {
-                        if (pwr5g->ofdm_diff[path][i] == 0xFF)
-                                pwr5g->ofdm_diff[path][i] = 0xFE;
-                        else if (pwr5g->ofdm_diff[path][i] & BIT(3))
-                                pwr5g->ofdm_diff[path][i] |= 0xF0;
+                        pwrinfo5g->ofdm_diff[rfpath][3] = (hwinfo[eeaddr]&0x0f);
+                eeaddr++;
+
+                for (txcnt = 1; txcnt < MAX_TX_COUNT; txcnt++) {
+                        if (pwrinfo5g->ofdm_diff[rfpath][txcnt] == 0xFF)
+                                pwrinfo5g->ofdm_diff[rfpath][txcnt] =   0xFE;
+                        else if (pwrinfo5g->ofdm_diff[rfpath][txcnt] & BIT(3))
+                                pwrinfo5g->ofdm_diff[rfpath][txcnt] |= 0xF0;
                 }
         }
 }
@@ -1712,41 +1791,36 @@ static void _rtl88ee_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         struct txpower_info_5g pwrinfo5g;
         u8 rf_path, index;
         u8 i;
-        int jj = EEPROM_RF_BOARD_OPTION_88E;
-        int kk = EEPROM_THERMAL_METER_88E;
 
-        _rtl8188e_read_power_value_fromprom(hw, &pwrinfo24g, &pwrinfo5g,
-                                            autoload_fail, hwinfo);
+        read_power_value_fromprom(hw, &pwrinfo24g,
+                                  &pwrinfo5g, autoload_fail, hwinfo);
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
-                        index = get_chnl_group(i+1);
+                        index = _rtl88e_get_chnl_group(i+1);
 
                         rtlefuse->txpwrlevel_cck[rf_path][i] =
-                                 pwrinfo24g.index_cck_base[rf_path][index];
-                        if (i == 13)
-                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
-                                     pwrinfo24g.index_bw40_base[rf_path][4];
-                        else
-                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
-                                     pwrinfo24g.index_bw40_base[rf_path][index];
+                                pwrinfo24g.index_cck_base[rf_path][index];
+                        rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
+                                pwrinfo24g.index_bw40_base[rf_path][index];
                         rtlefuse->txpwr_ht20diff[rf_path][i] =
-                                 pwrinfo24g.bw20_diff[rf_path][0];
+                                pwrinfo24g.bw20_diff[rf_path][0];
                         rtlefuse->txpwr_legacyhtdiff[rf_path][i] =
-                                 pwrinfo24g.ofdm_diff[rf_path][0];
+                                pwrinfo24g.ofdm_diff[rf_path][0];
                 }
 
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
-                                "RF(%d)-Ch(%d) [CCK / HT40_1S ] = "
-                                "[0x%x / 0x%x ]\n", rf_path, i,
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S ] = [0x%x / 0x%x ]\n",
+                                rf_path, i,
                                 rtlefuse->txpwrlevel_cck[rf_path][i],
                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i]);
                 }
         }
 
         if (!autoload_fail)
-                rtlefuse->eeprom_thermalmeter = hwinfo[kk];
+                rtlefuse->eeprom_thermalmeter =
+                        hwinfo[EEPROM_THERMAL_METER_88E];
         else
                 rtlefuse->eeprom_thermalmeter = EEPROM_DEFAULT_THERMALMETER;
 
@@ -1760,8 +1834,9 @@ static void _rtl88ee_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 
         if (!autoload_fail) {
-                rtlefuse->eeprom_regulatory = hwinfo[jj] & 0x07;/*bit0~2*/
-                if (hwinfo[jj] == 0xFF)
+                rtlefuse->eeprom_regulatory =
+                        hwinfo[EEPROM_RF_BOARD_OPTION_88E] & 0x07;/*bit0~2*/
+                if (hwinfo[EEPROM_RF_BOARD_OPTION_88E] == 0xFF)
                         rtlefuse->eeprom_regulatory = 0;
         } else {
                 rtlefuse->eeprom_regulatory = 0;
@@ -1775,12 +1850,9 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
         u16 i, usvalue;
         u8 hwinfo[HWSET_MAX_SIZE];
         u16 eeprom_id;
-        int jj = EEPROM_RF_BOARD_OPTION_88E;
-        int kk = EEPROM_RF_FEATURE_OPTION_88E;
 
         if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {
                 rtl_efuse_shadow_map_update(hw);
@@ -1790,9 +1862,14 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw)
         } else if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "RTL819X Not boot from eeprom, check it !!");
+                return;
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "boot from neither eeprom nor efuse, check it !!");
+                return;
         }
 
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP\n",
                       hwinfo, HWSET_MAX_SIZE);
 
         eeprom_id = *((u16 *)&hwinfo[0]);
@@ -1825,7 +1902,7 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw)
         /*customer ID*/
         rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];
         if (rtlefuse->eeprom_oemid == 0xFF)
-                rtlefuse->eeprom_oemid = 0;
+                rtlefuse->eeprom_oemid =        0;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
@@ -1844,34 +1921,40 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw)
         /* set channel paln to world wide 13 */
         rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
         /*tx power*/
-        _rtl88ee_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag,
+        _rtl88ee_read_txpower_info_from_hwpg(hw,
+                                             rtlefuse->autoload_failflag,
                                              hwinfo);
         rtlefuse->txpwr_fromeprom = true;
 
         rtl8188ee_read_bt_coexist_info_from_hwpg(hw,
                                                  rtlefuse->autoload_failflag,
                                                  hwinfo);
+
         /*board type*/
-        rtlefuse->board_type = (hwinfo[jj] & 0xE0) >> 5;
+        rtlefuse->board_type =
+                ((hwinfo[EEPROM_RF_BOARD_OPTION_88E] & 0xE0) >> 5);
+        rtlhal->board_type = rtlefuse->board_type;
         /*Wake on wlan*/
-        rtlefuse->wowlan_enable = ((hwinfo[kk] & 0x40) >> 6);
+        rtlefuse->wowlan_enable =
+                ((hwinfo[EEPROM_RF_FEATURE_OPTION_88E] & 0x40) >> 6);
         /*parse xtal*/
         rtlefuse->crystalcap = hwinfo[EEPROM_XTAL_88E];
         if (hwinfo[EEPROM_XTAL_88E])
                 rtlefuse->crystalcap = 0x20;
         /*antenna diversity*/
-        rtlefuse->antenna_div_cfg = (hwinfo[jj] & 0x18) >> 3;
-        if (hwinfo[jj] == 0xFF)
+        rtlefuse->antenna_div_cfg =
+                (hwinfo[EEPROM_RF_BOARD_OPTION_88E] & 0x18) >> 3;
+        if (hwinfo[EEPROM_RF_BOARD_OPTION_88E] == 0xFF)
                 rtlefuse->antenna_div_cfg = 0;
-        if (rppriv->bt_coexist.eeprom_bt_coexist != 0 &&
-            rppriv->bt_coexist.eeprom_bt_ant_num == ANT_X1)
+        if (rtlpriv->btcoexist.eeprom_bt_coexist != 0 &&
+            rtlpriv->btcoexist.eeprom_bt_ant_num == ANT_X1)
                 rtlefuse->antenna_div_cfg = 0;
 
         rtlefuse->antenna_div_type = hwinfo[EEPROM_RF_ANTENNA_OPT_88E];
         if (rtlefuse->antenna_div_type == 0xFF)
                 rtlefuse->antenna_div_type = 0x01;
         if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV ||
-            rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
                 rtlefuse->antenna_div_cfg = 1;
 
         if (rtlhal->oem_id == RT_CID_DEFAULT) {
@@ -1881,12 +1964,12 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw)
                                 if (rtlefuse->eeprom_svid == 0x1025) {
                                         rtlhal->oem_id = RT_CID_819X_ACER;
                                 } else if ((rtlefuse->eeprom_svid == 0x10EC &&
-                                            rtlefuse->eeprom_smid == 0x0179) ||
-                                            (rtlefuse->eeprom_svid == 0x17AA &&
-                                            rtlefuse->eeprom_smid == 0x0179)) {
+                                     rtlefuse->eeprom_smid == 0x0179) ||
+                                     (rtlefuse->eeprom_svid == 0x17AA &&
+                                     rtlefuse->eeprom_smid == 0x0179)) {
                                         rtlhal->oem_id = RT_CID_819X_LENOVO;
                                 } else if (rtlefuse->eeprom_svid == 0x103c &&
-                                         rtlefuse->eeprom_smid == 0x197d) {
+                                           rtlefuse->eeprom_smid == 0x197d) {
                                         rtlhal->oem_id = RT_CID_819X_HP;
                                 } else {
                                         rtlhal->oem_id = RT_CID_DEFAULT;
@@ -1905,6 +1988,7 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw)
                 default:
                         rtlhal->oem_id = RT_CID_DEFAULT;
                         break;
+
                 }
         }
 }
@@ -1943,14 +2027,13 @@ void rtl88ee_read_eeprom_info(struct ieee80211_hw *hw)
         u8 tmp_u1b;
 
         rtlhal->version = _rtl88ee_read_chip_version(hw);
-        if (get_rf_type(rtlphy) == RF_1T1R) {
-                rtlpriv->dm.rfpath_rxenable[0] = true;
-        } else {
+        if (get_rf_type(rtlphy) == RF_1T1R)
                 rtlpriv->dm.rfpath_rxenable[0] = true;
-                rtlpriv->dm.rfpath_rxenable[1] = true;
-        }
+        else
+                rtlpriv->dm.rfpath_rxenable[0] =
+                    rtlpriv->dm.rfpath_rxenable[1] = true;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
-                 rtlhal->version);
+                                                rtlhal->version);
         tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
         if (tmp_u1b & BIT(4)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
@@ -1970,24 +2053,25 @@ void rtl88ee_read_eeprom_info(struct ieee80211_hw *hw)
 }
 
 static void rtl88ee_update_hal_rate_table(struct ieee80211_hw *hw,
-                                          struct ieee80211_sta *sta)
+                struct ieee80211_sta *sta)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 ratr_value;
         u8 ratr_index = 0;
-        u8 nmode = mac->ht_enable;
-        u8 mimo_ps = IEEE80211_SMPS_OFF;
+        u8 b_nmode = mac->ht_enable;
+        /*u8 mimo_ps = IEEE80211_SMPS_OFF;*/
         u16 shortgi_rate;
         u32 tmp_ratr_value;
-        u8 ctx40 = mac->bw_40;
-        u16 cap = sta->ht_cap.cap;
-        u8 short40 = (cap & IEEE80211_HT_CAP_SGI_40) ?  1 : 0;
-        u8 short20 = (cap & IEEE80211_HT_CAP_SGI_20) ?  1 : 0;
+        u8 curtxbw_40mhz = mac->bw_40;
+        u8 curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
+                                1 : 0;
+        u8 curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
+                                1 : 0;
         enum wireless_mode wirelessmode = mac->mode;
+        u32 ratr_mask;
 
         if (rtlhal->current_bandtype == BAND_ON_5G)
                 ratr_value = sta->supp_rates[1] << 4;
@@ -1996,7 +2080,7 @@ static void rtl88ee_update_hal_rate_table(struct ieee80211_hw *hw,
         if (mac->opmode == NL80211_IFTYPE_ADHOC)
                 ratr_value = 0xfff;
         ratr_value |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
-                        sta->ht_cap.mcs.rx_mask[0] << 12);
+                       sta->ht_cap.mcs.rx_mask[0] << 12);
         switch (wirelessmode) {
         case WIRELESS_MODE_B:
                 if (ratr_value & 0x0000000c)
@@ -2009,20 +2093,14 @@ static void rtl88ee_update_hal_rate_table(struct ieee80211_hw *hw,
                 break;
         case WIRELESS_MODE_N_24G:
         case WIRELESS_MODE_N_5G:
-                nmode = 1;
-                if (mimo_ps == IEEE80211_SMPS_STATIC) {
-                        ratr_value &= 0x0007F005;
-                } else {
-                        u32 ratr_mask;
-
-                        if (get_rf_type(rtlphy) == RF_1T2R ||
-                            get_rf_type(rtlphy) == RF_1T1R)
-                                ratr_mask = 0x000ff005;
-                        else
-                                ratr_mask = 0x0f0ff005;
+                b_nmode = 1;
+                if (get_rf_type(rtlphy) == RF_1T2R ||
+                    get_rf_type(rtlphy) == RF_1T1R)
+                        ratr_mask = 0x000ff005;
+                else
+                        ratr_mask = 0x0f0ff005;
 
-                        ratr_value &= ratr_mask;
-                }
+                ratr_value &= ratr_mask;
                 break;
         default:
                 if (rtlphy->rf_type == RF_1T2R)
@@ -2033,18 +2111,19 @@ static void rtl88ee_update_hal_rate_table(struct ieee80211_hw *hw,
                 break;
         }
 
-        if ((rppriv->bt_coexist.bt_coexistence) &&
-            (rppriv->bt_coexist.bt_coexist_type == BT_CSR_BC4) &&
-            (rppriv->bt_coexist.bt_cur_state) &&
-            (rppriv->bt_coexist.bt_ant_isolation) &&
-            ((rppriv->bt_coexist.bt_service == BT_SCO) ||
-            (rppriv->bt_coexist.bt_service == BT_BUSY)))
+        if ((rtlpriv->btcoexist.bt_coexistence) &&
+            (rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4) &&
+            (rtlpriv->btcoexist.bt_cur_state) &&
+            (rtlpriv->btcoexist.bt_ant_isolation) &&
+            ((rtlpriv->btcoexist.bt_service == BT_SCO) ||
+             (rtlpriv->btcoexist.bt_service == BT_BUSY)))
                 ratr_value &= 0x0fffcfc0;
         else
                 ratr_value &= 0x0FFFFFFF;
 
-        if (nmode && ((ctx40 && short40) ||
-                      (!ctx40 && short20))) {
+        if (b_nmode &&
+            ((curtxbw_40mhz && curshortgi_40mhz) ||
+             (!curtxbw_40mhz && curshortgi_20mhz))) {
                 ratr_value |= 0x10000000;
                 tmp_ratr_value = (ratr_value >> 12);
 
@@ -2064,7 +2143,7 @@ static void rtl88ee_update_hal_rate_table(struct ieee80211_hw *hw,
 }
 
 static void rtl88ee_update_hal_rate_mask(struct ieee80211_hw *hw,
-                                         struct ieee80211_sta *sta, u8 rssi)
+                struct ieee80211_sta *sta, u8 rssi_level)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -2073,23 +2152,25 @@ static void rtl88ee_update_hal_rate_mask(struct ieee80211_hw *hw,
         struct rtl_sta_info *sta_entry = NULL;
         u32 ratr_bitmap;
         u8 ratr_index;
-        u16 cap = sta->ht_cap.cap;
-        u8 ctx40 = (cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) ? 1 : 0;
-        u8 short40 = (cap & IEEE80211_HT_CAP_SGI_40) ?  1 : 0;
-        u8 short20 = (cap & IEEE80211_HT_CAP_SGI_20) ?  1 : 0;
+        u8 curtxbw_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
+                                ? 1 : 0;
+        u8 curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
+                                1 : 0;
+        u8 curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
+                                1 : 0;
         enum wireless_mode wirelessmode = 0;
-        bool shortgi = false;
+        bool b_shortgi = false;
         u8 rate_mask[5];
         u8 macid = 0;
-        u8 mimo_ps = IEEE80211_SMPS_OFF;
+        /*u8 mimo_ps = IEEE80211_SMPS_OFF;*/
 
         sta_entry = (struct rtl_sta_info *)sta->drv_priv;
         wirelessmode = sta_entry->wireless_mode;
         if (mac->opmode == NL80211_IFTYPE_STATION ||
-            mac->opmode == NL80211_IFTYPE_MESH_POINT)
-                ctx40 = mac->bw_40;
+                mac->opmode == NL80211_IFTYPE_MESH_POINT)
+                curtxbw_40mhz = mac->bw_40;
         else if (mac->opmode == NL80211_IFTYPE_AP ||
-                 mac->opmode == NL80211_IFTYPE_ADHOC)
+                mac->opmode == NL80211_IFTYPE_ADHOC)
                 macid = sta->aid + 1;
 
         if (rtlhal->current_bandtype == BAND_ON_5G)
@@ -2111,70 +2192,59 @@ static void rtl88ee_update_hal_rate_mask(struct ieee80211_hw *hw,
         case WIRELESS_MODE_G:
                 ratr_index = RATR_INX_WIRELESS_GB;
 
-                if (rssi == 1)
+                if (rssi_level == 1)
                         ratr_bitmap &= 0x00000f00;
-                else if (rssi == 2)
+                else if (rssi_level == 2)
                         ratr_bitmap &= 0x00000ff0;
                 else
                         ratr_bitmap &= 0x00000ff5;
                 break;
-        case WIRELESS_MODE_A:
-                ratr_index = RATR_INX_WIRELESS_A;
-                ratr_bitmap &= 0x00000ff0;
-                break;
         case WIRELESS_MODE_N_24G:
         case WIRELESS_MODE_N_5G:
                 ratr_index = RATR_INX_WIRELESS_NGB;
-
-                if (mimo_ps == IEEE80211_SMPS_STATIC) {
-                        if (rssi == 1)
-                                ratr_bitmap &= 0x00070000;
-                        else if (rssi == 2)
-                                ratr_bitmap &= 0x0007f000;
-                        else
-                                ratr_bitmap &= 0x0007f005;
+                if (rtlphy->rf_type == RF_1T2R ||
+                    rtlphy->rf_type == RF_1T1R) {
+                        if (curtxbw_40mhz) {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x000f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x000ff000;
+                                else
+                                        ratr_bitmap &= 0x000ff015;
+                        } else {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x000f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x000ff000;
+                                else
+                                        ratr_bitmap &= 0x000ff005;
+                        }
                 } else {
-                        if (rtlphy->rf_type == RF_1T2R ||
-                            rtlphy->rf_type == RF_1T1R) {
-                                if (ctx40) {
-                                        if (rssi == 1)
-                                                ratr_bitmap &= 0x000f0000;
-                                        else if (rssi == 2)
-                                                ratr_bitmap &= 0x000ff000;
-                                        else
-                                                ratr_bitmap &= 0x000ff015;
-                                } else {
-                                        if (rssi == 1)
-                                                ratr_bitmap &= 0x000f0000;
-                                        else if (rssi == 2)
-                                                ratr_bitmap &= 0x000ff000;
-                                        else
-                                                ratr_bitmap &= 0x000ff005;
-                                }
+                        if (curtxbw_40mhz) {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x0f8f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x0f8ff000;
+                                else
+                                        ratr_bitmap &= 0x0f8ff015;
                         } else {
-                                if (ctx40) {
-                                        if (rssi == 1)
-                                                ratr_bitmap &= 0x0f8f0000;
-                                        else if (rssi == 2)
-                                                ratr_bitmap &= 0x0f8ff000;
-                                        else
-                                                ratr_bitmap &= 0x0f8ff015;
-                                } else {
-                                        if (rssi == 1)
-                                                ratr_bitmap &= 0x0f8f0000;
-                                        else if (rssi == 2)
-                                                ratr_bitmap &= 0x0f8ff000;
-                                        else
-                                                ratr_bitmap &= 0x0f8ff005;
-                                }
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x0f8f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x0f8ff000;
+                                else
+                                        ratr_bitmap &= 0x0f8ff005;
                         }
                 }
+                /*}*/
+
+                if ((curtxbw_40mhz && curshortgi_40mhz) ||
+                    (!curtxbw_40mhz && curshortgi_20mhz)) {
 
-                if ((ctx40 && short40) || (!ctx40 && short20)) {
                         if (macid == 0)
-                                shortgi = true;
+                                b_shortgi = true;
                         else if (macid == 1)
-                                shortgi = false;
+                                b_shortgi = false;
                 }
                 break;
         default:
@@ -2192,22 +2262,24 @@ static void rtl88ee_update_hal_rate_mask(struct ieee80211_hw *hw,
                  "ratr_bitmap :%x\n", ratr_bitmap);
         *(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |
                              (ratr_index << 28);
-        rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
+        rate_mask[4] = macid | (b_shortgi ? 0x20 : 0x00) | 0x80;
         RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
                  "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
-                 ratr_index, ratr_bitmap, rate_mask[0], rate_mask[1],
-                 rate_mask[2], rate_mask[3], rate_mask[4]);
+                 ratr_index, ratr_bitmap,
+                 rate_mask[0], rate_mask[1],
+                 rate_mask[2], rate_mask[3],
+                 rate_mask[4]);
         rtl88e_fill_h2c_cmd(hw, H2C_88E_RA_MASK, 5, rate_mask);
         _rtl88ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
 }
 
 void rtl88ee_update_hal_rate_tbl(struct ieee80211_hw *hw,
-                struct ieee80211_sta *sta, u8 rssi)
+                struct ieee80211_sta *sta, u8 rssi_level)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         if (rtlpriv->dm.useramask)
-                rtl88ee_update_hal_rate_mask(hw, sta, rssi);
+                rtl88ee_update_hal_rate_mask(hw, sta, rssi_level);
         else
                 rtl88ee_update_hal_rate_table(hw, sta);
 }
@@ -2230,9 +2302,9 @@ bool rtl88ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        enum rf_pwrstate state_toset;
+        enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;
         u32 u4tmp;
-        bool actuallyset = false;
+        bool b_actuallyset = false;
 
         if (rtlpriv->rtlhal.being_init_adapter)
                 return false;
@@ -2249,27 +2321,29 @@ bool rtl88ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
                 spin_unlock(&rtlpriv->locks.rf_ps_lock);
         }
 
-        u4tmp = rtl_read_dword(rtlpriv, REG_GPIO_OUTPUT);
-        state_toset = (u4tmp & BIT(31)) ? ERFON : ERFOFF;
+        cur_rfstate = ppsc->rfpwr_state;
 
+        u4tmp = rtl_read_dword(rtlpriv, REG_GPIO_OUTPUT);
+        e_rfpowerstate_toset = (u4tmp & BIT(31)) ? ERFON : ERFOFF;
 
-        if ((ppsc->hwradiooff == true) && (state_toset == ERFON)) {
+        if (ppsc->hwradiooff && (e_rfpowerstate_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          "GPIOChangeRF  - HW Radio ON, RF ON\n");
 
-                state_toset = ERFON;
+                e_rfpowerstate_toset = ERFON;
                 ppsc->hwradiooff = false;
-                actuallyset = true;
-        } else if ((ppsc->hwradiooff == false) && (state_toset == ERFOFF)) {
+                b_actuallyset = true;
+        } else if ((!ppsc->hwradiooff) &&
+                   (e_rfpowerstate_toset == ERFOFF)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
 
-                state_toset = ERFOFF;
+                e_rfpowerstate_toset = ERFOFF;
                 ppsc->hwradiooff = true;
-                actuallyset = true;
+                b_actuallyset = true;
         }
 
-        if (actuallyset) {
+        if (b_actuallyset) {
                 spin_lock(&rtlpriv->locks.rf_ps_lock);
                 ppsc->rfchange_inprogress = false;
                 spin_unlock(&rtlpriv->locks.rf_ps_lock);
@@ -2284,50 +2358,19 @@ bool rtl88ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 
         *valid = 1;
         return !ppsc->hwradiooff;
-}
-
-static void add_one_key(struct ieee80211_hw *hw, u8 *macaddr,
-                        struct rtl_mac *mac, u32 key, u32 id,
-                        u8 enc_algo, bool is_pairwise)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "add one entry\n");
-        if (is_pairwise) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "set Pairwise key\n");
 
-                rtl_cam_add_one_entry(hw, macaddr, key, id, enc_algo,
-                                      CAM_CONFIG_NO_USEDK,
-                                      rtlpriv->sec.key_buf[key]);
-        } else {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "set group key\n");
-
-                if (mac->opmode == NL80211_IFTYPE_ADHOC) {
-                        rtl_cam_add_one_entry(hw, rtlefuse->dev_addr,
-                                              PAIRWISE_KEYIDX,
-                                              CAM_PAIRWISE_KEY_POSITION,
-                                              enc_algo,
-                                              CAM_CONFIG_NO_USEDK,
-                                              rtlpriv->sec.key_buf[id]);
-                }
-
-                rtl_cam_add_one_entry(hw, macaddr, key, id, enc_algo,
-                                      CAM_CONFIG_NO_USEDK,
-                                      rtlpriv->sec.key_buf[id]);
-        }
 }
 
-void rtl88ee_set_key(struct ieee80211_hw *hw, u32 key,
-                     u8 *mac_ad, bool is_group, u8 enc_algo,
+void rtl88ee_set_key(struct ieee80211_hw *hw, u32 key_index,
+                     u8 *p_macaddr, bool is_group, u8 enc_algo,
                      bool is_wepkey, bool clear_all)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        u8 *macaddr = mac_ad;
-        u32 id = 0;
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 *macaddr = p_macaddr;
+        u32 entry_id = 0;
         bool is_pairwise = false;
-
         static u8 cam_const_addr[4][6] = {
                 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
                 {0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
@@ -2372,122 +2415,176 @@ void rtl88ee_set_key(struct ieee80211_hw *hw, u32 key,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                                 "switch case not process\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
 
                 if (is_wepkey || rtlpriv->sec.use_defaultkey) {
-                        macaddr = cam_const_addr[key];
-                        id = key;
+                        macaddr = cam_const_addr[key_index];
+                        entry_id = key_index;
                 } else {
                         if (is_group) {
                                 macaddr = cam_const_broad;
-                                id = key;
+                                entry_id = key_index;
                         } else {
                                 if (mac->opmode == NL80211_IFTYPE_AP ||
                                     mac->opmode == NL80211_IFTYPE_MESH_POINT) {
-                                        id = rtl_cam_get_free_entry(hw, mac_ad);
-                                        if (id >=  TOTAL_CAM_ENTRY) {
+                                        entry_id =
+                                          rtl_cam_get_free_entry(hw, p_macaddr);
+                                        if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv, COMP_SEC,
                                                          DBG_EMERG,
                                                          "Can not find free hw security cam entry\n");
                                                 return;
                                         }
                                 } else {
-                                        id = CAM_PAIRWISE_KEY_POSITION;
+                                        entry_id = CAM_PAIRWISE_KEY_POSITION;
                                 }
-
-                                key = PAIRWISE_KEYIDX;
+                                key_index = PAIRWISE_KEYIDX;
                                 is_pairwise = true;
                         }
                 }
 
-                if (rtlpriv->sec.key_len[key] == 0) {
+                if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 "delete one entry, id is %d\n", id);
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
                         if (mac->opmode == NL80211_IFTYPE_AP ||
-                            mac->opmode == NL80211_IFTYPE_MESH_POINT)
-                                rtl_cam_del_entry(hw, mac_ad);
-                        rtl_cam_delete_one_entry(hw, mac_ad, id);
+                                mac->opmode == NL80211_IFTYPE_MESH_POINT)
+                                rtl_cam_del_entry(hw, p_macaddr);
+                        rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
-                        add_one_key(hw, macaddr, mac, key, id, enc_algo,
-                                    is_pairwise);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                 "add one entry\n");
+                        if (is_pairwise) {
+                                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                         "set Pairwise key\n");
+
+                                rtl_cam_add_one_entry(hw, macaddr, key_index,
+                                                      entry_id, enc_algo,
+                                                      CAM_CONFIG_NO_USEDK,
+                                                      rtlpriv->sec.key_buf[key_index]);
+                        } else {
+                                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                         "set group key\n");
+
+                                if (mac->opmode == NL80211_IFTYPE_ADHOC) {
+                                        rtl_cam_add_one_entry(hw,
+                                                        rtlefuse->dev_addr,
+                                                        PAIRWISE_KEYIDX,
+                                                        CAM_PAIRWISE_KEY_POSITION,
+                                                        enc_algo,
+                                                        CAM_CONFIG_NO_USEDK,
+                                                        rtlpriv->sec.key_buf
+                                                        [entry_id]);
+                                }
+
+                                rtl_cam_add_one_entry(hw, macaddr, key_index,
+                                                      entry_id, enc_algo,
+                                                      CAM_CONFIG_NO_USEDK,
+                                                      rtlpriv->sec.key_buf[entry_id]);
+                        }
+
                 }
         }
 }
 
 static void rtl8188ee_bt_var_init(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
-        struct bt_coexist_info coexist = rppriv->bt_coexist;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        coexist.bt_coexistence = rppriv->bt_coexist.eeprom_bt_coexist;
-        coexist.bt_ant_num = coexist.eeprom_bt_ant_num;
-        coexist.bt_coexist_type = coexist.eeprom_bt_type;
+        rtlpriv->btcoexist.bt_coexistence =
+                rtlpriv->btcoexist.eeprom_bt_coexist;
+        rtlpriv->btcoexist.bt_ant_num = rtlpriv->btcoexist.eeprom_bt_ant_num;
+        rtlpriv->btcoexist.bt_coexist_type = rtlpriv->btcoexist.eeprom_bt_type;
 
-        if (coexist.reg_bt_iso == 2)
-                coexist.bt_ant_isolation = coexist.eeprom_bt_ant_isol;
+        if (rtlpriv->btcoexist.reg_bt_iso == 2)
+                rtlpriv->btcoexist.bt_ant_isolation =
+                                rtlpriv->btcoexist.eeprom_bt_ant_isol;
         else
-                coexist.bt_ant_isolation = coexist.reg_bt_iso;
-
-        coexist.bt_radio_shared_type = coexist.eeprom_bt_radio_shared;
-
-        if (coexist.bt_coexistence) {
-                if (coexist.reg_bt_sco == 1)
-                        coexist.bt_service = BT_OTHER_ACTION;
-                else if (coexist.reg_bt_sco == 2)
-                        coexist.bt_service = BT_SCO;
-                else if (coexist.reg_bt_sco == 4)
-                        coexist.bt_service = BT_BUSY;
-                else if (coexist.reg_bt_sco == 5)
-                        coexist.bt_service = BT_OTHERBUSY;
+                rtlpriv->btcoexist.bt_ant_isolation =
+                                rtlpriv->btcoexist.reg_bt_iso;
+
+        rtlpriv->btcoexist.bt_radio_shared_type =
+                rtlpriv->btcoexist.eeprom_bt_radio_shared;
+
+        if (rtlpriv->btcoexist.bt_coexistence) {
+                if (rtlpriv->btcoexist.reg_bt_sco == 1)
+                        rtlpriv->btcoexist.bt_service = BT_OTHER_ACTION;
+                else if (rtlpriv->btcoexist.reg_bt_sco == 2)
+                        rtlpriv->btcoexist.bt_service = BT_SCO;
+                else if (rtlpriv->btcoexist.reg_bt_sco == 4)
+                        rtlpriv->btcoexist.bt_service = BT_BUSY;
+                else if (rtlpriv->btcoexist.reg_bt_sco == 5)
+                        rtlpriv->btcoexist.bt_service = BT_OTHERBUSY;
                 else
-                        coexist.bt_service = BT_IDLE;
+                        rtlpriv->btcoexist.bt_service = BT_IDLE;
 
-                coexist.bt_edca_ul = 0;
-                coexist.bt_edca_dl = 0;
-                coexist.bt_rssi_state = 0xff;
+                rtlpriv->btcoexist.bt_edca_ul = 0;
+                rtlpriv->btcoexist.bt_edca_dl = 0;
+                rtlpriv->btcoexist.bt_rssi_state = 0xff;
         }
 }
 
 void rtl8188ee_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
                                               bool auto_load_fail, u8 *hwinfo)
 {
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 value;
+
+        if (!auto_load_fail) {
+                rtlpriv->btcoexist.eeprom_bt_coexist =
+                        ((hwinfo[EEPROM_RF_FEATURE_OPTION_88E] & 0xe0) >> 5);
+                if (hwinfo[EEPROM_RF_FEATURE_OPTION_88E] == 0xFF)
+                        rtlpriv->btcoexist.eeprom_bt_coexist  = 0;
+                value = hwinfo[EEPROM_RF_BT_SETTING_88E];
+                rtlpriv->btcoexist.eeprom_bt_type = ((value & 0xe) >> 1);
+                rtlpriv->btcoexist.eeprom_bt_ant_num = (value & 0x1);
+                rtlpriv->btcoexist.eeprom_bt_ant_isol = ((value & 0x10) >> 4);
+                rtlpriv->btcoexist.eeprom_bt_radio_shared =
+                                 ((value & 0x20) >> 5);
+        } else {
+                rtlpriv->btcoexist.eeprom_bt_coexist = 0;
+                rtlpriv->btcoexist.eeprom_bt_type = BT_2WIRE;
+                rtlpriv->btcoexist.eeprom_bt_ant_num = ANT_X2;
+                rtlpriv->btcoexist.eeprom_bt_ant_isol = 0;
+                rtlpriv->btcoexist.eeprom_bt_radio_shared = BT_RADIO_SHARED;
+        }
+
         rtl8188ee_bt_var_init(hw);
 }
 
 void rtl8188ee_bt_reg_init(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         /* 0:Low, 1:High, 2:From Efuse. */
-        rppriv->bt_coexist.reg_bt_iso = 2;
+        rtlpriv->btcoexist.reg_bt_iso = 2;
         /* 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter. */
-        rppriv->bt_coexist.reg_bt_sco = 3;
+        rtlpriv->btcoexist.reg_bt_sco = 3;
         /* 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. */
-        rppriv->bt_coexist.reg_bt_sco = 0;
+        rtlpriv->btcoexist.reg_bt_sco = 0;
 }
 
 void rtl8188ee_bt_hw_init(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct rtl_pci_priv *rppriv = rtl_pcipriv(hw);
-        struct bt_coexist_info coexist = rppriv->bt_coexist;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u8 u1_tmp;
 
-        if (coexist.bt_coexistence &&
-            ((coexist.bt_coexist_type == BT_CSR_BC4) ||
-              coexist.bt_coexist_type == BT_CSR_BC8)) {
-                if (coexist.bt_ant_isolation)
+        if (rtlpriv->btcoexist.bt_coexistence &&
+            ((rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4) ||
+              rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC8)) {
+                if (rtlpriv->btcoexist.bt_ant_isolation)
                         rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0);
 
                 u1_tmp = rtl_read_byte(rtlpriv, 0x4fd) &
-                                       BIT_OFFSET_LEN_MASK_32(0, 1);
-                u1_tmp = u1_tmp | ((coexist.bt_ant_isolation == 1) ?
+                         BIT_OFFSET_LEN_MASK_32(0, 1);
+                u1_tmp = u1_tmp |
+                         ((rtlpriv->btcoexist.bt_ant_isolation == 1) ?
                          0 : BIT_OFFSET_LEN_MASK_32(1, 1)) |
-                         ((coexist.bt_service == BT_SCO) ?
+                         ((rtlpriv->btcoexist.bt_service == BT_SCO) ?
                          0 : BIT_OFFSET_LEN_MASK_32(2, 1));
                 rtl_write_byte(rtlpriv, 0x4fd, u1_tmp);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/led.c b/drivers/net/wireless/rtlwifi/rtl8188ee/led.c
index c81a9cb6894c..b504bd092fc4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/led.c
@@ -32,8 +32,8 @@
 #include "reg.h"
 #include "led.h"
 
-static void rtl88ee_init_led(struct ieee80211_hw *hw,
-                             struct rtl_led *pled, enum rtl_led_pin ledpin)
+static void _rtl88ee_init_led(struct ieee80211_hw *hw,
+                              struct rtl_led *pled, enum rtl_led_pin ledpin)
 {
         pled->hw = hw;
         pled->ledpin = ledpin;
@@ -46,23 +46,23 @@ void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 "LedAddr:%X ledpin =%d\n", REG_LEDCFG2, pled->ledpin);
+                 "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
 
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
                 break;
         case LED_PIN_LED0:
                 ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
-                rtl_write_byte(rtlpriv, REG_LEDCFG2,
-                               (ledcfg & 0xf0) | BIT(5) | BIT(6));
+                rtl_write_byte(rtlpriv,
+                               REG_LEDCFG2, (ledcfg & 0xf0) | BIT(5) | BIT(6));
                 break;
         case LED_PIN_LED1:
                 ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1);
                 rtl_write_byte(rtlpriv, REG_LEDCFG1, ledcfg & 0x10);
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
                 break;
         }
         pled->ledon = true;
@@ -73,10 +73,9 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 ledcfg;
-        u8 val;
 
         RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 "LedAddr:%X ledpin =%d\n", REG_LEDCFG2, pled->ledpin);
+                 "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
 
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
@@ -84,15 +83,15 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         case LED_PIN_LED0:
                 ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
                 ledcfg &= 0xf0;
-                val = ledcfg | BIT(3) | BIT(5) | BIT(6);
-                if (pcipriv->ledctl.led_opendrain == true) {
-                        rtl_write_byte(rtlpriv, REG_LEDCFG2, val);
+                if (pcipriv->ledctl.led_opendrain) {
+                        rtl_write_byte(rtlpriv, REG_LEDCFG2,
+                                       (ledcfg | BIT(3) | BIT(5) | BIT(6)));
                         ledcfg = rtl_read_byte(rtlpriv, REG_MAC_PINMUX_CFG);
-                        val = ledcfg & 0xFE;
-                        rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG, val);
-                } else {
-                        rtl_write_byte(rtlpriv, REG_LEDCFG2, val);
-                }
+                        rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG,
+                                       (ledcfg & 0xFE));
+                } else
+                        rtl_write_byte(rtlpriv, REG_LEDCFG2,
+                                       (ledcfg | BIT(3) | BIT(5) | BIT(6)));
                 break;
         case LED_PIN_LED1:
                 ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1);
@@ -100,8 +99,8 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 rtl_write_byte(rtlpriv, REG_LEDCFG1, (ledcfg | BIT(3)));
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
                 break;
         }
         pled->ledon = false;
@@ -110,17 +109,15 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
 void rtl88ee_init_sw_leds(struct ieee80211_hw *hw)
 {
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
-
-        rtl88ee_init_led(hw, &(pcipriv->ledctl.sw_led0), LED_PIN_LED0);
-        rtl88ee_init_led(hw, &(pcipriv->ledctl.sw_led1), LED_PIN_LED1);
+        _rtl88ee_init_led(hw, &pcipriv->ledctl.sw_led0, LED_PIN_LED0);
+        _rtl88ee_init_led(hw, &pcipriv->ledctl.sw_led1, LED_PIN_LED1);
 }
 
-static void rtl88ee_sw_led_control(struct ieee80211_hw *hw,
+static void _rtl88ee_sw_led_control(struct ieee80211_hw *hw,
                                     enum led_ctl_mode ledaction)
 {
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);
-
         switch (ledaction) {
         case LED_CTL_POWER_ON:
         case LED_CTL_LINK:
@@ -152,6 +149,6 @@ void rtl88ee_led_control(struct ieee80211_hw *hw,
                 return;
         }
         RT_TRACE(rtlpriv, COMP_LED, DBG_TRACE, "ledaction %d,\n",
-                 ledaction);
-        rtl88ee_sw_led_control(hw, ledaction);
+                                ledaction);
+        _rtl88ee_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/led.h b/drivers/net/wireless/rtlwifi/rtl8188ee/led.h
index 4073f6f847b2..4b325b75faaf 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/led.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
index 1cd6c16d597e..3f6c59cdeaba 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -29,7 +25,6 @@
 
 #include "../wifi.h"
 #include "../pci.h"
-#include "../core.h"
 #include "../ps.h"
 #include "reg.h"
 #include "def.h"
@@ -38,443 +33,32 @@
 #include "dm.h"
 #include "table.h"
 
-static void set_baseband_phy_config(struct ieee80211_hw *hw);
-static void set_baseband_agc_config(struct ieee80211_hw *hw);
-static void store_pwrindex_offset(struct ieee80211_hw *hw,
-                                  u32 regaddr, u32 bitmask,
-                                  u32 data);
-static bool check_cond(struct ieee80211_hw *hw, const u32  condition);
-
-static u32 rf_serial_read(struct ieee80211_hw *hw,
-                          enum radio_path rfpath, u32 offset)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct bb_reg_def *phreg = &rtlphy->phyreg_def[rfpath];
-        u32 newoffset;
-        u32 tmplong, tmplong2;
-        u8 rfpi_enable = 0;
-        u32 ret;
-        int jj = RF90_PATH_A;
-        int kk = RF90_PATH_B;
-
-        offset &= 0xff;
-        newoffset = offset;
-        if (RT_CANNOT_IO(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "return all one\n");
-                return 0xFFFFFFFF;
-        }
-        tmplong = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD);
-        if (rfpath == jj)
-                tmplong2 = tmplong;
-        else
-                tmplong2 = rtl_get_bbreg(hw, phreg->rfhssi_para2, MASKDWORD);
-        tmplong2 = (tmplong2 & (~BLSSIREADADDRESS)) |
-            (newoffset << 23) | BLSSIREADEDGE;
-        rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
-                      tmplong & (~BLSSIREADEDGE));
-        mdelay(1);
-        rtl_set_bbreg(hw, phreg->rfhssi_para2, MASKDWORD, tmplong2);
-        mdelay(2);
-        if (rfpath == jj)
-                rfpi_enable = (u8) rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
-                                                 BIT(8));
-        else if (rfpath == kk)
-                rfpi_enable = (u8) rtl_get_bbreg(hw, RFPGA0_XB_HSSIPARAMETER1,
-                                                 BIT(8));
-        if (rfpi_enable)
-                ret = rtl_get_bbreg(hw, phreg->rf_rbpi, BLSSIREADBACKDATA);
-        else
-                ret = rtl_get_bbreg(hw, phreg->rf_rb, BLSSIREADBACKDATA);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x]= 0x%x\n",
-                 rfpath, phreg->rf_rb, ret);
-        return ret;
-}
-
-static void rf_serial_write(struct ieee80211_hw *hw,
-                            enum radio_path rfpath, u32 offset,
-                            u32 data)
-{
-        u32 data_and_addr;
-        u32 newoffset;
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct bb_reg_def *phreg = &rtlphy->phyreg_def[rfpath];
-
-        if (RT_CANNOT_IO(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "stop\n");
-                return;
-        }
-        offset &= 0xff;
-        newoffset = offset;
-        data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
-        rtl_set_bbreg(hw, phreg->rf3wire_offset, MASKDWORD, data_and_addr);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]= 0x%x\n",
-                 rfpath, phreg->rf3wire_offset, data_and_addr);
-}
-
-static u32 cal_bit_shift(u32 bitmask)
-{
-        u32 i;
-
-        for (i = 0; i <= 31; i++) {
-                if (((bitmask >> i) & 0x1) == 1)
-                        break;
-        }
-        return i;
-}
-
-static bool config_bb_with_header(struct ieee80211_hw *hw,
-                                  u8 configtype)
-{
-        if (configtype == BASEBAND_CONFIG_PHY_REG)
-                set_baseband_phy_config(hw);
-        else if (configtype == BASEBAND_CONFIG_AGC_TAB)
-                set_baseband_agc_config(hw);
-        return true;
-}
-
-static bool config_bb_with_pgheader(struct ieee80211_hw *hw,
-                                    u8 configtype)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        int i;
-        u32 *table_pg;
-        u16 tbl_page_len;
-        u32 v1 = 0, v2 = 0;
-
-        tbl_page_len = RTL8188EEPHY_REG_ARRAY_PGLEN;
-        table_pg = RTL8188EEPHY_REG_ARRAY_PG;
-
-        if (configtype == BASEBAND_CONFIG_PHY_REG) {
-                for (i = 0; i < tbl_page_len; i = i + 3) {
-                        v1 = table_pg[i];
-                        v2 = table_pg[i + 1];
-
-                        if (v1 < 0xcdcdcdcd) {
-                                rtl_addr_delay(table_pg[i]);
-
-                                store_pwrindex_offset(hw, table_pg[i],
-                                                      table_pg[i + 1],
-                                                      table_pg[i + 2]);
-                                continue;
-                        } else {
-                                if (!check_cond(hw, table_pg[i])) {
-                                        /*don't need the hw_body*/
-                                        i += 2; /* skip the pair of expression*/
-                                        v1 = table_pg[i];
-                                        v2 = table_pg[i + 1];
-                                        while (v2 != 0xDEAD) {
-                                                i += 3;
-                                                v1 = table_pg[i];
-                                                v2 = table_pg[i + 1];
-                                        }
-                                }
-                        }
-                }
-        } else {
-                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                         "configtype != BaseBand_Config_PHY_REG\n");
-        }
-        return true;
-}
-
-static bool config_parafile(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
-        bool rtstatus;
-
-        rtstatus = config_bb_with_header(hw, BASEBAND_CONFIG_PHY_REG);
-        if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!");
-                return false;
-        }
-
-        if (fuse->autoload_failflag == false) {
-                rtlphy->pwrgroup_cnt = 0;
-                rtstatus = config_bb_with_pgheader(hw, BASEBAND_CONFIG_PHY_REG);
-        }
-        if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!");
-                return false;
-        }
-        rtstatus = config_bb_with_header(hw, BASEBAND_CONFIG_AGC_TAB);
-        if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
-                return false;
-        }
-        rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
-                                 RFPGA0_XA_HSSIPARAMETER2, 0x200));
-
-        return true;
-}
-
-static void rtl88e_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        int jj = RF90_PATH_A;
-        int kk = RF90_PATH_B;
-
-        rtlphy->phyreg_def[jj].rfintfs = RFPGA0_XAB_RFINTERFACESW;
-        rtlphy->phyreg_def[kk].rfintfs = RFPGA0_XAB_RFINTERFACESW;
-        rtlphy->phyreg_def[RF90_PATH_C].rfintfs = RFPGA0_XCD_RFINTERFACESW;
-        rtlphy->phyreg_def[RF90_PATH_D].rfintfs = RFPGA0_XCD_RFINTERFACESW;
-
-        rtlphy->phyreg_def[jj].rfintfi = RFPGA0_XAB_RFINTERFACERB;
-        rtlphy->phyreg_def[kk].rfintfi = RFPGA0_XAB_RFINTERFACERB;
-        rtlphy->phyreg_def[RF90_PATH_C].rfintfi = RFPGA0_XCD_RFINTERFACERB;
-        rtlphy->phyreg_def[RF90_PATH_D].rfintfi = RFPGA0_XCD_RFINTERFACERB;
-
-        rtlphy->phyreg_def[jj].rfintfo = RFPGA0_XA_RFINTERFACEOE;
-        rtlphy->phyreg_def[kk].rfintfo = RFPGA0_XB_RFINTERFACEOE;
-
-        rtlphy->phyreg_def[jj].rfintfe = RFPGA0_XA_RFINTERFACEOE;
-        rtlphy->phyreg_def[kk].rfintfe = RFPGA0_XB_RFINTERFACEOE;
-
-        rtlphy->phyreg_def[jj].rf3wire_offset = RFPGA0_XA_LSSIPARAMETER;
-        rtlphy->phyreg_def[kk].rf3wire_offset = RFPGA0_XB_LSSIPARAMETER;
-
-        rtlphy->phyreg_def[jj].rflssi_select = rFPGA0_XAB_RFPARAMETER;
-        rtlphy->phyreg_def[kk].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[jj].rftxgain_stage = RFPGA0_TXGAINSTAGE;
-        rtlphy->phyreg_def[kk].rftxgain_stage = RFPGA0_TXGAINSTAGE;
-        rtlphy->phyreg_def[RF90_PATH_C].rftxgain_stage = RFPGA0_TXGAINSTAGE;
-        rtlphy->phyreg_def[RF90_PATH_D].rftxgain_stage = RFPGA0_TXGAINSTAGE;
-
-        rtlphy->phyreg_def[jj].rfhssi_para1 = RFPGA0_XA_HSSIPARAMETER1;
-        rtlphy->phyreg_def[kk].rfhssi_para1 = RFPGA0_XB_HSSIPARAMETER1;
-
-        rtlphy->phyreg_def[jj].rfhssi_para2 = RFPGA0_XA_HSSIPARAMETER2;
-        rtlphy->phyreg_def[kk].rfhssi_para2 = RFPGA0_XB_HSSIPARAMETER2;
-
-        rtlphy->phyreg_def[jj].rfsw_ctrl = RFPGA0_XAB_SWITCHCONTROL;
-        rtlphy->phyreg_def[kk].rfsw_ctrl = RFPGA0_XAB_SWITCHCONTROL;
-        rtlphy->phyreg_def[RF90_PATH_C].rfsw_ctrl = RFPGA0_XCD_SWITCHCONTROL;
-        rtlphy->phyreg_def[RF90_PATH_D].rfsw_ctrl = RFPGA0_XCD_SWITCHCONTROL;
-
-        rtlphy->phyreg_def[jj].rfagc_control1 = ROFDM0_XAAGCCORE1;
-        rtlphy->phyreg_def[kk].rfagc_control1 = ROFDM0_XBAGCCORE1;
-        rtlphy->phyreg_def[RF90_PATH_C].rfagc_control1 = ROFDM0_XCAGCCORE1;
-        rtlphy->phyreg_def[RF90_PATH_D].rfagc_control1 = ROFDM0_XDAGCCORE1;
-
-        rtlphy->phyreg_def[jj].rfagc_control2 = ROFDM0_XAAGCCORE2;
-        rtlphy->phyreg_def[kk].rfagc_control2 = ROFDM0_XBAGCCORE2;
-        rtlphy->phyreg_def[RF90_PATH_C].rfagc_control2 = ROFDM0_XCAGCCORE2;
-        rtlphy->phyreg_def[RF90_PATH_D].rfagc_control2 = ROFDM0_XDAGCCORE2;
-
-        rtlphy->phyreg_def[jj].rfrxiq_imbal = ROFDM0_XARXIQIMBAL;
-        rtlphy->phyreg_def[kk].rfrxiq_imbal = ROFDM0_XBRXIQIMBAL;
-        rtlphy->phyreg_def[RF90_PATH_C].rfrxiq_imbal = ROFDM0_XCRXIQIMBAL;
-        rtlphy->phyreg_def[RF90_PATH_D].rfrxiq_imbal = ROFDM0_XDRXIQIMBAL;
-
-        rtlphy->phyreg_def[jj].rfrx_afe = ROFDM0_XARXAFE;
-        rtlphy->phyreg_def[kk].rfrx_afe = ROFDM0_XBRXAFE;
-        rtlphy->phyreg_def[RF90_PATH_C].rfrx_afe = ROFDM0_XCRXAFE;
-        rtlphy->phyreg_def[RF90_PATH_D].rfrx_afe = ROFDM0_XDRXAFE;
-
-        rtlphy->phyreg_def[jj].rftxiq_imbal = ROFDM0_XATXIQIMBAL;
-        rtlphy->phyreg_def[kk].rftxiq_imbal = ROFDM0_XBTXIQIMBAL;
-        rtlphy->phyreg_def[RF90_PATH_C].rftxiq_imbal = ROFDM0_XCTXIQIMBAL;
-        rtlphy->phyreg_def[RF90_PATH_D].rftxiq_imbal = ROFDM0_XDTXIQIMBAL;
-
-        rtlphy->phyreg_def[jj].rftx_afe = ROFDM0_XATXAFE;
-        rtlphy->phyreg_def[kk].rftx_afe = ROFDM0_XBTXAFE;
-
-        rtlphy->phyreg_def[jj].rf_rb = RFPGA0_XA_LSSIREADBACK;
-        rtlphy->phyreg_def[kk].rf_rb = RFPGA0_XB_LSSIREADBACK;
-
-        rtlphy->phyreg_def[jj].rf_rbpi = TRANSCEIVEA_HSPI_READBACK;
-        rtlphy->phyreg_def[kk].rf_rbpi = TRANSCEIVEB_HSPI_READBACK;
-}
-
-static bool rtl88e_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
-                                            u32 cmdtableidx, u32 cmdtablesz,
-                                            enum swchnlcmd_id cmdid,
-                                            u32 para1, u32 para2, u32 msdelay)
-{
-        struct swchnlcmd *pcmd;
-
-        if (cmdtable == NULL) {
-                RT_ASSERT(false, "cmdtable cannot be NULL.\n");
-                return false;
-        }
-
-        if (cmdtableidx >= cmdtablesz)
-                return false;
-
-        pcmd = cmdtable + cmdtableidx;
-        pcmd->cmdid = cmdid;
-        pcmd->para1 = para1;
-        pcmd->para2 = para2;
-        pcmd->msdelay = msdelay;
-        return true;
-}
-
-static bool chnl_step_by_step(struct ieee80211_hw *hw,
-                              u8 channel, u8 *stage, u8 *step,
-                              u32 *delay)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct swchnlcmd precommoncmd[MAX_PRECMD_CNT];
-        u32 precommoncmdcnt;
-        struct swchnlcmd postcommoncmd[MAX_POSTCMD_CNT];
-        u32 postcommoncmdcnt;
-        struct swchnlcmd rfdependcmd[MAX_RFDEPENDCMD_CNT];
-        u32 rfdependcmdcnt;
-        struct swchnlcmd *currentcmd = NULL;
-        u8 rfpath;
-        u8 num_total_rfpath = rtlphy->num_total_rfpath;
-
-        precommoncmdcnt = 0;
-        rtl88e_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
-                                        MAX_PRECMD_CNT,
-                                        CMDID_SET_TXPOWEROWER_LEVEL, 0, 0, 0);
-        rtl88e_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
-                                        MAX_PRECMD_CNT, CMDID_END, 0, 0, 0);
-
-        postcommoncmdcnt = 0;
-
-        rtl88e_phy_set_sw_chnl_cmdarray(postcommoncmd, postcommoncmdcnt++,
-                                        MAX_POSTCMD_CNT, CMDID_END, 0, 0, 0);
-
-        rfdependcmdcnt = 0;
-
-        RT_ASSERT((channel >= 1 && channel <= 14),
-                  "illegal channel for Zebra: %d\n", channel);
-
-        rtl88e_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
-                                        MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
-                                        RF_CHNLBW, channel, 10);
-
-        rtl88e_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
-                                        MAX_RFDEPENDCMD_CNT, CMDID_END, 0, 0,
-                                         0);
-
-        do {
-                switch (*stage) {
-                case 0:
-                        currentcmd = &precommoncmd[*step];
-                        break;
-                case 1:
-                        currentcmd = &rfdependcmd[*step];
-                        break;
-                case 2:
-                        currentcmd = &postcommoncmd[*step];
-                        break;
-                }
-
-                if (currentcmd->cmdid == CMDID_END) {
-                        if ((*stage) == 2) {
-                                return true;
-                        } else {
-                                (*stage)++;
-                                (*step) = 0;
-                                continue;
-                        }
-                }
-
-                switch (currentcmd->cmdid) {
-                case CMDID_SET_TXPOWEROWER_LEVEL:
-                        rtl88e_phy_set_txpower_level(hw, channel);
-                        break;
-                case CMDID_WRITEPORT_ULONG:
-                        rtl_write_dword(rtlpriv, currentcmd->para1,
-                                        currentcmd->para2);
-                        break;
-                case CMDID_WRITEPORT_USHORT:
-                        rtl_write_word(rtlpriv, currentcmd->para1,
-                                       (u16) currentcmd->para2);
-                        break;
-                case CMDID_WRITEPORT_UCHAR:
-                        rtl_write_byte(rtlpriv, currentcmd->para1,
-                                       (u8) currentcmd->para2);
-                        break;
-                case CMDID_RF_WRITEREG:
-                        for (rfpath = 0; rfpath < num_total_rfpath; rfpath++) {
-                                rtlphy->rfreg_chnlval[rfpath] =
-                                    ((rtlphy->rfreg_chnlval[rfpath] &
-                                      0xfffffc00) | currentcmd->para2);
-
-                                rtl_set_rfreg(hw, (enum radio_path)rfpath,
-                                              currentcmd->para1,
-                                              RFREG_OFFSET_MASK,
-                                              rtlphy->rfreg_chnlval[rfpath]);
-                        }
-                        break;
-                default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
-                        break;
-                }
-
-                break;
-        } while (true);
-
-        (*delay) = currentcmd->msdelay;
-        (*step)++;
-        return false;
-}
-
-static long rtl88e_pwr_idx_dbm(struct ieee80211_hw *hw,
-                               enum wireless_mode wirelessmode,
-                               u8 txpwridx)
-{
-        long offset;
-        long pwrout_dbm;
-
-        switch (wirelessmode) {
-        case WIRELESS_MODE_B:
-                offset = -7;
-                break;
-        case WIRELESS_MODE_G:
-        case WIRELESS_MODE_N_24G:
-                offset = -8;
-                break;
-        default:
-                offset = -8;
-                break;
-        }
-        pwrout_dbm = txpwridx / 2 + offset;
-        return pwrout_dbm;
-}
-
-static void rtl88e_phy_set_io(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
-
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
-                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
-        switch (rtlphy->current_io_type) {
-        case IO_CMD_RESUME_DM_BY_SCAN:
-                dm_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
-                /*rtl92c_dm_write_dig(hw);*/
-                rtl88e_phy_set_txpower_level(hw, rtlphy->current_channel);
-                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x83);
-                break;
-        case IO_CMD_PAUSE_DM_BY_SCAN:
-                rtlphy->initgain_backup.xaagccore1 = dm_digtable->cur_igvalue;
-                dm_digtable->cur_igvalue = 0x17;
-                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x40);
-                break;
-        default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
-                break;
-        }
-        rtlphy->set_io_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 "(%#x)\n", rtlphy->current_io_type);
-}
+static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw,
+                                      enum radio_path rfpath, u32 offset);
+static void _rtl88e_phy_rf_serial_write(struct ieee80211_hw *hw,
+                                        enum radio_path rfpath, u32 offset,
+                                        u32 data);
+static u32 _rtl88e_phy_calculate_bit_shift(u32 bitmask);
+static bool _rtl88e_phy_bb8188e_config_parafile(struct ieee80211_hw *hw);
+static bool _rtl88e_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
+static bool phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
+                                          u8 configtype);
+static bool phy_config_bb_with_pghdr(struct ieee80211_hw *hw,
+                                     u8 configtype);
+static void _rtl88e_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw);
+static bool _rtl88e_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
+                                             u32 cmdtableidx, u32 cmdtablesz,
+                                             enum swchnlcmd_id cmdid, u32 para1,
+                                             u32 para2, u32 msdelay);
+static bool _rtl88e_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+                                             u8 channel, u8 *stage, u8 *step,
+                                             u32 *delay);
+
+static long _rtl88e_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
+                                         enum wireless_mode wirelessmode,
+                                         u8 txpwridx);
+static void rtl88ee_phy_set_rf_on(struct ieee80211_hw *hw);
+static void rtl88e_phy_set_io(struct ieee80211_hw *hw);
 
 u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
 {
@@ -484,14 +68,15 @@ u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                  "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
         originalvalue = rtl_read_dword(rtlpriv, regaddr);
-        bitshift = cal_bit_shift(bitmask);
+        bitshift = _rtl88e_phy_calculate_bit_shift(bitmask);
         returnvalue = (originalvalue & bitmask) >> bitshift;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 "BBR MASK = 0x%x Addr[0x%x]= 0x%x\n", bitmask,
+                 "BBR MASK=0x%x Addr[0x%x]=0x%x\n", bitmask,
                  regaddr, originalvalue);
 
         return returnvalue;
+
 }
 
 void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw,
@@ -501,12 +86,12 @@ void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw,
         u32 originalvalue, bitshift;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 "regaddr(%#x), bitmask(%#x),data(%#x)\n",
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
                  regaddr, bitmask, data);
 
         if (bitmask != MASKDWORD) {
                 originalvalue = rtl_read_dword(rtlpriv, regaddr);
-                bitshift = cal_bit_shift(bitmask);
+                bitshift = _rtl88e_phy_calculate_bit_shift(bitmask);
                 data = ((originalvalue & (~bitmask)) | (data << bitshift));
         }
 
@@ -531,8 +116,8 @@ u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw,
         spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
 
 
-        original_value = rf_serial_read(hw, rfpath, regaddr);
-        bitshift = cal_bit_shift(bitmask);
+        original_value = _rtl88e_phy_rf_serial_read(hw, rfpath, regaddr);
+        bitshift = _rtl88e_phy_calculate_bit_shift(bitmask);
         readback_value = (original_value & bitmask) >> bitshift;
 
         spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
@@ -540,7 +125,6 @@ u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                  "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
                   regaddr, rfpath, bitmask, original_value);
-
         return readback_value;
 }
 
@@ -559,13 +143,16 @@ void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw,
         spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
 
         if (bitmask != RFREG_OFFSET_MASK) {
-                        original_value = rf_serial_read(hw, rfpath, regaddr);
-                        bitshift = cal_bit_shift(bitmask);
-                        data = ((original_value & (~bitmask)) |
-                                (data << bitshift));
+                        original_value = _rtl88e_phy_rf_serial_read(hw,
+                                                                    rfpath,
+                                                                    regaddr);
+                        bitshift = _rtl88e_phy_calculate_bit_shift(bitmask);
+                        data =
+                            ((original_value & (~bitmask)) |
+                             (data << bitshift));
                 }
 
-        rf_serial_write(hw, rfpath, regaddr, data);
+        _rtl88e_phy_rf_serial_write(hw, rfpath, regaddr, data);
 
 
         spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
@@ -575,27 +162,91 @@ void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw,
                  regaddr, bitmask, data, rfpath);
 }
 
-static bool config_mac_with_header(struct ieee80211_hw *hw)
+static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw,
+                                      enum radio_path rfpath, u32 offset)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
+        u32 newoffset;
+        u32 tmplong, tmplong2;
+        u8 rfpi_enable = 0;
+        u32 retvalue;
+
+        offset &= 0xff;
+        newoffset = offset;
+        if (RT_CANNOT_IO(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "return all one\n");
+                return 0xFFFFFFFF;
+        }
+        tmplong = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD);
+        if (rfpath == RF90_PATH_A)
+                tmplong2 = tmplong;
+        else
+                tmplong2 = rtl_get_bbreg(hw, pphyreg->rfhssi_para2, MASKDWORD);
+        tmplong2 = (tmplong2 & (~BLSSIREADADDRESS)) |
+            (newoffset << 23) | BLSSIREADEDGE;
+        rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
+                      tmplong & (~BLSSIREADEDGE));
+        mdelay(1);
+        rtl_set_bbreg(hw, pphyreg->rfhssi_para2, MASKDWORD, tmplong2);
+        mdelay(2);
+        if (rfpath == RF90_PATH_A)
+                rfpi_enable = (u8)rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
+                                                BIT(8));
+        else if (rfpath == RF90_PATH_B)
+                rfpi_enable = (u8)rtl_get_bbreg(hw, RFPGA0_XB_HSSIPARAMETER1,
+                                                BIT(8));
+        if (rfpi_enable)
+                retvalue = rtl_get_bbreg(hw, pphyreg->rf_rbpi,
+                                         BLSSIREADBACKDATA);
+        else
+                retvalue = rtl_get_bbreg(hw, pphyreg->rf_rb,
+                                         BLSSIREADBACKDATA);
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "RFR-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf_rb, retvalue);
+        return retvalue;
+}
+
+static void _rtl88e_phy_rf_serial_write(struct ieee80211_hw *hw,
+                                        enum radio_path rfpath, u32 offset,
+                                        u32 data)
+{
+        u32 data_and_addr;
+        u32 newoffset;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
+
+        if (RT_CANNOT_IO(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "stop\n");
+                return;
+        }
+        offset &= 0xff;
+        newoffset = offset;
+        data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
+        rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
+}
+
+static u32 _rtl88e_phy_calculate_bit_shift(u32 bitmask)
+{
         u32 i;
-        u32 arraylength;
-        u32 *ptrarray;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl8188EMACPHY_Array\n");
-        arraylength = RTL8188EEMAC_1T_ARRAYLEN;
-        ptrarray = RTL8188EEMAC_1T_ARRAY;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "Img:RTL8188EEMAC_1T_ARRAY LEN %d\n", arraylength);
-        for (i = 0; i < arraylength; i = i + 2)
-                rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
-        return true;
+        for (i = 0; i <= 31; i++) {
+                if (((bitmask >> i) & 0x1) == 1)
+                        break;
+        }
+        return i;
 }
 
 bool rtl88e_phy_mac_config(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        bool rtstatus = config_mac_with_header(hw);
+        bool rtstatus = _rtl88e_phy_config_mac_with_headerfile(hw);
 
         rtl_write_byte(rtlpriv, 0x04CA, 0x0B);
         return rtstatus;
@@ -606,9 +257,9 @@ bool rtl88e_phy_bb_config(struct ieee80211_hw *hw)
         bool rtstatus = true;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u16 regval;
-        u8 reg_hwparafile = 1;
+        u8 b_reg_hwparafile = 1;
         u32 tmp;
-        rtl88e_phy_init_bb_rf_register_definition(hw);
+        _rtl88e_phy_init_bb_rf_register_definition(hw);
         regval = rtl_read_word(rtlpriv, REG_SYS_FUNC_EN);
         rtl_write_word(rtlpriv, REG_SYS_FUNC_EN,
                        regval | BIT(13) | BIT(0) | BIT(1));
@@ -619,8 +270,8 @@ bool rtl88e_phy_bb_config(struct ieee80211_hw *hw)
                        FEN_BB_GLB_RSTN | FEN_BBRSTB);
         tmp = rtl_read_dword(rtlpriv, 0x4c);
         rtl_write_dword(rtlpriv, 0x4c, tmp | BIT(23));
-        if (reg_hwparafile == 1)
-                rtstatus = config_parafile(hw);
+        if (b_reg_hwparafile == 1)
+                rtstatus = _rtl88e_phy_bb8188e_config_parafile(hw);
         return rtstatus;
 }
 
@@ -629,12 +280,12 @@ bool rtl88e_phy_rf_config(struct ieee80211_hw *hw)
         return rtl88e_phy_rf6052_config(hw);
 }
 
-static bool check_cond(struct ieee80211_hw *hw,
+static bool _rtl88e_check_condition(struct ieee80211_hw *hw,
                                     const u32  condition)
 {
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
-        u32 _board = fuse->board_type; /*need efuse define*/
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u32 _board = rtlefuse->board_type; /*need efuse define*/
         u32 _interface = rtlhal->interface;
         u32 _platform = 0x08;/*SupportPlatform */
         u32 cond = condition;
@@ -658,314 +309,504 @@ static bool check_cond(struct ieee80211_hw *hw,
         return true;
 }
 
-static void _rtl8188e_config_rf_reg(struct ieee80211_hw *hw,
-                                    u32 addr, u32 data, enum radio_path rfpath,
+static void _rtl8188e_config_rf_reg(struct ieee80211_hw *hw, u32 addr,
+                                    u32 data, enum radio_path rfpath,
                                     u32 regaddr)
 {
-        rtl_rfreg_delay(hw, rfpath, regaddr,
-                        RFREG_OFFSET_MASK,
-                        data);
+        if (addr == 0xffe) {
+                mdelay(50);
+        } else if (addr == 0xfd) {
+                mdelay(5);
+        } else if (addr == 0xfc) {
+                mdelay(1);
+        } else if (addr == 0xfb) {
+                udelay(50);
+        } else if (addr == 0xfa) {
+                udelay(5);
+        } else if (addr == 0xf9) {
+                udelay(1);
+        } else {
+                rtl_set_rfreg(hw, rfpath, regaddr,
+                              RFREG_OFFSET_MASK,
+                              data);
+                udelay(1);
+        }
 }
 
-static void rtl88_config_s(struct ieee80211_hw *hw,
-        u32 addr, u32 data)
+static void _rtl8188e_config_rf_radio_a(struct ieee80211_hw *hw,
+                                        u32 addr, u32 data)
 {
         u32 content = 0x1000; /*RF Content: radio_a_txt*/
         u32 maskforphyset = (u32)(content & 0xE000);
 
         _rtl8188e_config_rf_reg(hw, addr, data, RF90_PATH_A,
-                                addr | maskforphyset);
+                addr | maskforphyset);
+}
+
+static void _rtl8188e_config_bb_reg(struct ieee80211_hw *hw,
+                                    u32 addr, u32 data)
+{
+        if (addr == 0xfe) {
+                mdelay(50);
+        } else if (addr == 0xfd) {
+                mdelay(5);
+        } else if (addr == 0xfc) {
+                mdelay(1);
+        } else if (addr == 0xfb) {
+                udelay(50);
+        } else if (addr == 0xfa) {
+                udelay(5);
+        } else if (addr == 0xf9) {
+                udelay(1);
+        } else {
+                rtl_set_bbreg(hw, addr, MASKDWORD, data);
+                udelay(1);
+        }
 }
 
-#define NEXT_PAIR(v1, v2, i)                            \
+static bool _rtl88e_phy_bb8188e_config_parafile(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));
+        bool rtstatus;
+
+        rtstatus = phy_config_bb_with_headerfile(hw, BASEBAND_CONFIG_PHY_REG);
+        if (!rtstatus) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!");
+                return false;
+        }
+
+        if (!rtlefuse->autoload_failflag) {
+                rtlphy->pwrgroup_cnt = 0;
+                rtstatus =
+                  phy_config_bb_with_pghdr(hw, BASEBAND_CONFIG_PHY_REG);
+        }
+        if (!rtstatus) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!");
+                return false;
+        }
+        rtstatus =
+          phy_config_bb_with_headerfile(hw, BASEBAND_CONFIG_AGC_TAB);
+        if (!rtstatus) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
+                return false;
+        }
+        rtlphy->cck_high_power =
+          (bool)(rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, 0x200));
+
+        return true;
+}
+
+static bool _rtl88e_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+        u32 arraylength;
+        u32 *ptrarray;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl8188EMACPHY_Array\n");
+        arraylength = RTL8188EEMAC_1T_ARRAYLEN;
+        ptrarray = RTL8188EEMAC_1T_ARRAY;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Img:RTL8188EEMAC_1T_ARRAY LEN %d\n", arraylength);
+        for (i = 0; i < arraylength; i = i + 2)
+                rtl_write_byte(rtlpriv, ptrarray[i], (u8)ptrarray[i + 1]);
+        return true;
+}
+
+#define READ_NEXT_PAIR(v1, v2, i)                       \
         do {                                            \
                 i += 2; v1 = array_table[i];            \
-                v2 = array_table[i + 1];                \
+                v2 = array_table[i+1];                  \
         } while (0)
 
-static void set_baseband_agc_config(struct ieee80211_hw *hw)
+static void handle_branch1(struct ieee80211_hw *hw, u16 arraylen,
+                           u32 *array_table)
 {
+        u32 v1;
+        u32 v2;
         int i;
-        u32 *array_table;
-        u16 arraylen;
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 v1 = 0, v2 = 0;
 
-        arraylen = RTL8188EEAGCTAB_1TARRAYLEN;
-        array_table = RTL8188EEAGCTAB_1TARRAY;
+        for (i = 0; i < arraylen; i = i + 2) {
+                v1 = array_table[i];
+                v2 = array_table[i+1];
+                if (v1 < 0xcdcdcdcd) {
+                        _rtl8188e_config_bb_reg(hw, v1, v2);
+                } else { /*This line is the start line of branch.*/
+                        /* to protect READ_NEXT_PAIR not overrun */
+                        if (i >= arraylen - 2)
+                                break;
+
+                        if (!_rtl88e_check_condition(hw, array_table[i])) {
+                                /*Discard the following (offset, data) pairs*/
+                                READ_NEXT_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylen - 2)
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                i -= 2; /* prevent from for-loop += 2*/
+                        } else { /* Configure matched pairs and skip
+                                  * to end of if-else.
+                                  */
+                                READ_NEXT_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylen - 2)
+                                        _rtl8188e_config_bb_reg(hw, v1, v2);
+                                        READ_NEXT_PAIR(v1, v2, i);
+
+                                while (v2 != 0xDEAD && i < arraylen - 2)
+                                        READ_NEXT_PAIR(v1, v2, i);
+                        }
+                }
+        }
+}
+
+static void handle_branch2(struct ieee80211_hw *hw, u16 arraylen,
+                           u32 *array_table)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 v1;
+        u32 v2;
+        int i;
 
-        for (i = 0; i < arraylen; i += 2) {
+        for (i = 0; i < arraylen; i = i + 2) {
                 v1 = array_table[i];
-                v2 = array_table[i + 1];
+                v2 = array_table[i+1];
                 if (v1 < 0xCDCDCDCD) {
                         rtl_set_bbreg(hw, array_table[i], MASKDWORD,
                                       array_table[i + 1]);
                         udelay(1);
                         continue;
-                } else {/*This line is the start line of branch.*/
-                        if (!check_cond(hw, array_table[i])) {
+                } else { /*This line is the start line of branch.*/
+                        /* to protect READ_NEXT_PAIR not overrun */
+                        if (i >= arraylen - 2)
+                                break;
+
+                        if (!_rtl88e_check_condition(hw, array_table[i])) {
                                 /*Discard the following (offset, data) pairs*/
-                                NEXT_PAIR(v1, v2, i);
-                                while (v2 != 0xDEAD && v2 != 0xCDEF &&
-                                       v2 != 0xCDCD && i < arraylen - 2) {
-                                        NEXT_PAIR(v1, v2, i);
-                                }
-                                i -= 2; /* compensate for loop's += 2*/
-                        } else {
-                                /* Configure matched pairs and skip to end */
-                                NEXT_PAIR(v1, v2, i);
-                                while (v2 != 0xDEAD && v2 != 0xCDEF &&
+                                READ_NEXT_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylen - 2)
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                i -= 2; /* prevent from for-loop += 2*/
+                        } else { /* Configure matched pairs and skip
+                                  * to end of if-else.
+                                  */
+                                READ_NEXT_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
                                        v2 != 0xCDCD && i < arraylen - 2) {
                                         rtl_set_bbreg(hw, array_table[i],
                                                       MASKDWORD,
                                                       array_table[i + 1]);
                                         udelay(1);
-                                        NEXT_PAIR(v1, v2, i);
+                                        READ_NEXT_PAIR(v1, v2, i);
                                 }
 
                                 while (v2 != 0xDEAD && i < arraylen - 2)
-                                        NEXT_PAIR(v1, v2, i);
+                                        READ_NEXT_PAIR(v1, v2, i);
                         }
                 }
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "The agctab_array_table[0] is %x Rtl818EEPHY_REGArray[1] is %x\n",
-                         array_table[i],
-                         array_table[i + 1]);
+                         array_table[i], array_table[i + 1]);
         }
 }
 
-static void set_baseband_phy_config(struct ieee80211_hw *hw)
+static bool phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
+                                          u8 configtype)
 {
-        int i;
         u32 *array_table;
         u16 arraylen;
-        u32 v1 = 0, v2 = 0;
-
-        arraylen = RTL8188EEPHY_REG_1TARRAYLEN;
-        array_table = RTL8188EEPHY_REG_1TARRAY;
-
-        for (i = 0; i < arraylen; i += 2) {
-                v1 = array_table[i];
-                v2 = array_table[i + 1];
-                if (v1 < 0xcdcdcdcd) {
-                        rtl_bb_delay(hw, v1, v2);
-                } else {/*This line is the start line of branch.*/
-                        if (!check_cond(hw, array_table[i])) {
-                                /*Discard the following (offset, data) pairs*/
-                                NEXT_PAIR(v1, v2, i);
-                                while (v2 != 0xDEAD &&
-                                       v2 != 0xCDEF &&
-                                       v2 != 0xCDCD && i < arraylen - 2)
-                                        NEXT_PAIR(v1, v2, i);
-                                i -= 2; /* prevent from for-loop += 2*/
-                        } else {
-                                /* Configure matched pairs and skip to end */
-                                NEXT_PAIR(v1, v2, i);
-                                while (v2 != 0xDEAD &&
-                                       v2 != 0xCDEF &&
-                                       v2 != 0xCDCD && i < arraylen - 2) {
-                                        rtl_bb_delay(hw, v1, v2);
-                                        NEXT_PAIR(v1, v2, i);
-                                }
 
-                                while (v2 != 0xDEAD && i < arraylen - 2)
-                                        NEXT_PAIR(v1, v2, i);
-                        }
-                }
+        if (configtype == BASEBAND_CONFIG_PHY_REG) {
+                arraylen = RTL8188EEPHY_REG_1TARRAYLEN;
+                array_table = RTL8188EEPHY_REG_1TARRAY;
+                handle_branch1(hw, arraylen, array_table);
+        } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
+                arraylen = RTL8188EEAGCTAB_1TARRAYLEN;
+                array_table = RTL8188EEAGCTAB_1TARRAY;
+                handle_branch2(hw, arraylen, array_table);
         }
+        return true;
 }
 
-static void store_pwrindex_offset(struct ieee80211_hw *hw,
-                                  u32 regaddr, u32 bitmask,
-                                  u32 data)
+static void store_pwrindex_rate_offset(struct ieee80211_hw *hw,
+                                       u32 regaddr, u32 bitmask,
+                                       u32 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        int count = rtlphy->pwrgroup_cnt;
 
         if (regaddr == RTXAGC_A_RATE18_06) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][0] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][0] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][0]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][0]);
         }
         if (regaddr == RTXAGC_A_RATE54_24) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][1] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][1] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][1]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][1]);
         }
         if (regaddr == RTXAGC_A_CCK1_MCS32) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][6] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][6] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][6]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][6]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][7] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][7] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][7]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][7]);
         }
         if (regaddr == RTXAGC_A_MCS03_MCS00) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][2] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][2] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][2]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][2]);
         }
         if (regaddr == RTXAGC_A_MCS07_MCS04) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][3] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][3] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][3]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][3]);
         }
         if (regaddr == RTXAGC_A_MCS11_MCS08) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][4] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][4] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][4]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][4]);
         }
         if (regaddr == RTXAGC_A_MCS15_MCS12) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][5] = data;
-                if (get_rf_type(rtlphy) == RF_1T1R)
-                        rtlphy->pwrgroup_cnt++;
+                rtlphy->mcs_txpwrlevel_origoffset[count][5] = data;
+                if (get_rf_type(rtlphy) == RF_1T1R) {
+                        count++;
+                        rtlphy->pwrgroup_cnt = count;
+                }
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][5]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][5]);
         }
         if (regaddr == RTXAGC_B_RATE18_06) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][8] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][8] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][8]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][8]);
         }
         if (regaddr == RTXAGC_B_RATE54_24) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][9] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][9] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][9]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][9]);
         }
         if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][14] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][14] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][14]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][14]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][15] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][15] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][15]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][15]);
         }
         if (regaddr == RTXAGC_B_MCS03_MCS00) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][10] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][10] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][10]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][10]);
         }
         if (regaddr == RTXAGC_B_MCS07_MCS04) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][11] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][11] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][11]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][11]);
         }
         if (regaddr == RTXAGC_B_MCS11_MCS08) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][12] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][12] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][12]);
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][12]);
         }
         if (regaddr == RTXAGC_B_MCS15_MCS12) {
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][13] = data;
+                rtlphy->mcs_txpwrlevel_origoffset[count][13] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][13]);
-                if (get_rf_type(rtlphy) != RF_1T1R)
-                        rtlphy->pwrgroup_cnt++;
+                          count,
+                          rtlphy->mcs_txpwrlevel_origoffset[count][13]);
+                if (get_rf_type(rtlphy) != RF_1T1R) {
+                        count++;
+                        rtlphy->pwrgroup_cnt = count;
+                }
         }
 }
 
-#define READ_NEXT_RF_PAIR(v1, v2, i)            \
-        do {                                    \
-                i += 2; v1 = a_table[i];        \
-                v2 = a_table[i + 1];            \
-        } while (0)
-
-bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
-                                          enum radio_path rfpath)
+static bool phy_config_bb_with_pghdr(struct ieee80211_hw *hw, u8 configtype)
 {
-        int i;
-        u32 *a_table;
-        u16 a_len;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u32 v1 = 0, v2 = 0;
+        int i;
+        u32 *phy_reg_page;
+        u16 phy_reg_page_len;
+        u32 v1 = 0, v2 = 0, v3 = 0;
+
+        phy_reg_page_len = RTL8188EEPHY_REG_ARRAY_PGLEN;
+        phy_reg_page = RTL8188EEPHY_REG_ARRAY_PG;
+
+        if (configtype == BASEBAND_CONFIG_PHY_REG) {
+                for (i = 0; i < phy_reg_page_len; i = i + 3) {
+                        v1 = phy_reg_page[i];
+                        v2 = phy_reg_page[i+1];
+                        v3 = phy_reg_page[i+2];
 
-        a_len = RTL8188EE_RADIOA_1TARRAYLEN;
-        a_table = RTL8188EE_RADIOA_1TARRAY;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "Radio_A:RTL8188EE_RADIOA_1TARRAY %d\n", a_len);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
-        switch (rfpath) {
-        case RF90_PATH_A:
-                for (i = 0; i < a_len; i = i + 2) {
-                        v1 = a_table[i];
-                        v2 = a_table[i + 1];
                         if (v1 < 0xcdcdcdcd) {
-                                rtl88_config_s(hw, v1, v2);
-                        } else {/*This line is the start line of branch.*/
-                                if (!check_cond(hw, a_table[i])) {
-                                        /* Discard the following (offset, data)
-                                         * pairs
-                                         */
+                                if (phy_reg_page[i] == 0xfe)
+                                        mdelay(50);
+                                else if (phy_reg_page[i] == 0xfd)
+                                        mdelay(5);
+                                else if (phy_reg_page[i] == 0xfc)
+                                        mdelay(1);
+                                else if (phy_reg_page[i] == 0xfb)
+                                        udelay(50);
+                                else if (phy_reg_page[i] == 0xfa)
+                                        udelay(5);
+                                else if (phy_reg_page[i] == 0xf9)
+                                        udelay(1);
+
+                                store_pwrindex_rate_offset(hw, phy_reg_page[i],
+                                                           phy_reg_page[i + 1],
+                                                           phy_reg_page[i + 2]);
+                                continue;
+                        } else {
+                                if (!_rtl88e_check_condition(hw,
+                                                             phy_reg_page[i])) {
+                                        /*don't need the hw_body*/
+                                    i += 2; /* skip the pair of expression*/
+                                    /* to protect 'i+1' 'i+2' not overrun */
+                                    if (i >= phy_reg_page_len - 2)
+                                        break;
+
+                                    v1 = phy_reg_page[i];
+                                    v2 = phy_reg_page[i+1];
+                                    v3 = phy_reg_page[i+2];
+                                    while (v2 != 0xDEAD &&
+                                           i < phy_reg_page_len - 5) {
+                                        i += 3;
+                                        v1 = phy_reg_page[i];
+                                        v2 = phy_reg_page[i+1];
+                                        v3 = phy_reg_page[i+2];
+                                    }
+                                }
+                        }
+                }
+        } else {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "configtype != BaseBand_Config_PHY_REG\n");
+        }
+        return true;
+}
+
+#define READ_NEXT_RF_PAIR(v1, v2, i) \
+do { \
+        i += 2; \
+        v1 = radioa_array_table[i]; \
+        v2 = radioa_array_table[i+1]; \
+} while (0)
+
+static void process_path_a(struct ieee80211_hw *hw,
+                           u16  radioa_arraylen,
+                           u32 *radioa_array_table)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 v1, v2;
+        int i;
+
+        for (i = 0; i < radioa_arraylen; i = i + 2) {
+                v1 = radioa_array_table[i];
+                v2 = radioa_array_table[i+1];
+                if (v1 < 0xcdcdcdcd) {
+                        _rtl8188e_config_rf_radio_a(hw, v1, v2);
+                } else { /*This line is the start line of branch.*/
+                        /* to protect READ_NEXT_PAIR not overrun */
+                        if (i >= radioa_arraylen - 2)
+                                break;
+
+                        if (!_rtl88e_check_condition(hw, radioa_array_table[i])) {
+                                /*Discard the following (offset, data) pairs*/
+                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD &&
+                                       i < radioa_arraylen - 2) {
                                         READ_NEXT_RF_PAIR(v1, v2, i);
-                                        while (v2 != 0xDEAD && v2 != 0xCDEF &&
-                                               v2 != 0xCDCD && i < a_len - 2)
-                                                READ_NEXT_RF_PAIR(v1, v2, i);
-                                        i -= 2; /* prevent from for-loop += 2*/
-                                } else {
-                                        /* Configure matched pairs and skip to
-                                         * end of if-else.
-                                         */
+                                }
+                                i -= 2; /* prevent from for-loop += 2*/
+                        } else { /* Configure matched pairs and
+                                  * skip to end of if-else.
+                                  */
+                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD &&
+                                       i < radioa_arraylen - 2) {
+                                        _rtl8188e_config_rf_radio_a(hw, v1, v2);
                                         READ_NEXT_RF_PAIR(v1, v2, i);
-                                        while (v2 != 0xDEAD && v2 != 0xCDEF &&
-                                               v2 != 0xCDCD && i < a_len - 2) {
-                                                rtl88_config_s(hw, v1, v2);
-                                                READ_NEXT_RF_PAIR(v1, v2, i);
-                                        }
-
-                                        while (v2 != 0xDEAD && i < a_len - 2)
-                                                READ_NEXT_RF_PAIR(v1, v2, i);
                                 }
+
+                                while (v2 != 0xDEAD &&
+                                       i < radioa_arraylen - 2)
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
                         }
                 }
+        }
 
-                if (rtlhal->oem_id == RT_CID_819X_HP)
-                        rtl88_config_s(hw, 0x52, 0x7E4BD);
+        if (rtlhal->oem_id == RT_CID_819X_HP)
+                _rtl8188e_config_rf_radio_a(hw, 0x52, 0x7E4BD);
+}
 
-                break;
+bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                          enum radio_path rfpath)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        bool rtstatus = true;
+        u32 *radioa_array_table;
+        u16 radioa_arraylen;
 
+        radioa_arraylen = RTL8188EE_RADIOA_1TARRAYLEN;
+        radioa_array_table = RTL8188EE_RADIOA_1TARRAY;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Radio_A:RTL8188EE_RADIOA_1TARRAY %d\n", radioa_arraylen);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
+        rtstatus = true;
+        switch (rfpath) {
+        case RF90_PATH_A:
+                process_path_a(hw, radioa_arraylen, radioa_array_table);
+                break;
         case RF90_PATH_B:
         case RF90_PATH_C:
         case RF90_PATH_D:
-        default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
                 break;
         }
         return true;
@@ -974,26 +815,26 @@ bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
 void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
-        rtlphy->default_initialgain[0] = rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1,
-                                                       MASKBYTE0);
-        rtlphy->default_initialgain[1] = rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1,
-                                                       MASKBYTE0);
-        rtlphy->default_initialgain[2] = rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1,
-                                                       MASKBYTE0);
-        rtlphy->default_initialgain[3] = rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1,
-                                                       MASKBYTE0);
+        rtlphy->default_initialgain[0] =
+            (u8)rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[1] =
+            (u8)rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[2] =
+            (u8)rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[3] =
+            (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 "Default initial gain (c50 = 0x%x, c58 = 0x%x, c60 = 0x%x, c68 = 0x%x\n",
-                  rtlphy->default_initialgain[0],
-                  rtlphy->default_initialgain[1],
-                  rtlphy->default_initialgain[2],
-                  rtlphy->default_initialgain[3]);
-
-        rtlphy->framesync = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
-                                          MASKBYTE0);
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+                 rtlphy->default_initialgain[0],
+                 rtlphy->default_initialgain[1],
+                 rtlphy->default_initialgain[2],
+                 rtlphy->default_initialgain[3]);
+
+        rtlphy->framesync = (u8)rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
+                                              MASKBYTE0);
         rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
                                               MASKDWORD);
 
@@ -1002,106 +843,277 @@ void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
                  ROFDM0_RXDETECTOR3, rtlphy->framesync);
 }
 
+static void _rtl88e_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfs = RFPGA0_XAB_RFINTERFACESW;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfs = RFPGA0_XAB_RFINTERFACESW;
+        rtlphy->phyreg_def[RF90_PATH_C].rfintfs = RFPGA0_XCD_RFINTERFACESW;
+        rtlphy->phyreg_def[RF90_PATH_D].rfintfs = RFPGA0_XCD_RFINTERFACESW;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfi = RFPGA0_XAB_RFINTERFACERB;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfi = RFPGA0_XAB_RFINTERFACERB;
+        rtlphy->phyreg_def[RF90_PATH_C].rfintfi = RFPGA0_XCD_RFINTERFACERB;
+        rtlphy->phyreg_def[RF90_PATH_D].rfintfi = RFPGA0_XCD_RFINTERFACERB;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfo = RFPGA0_XA_RFINTERFACEOE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfo = RFPGA0_XB_RFINTERFACEOE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfe = RFPGA0_XA_RFINTERFACEOE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfe = RFPGA0_XB_RFINTERFACEOE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf3wire_offset =
+            RFPGA0_XA_LSSIPARAMETER;
+        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].rftxgain_stage = RFPGA0_TXGAINSTAGE;
+        rtlphy->phyreg_def[RF90_PATH_B].rftxgain_stage = RFPGA0_TXGAINSTAGE;
+        rtlphy->phyreg_def[RF90_PATH_C].rftxgain_stage = RFPGA0_TXGAINSTAGE;
+        rtlphy->phyreg_def[RF90_PATH_D].rftxgain_stage = RFPGA0_TXGAINSTAGE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfhssi_para1 = RFPGA0_XA_HSSIPARAMETER1;
+        rtlphy->phyreg_def[RF90_PATH_B].rfhssi_para1 = RFPGA0_XB_HSSIPARAMETER1;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfhssi_para2 = RFPGA0_XA_HSSIPARAMETER2;
+        rtlphy->phyreg_def[RF90_PATH_B].rfhssi_para2 = RFPGA0_XB_HSSIPARAMETER2;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfsw_ctrl =
+            RFPGA0_XAB_SWITCHCONTROL;
+        rtlphy->phyreg_def[RF90_PATH_B].rfsw_ctrl =
+            RFPGA0_XAB_SWITCHCONTROL;
+        rtlphy->phyreg_def[RF90_PATH_C].rfsw_ctrl =
+            RFPGA0_XCD_SWITCHCONTROL;
+        rtlphy->phyreg_def[RF90_PATH_D].rfsw_ctrl =
+            RFPGA0_XCD_SWITCHCONTROL;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfagc_control1 = ROFDM0_XAAGCCORE1;
+        rtlphy->phyreg_def[RF90_PATH_B].rfagc_control1 = ROFDM0_XBAGCCORE1;
+        rtlphy->phyreg_def[RF90_PATH_C].rfagc_control1 = ROFDM0_XCAGCCORE1;
+        rtlphy->phyreg_def[RF90_PATH_D].rfagc_control1 = ROFDM0_XDAGCCORE1;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfagc_control2 = ROFDM0_XAAGCCORE2;
+        rtlphy->phyreg_def[RF90_PATH_B].rfagc_control2 = ROFDM0_XBAGCCORE2;
+        rtlphy->phyreg_def[RF90_PATH_C].rfagc_control2 = ROFDM0_XCAGCCORE2;
+        rtlphy->phyreg_def[RF90_PATH_D].rfagc_control2 = ROFDM0_XDAGCCORE2;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfrxiq_imbal = ROFDM0_XARXIQIMBALANCE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfrxiq_imbal = ROFDM0_XBRXIQIMBALANCE;
+        rtlphy->phyreg_def[RF90_PATH_C].rfrxiq_imbal = ROFDM0_XCRXIQIMBANLANCE;
+        rtlphy->phyreg_def[RF90_PATH_D].rfrxiq_imbal = ROFDM0_XDRXIQIMBALANCE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfrx_afe = ROFDM0_XARXAFE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfrx_afe = ROFDM0_XBRXAFE;
+        rtlphy->phyreg_def[RF90_PATH_C].rfrx_afe = ROFDM0_XCRXAFE;
+        rtlphy->phyreg_def[RF90_PATH_D].rfrx_afe = ROFDM0_XDRXAFE;
+
+        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].rftx_afe = ROFDM0_XATXAFE;
+        rtlphy->phyreg_def[RF90_PATH_B].rftx_afe = ROFDM0_XBTXAFE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf_rb = RFPGA0_XA_LSSIREADBACK;
+        rtlphy->phyreg_def[RF90_PATH_B].rf_rb = RFPGA0_XB_LSSIREADBACK;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf_rbpi = TRANSCEIVEA_HSPI_READBACK;
+        rtlphy->phyreg_def[RF90_PATH_B].rf_rbpi = TRANSCEIVEB_HSPI_READBACK;
+}
+
 void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        u8 level;
-        long dbm;
-
-        level = rtlphy->cur_cck_txpwridx;
-        dbm = rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_B, level);
-        level = rtlphy->cur_ofdm24g_txpwridx;
-        if (rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_G, level) > dbm)
-                dbm = rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_G, level);
-        level = rtlphy->cur_ofdm24g_txpwridx;
-        if (rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_N_24G, level) > dbm)
-                dbm = rtl88e_pwr_idx_dbm(hw, WIRELESS_MODE_N_24G, level);
-        *powerlevel = dbm;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 txpwr_level;
+        long txpwr_dbm;
+
+        txpwr_level = rtlphy->cur_cck_txpwridx;
+        txpwr_dbm = _rtl88e_phy_txpwr_idx_to_dbm(hw,
+                                                 WIRELESS_MODE_B, txpwr_level);
+        txpwr_level = rtlphy->cur_ofdm24g_txpwridx;
+        if (_rtl88e_phy_txpwr_idx_to_dbm(hw,
+                                         WIRELESS_MODE_G,
+                                         txpwr_level) > txpwr_dbm)
+                txpwr_dbm =
+                    _rtl88e_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G,
+                                                 txpwr_level);
+        txpwr_level = rtlphy->cur_ofdm24g_txpwridx;
+        if (_rtl88e_phy_txpwr_idx_to_dbm(hw,
+                                         WIRELESS_MODE_N_24G,
+                                         txpwr_level) > txpwr_dbm)
+                txpwr_dbm =
+                    _rtl88e_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_N_24G,
+                                                 txpwr_level);
+        *powerlevel = txpwr_dbm;
+}
+
+static void handle_path_a(struct rtl_efuse *rtlefuse, u8 index,
+                          u8 *cckpowerlevel, u8 *ofdmpowerlevel,
+                          u8 *bw20powerlevel, u8 *bw40powerlevel)
+{
+        cckpowerlevel[RF90_PATH_A] =
+            rtlefuse->txpwrlevel_cck[RF90_PATH_A][index];
+                /*-8~7 */
+        if (rtlefuse->txpwr_ht20diff[RF90_PATH_A][index] > 0x0f)
+                bw20powerlevel[RF90_PATH_A] =
+                  rtlefuse->txpwrlevel_ht40_1s[RF90_PATH_A][index] -
+                  (~(rtlefuse->txpwr_ht20diff[RF90_PATH_A][index]) + 1);
+        else
+                bw20powerlevel[RF90_PATH_A] =
+                  rtlefuse->txpwrlevel_ht40_1s[RF90_PATH_A][index] +
+                  rtlefuse->txpwr_ht20diff[RF90_PATH_A][index];
+        if (rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][index] > 0xf)
+                ofdmpowerlevel[RF90_PATH_A] =
+                  rtlefuse->txpwrlevel_ht40_1s[RF90_PATH_A][index] -
+                  (~(rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][index])+1);
+        else
+                ofdmpowerlevel[RF90_PATH_A] =
+                rtlefuse->txpwrlevel_ht40_1s[RF90_PATH_A][index] +
+                  rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][index];
+        bw40powerlevel[RF90_PATH_A] =
+          rtlefuse->txpwrlevel_ht40_1s[RF90_PATH_A][index];
 }
 
 static void _rtl88e_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
-                                      u8 *cckpower, u8 *ofdm, u8 *bw20_pwr,
-                                      u8 *bw40_pwr)
+                                      u8 *cckpowerlevel, u8 *ofdmpowerlevel,
+                                      u8 *bw20powerlevel, u8 *bw40powerlevel)
 {
-        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
-        u8 i = (channel - 1);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 index = (channel - 1);
         u8 rf_path = 0;
-        int jj = RF90_PATH_A;
-        int kk = RF90_PATH_B;
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
-                if (rf_path == jj) {
-                        cckpower[jj] = fuse->txpwrlevel_cck[jj][i];
-                        if (fuse->txpwr_ht20diff[jj][i] > 0x0f) /*-8~7 */
-                                bw20_pwr[jj] = fuse->txpwrlevel_ht40_1s[jj][i] -
-                                        (~(fuse->txpwr_ht20diff[jj][i]) + 1);
-                        else
-                                bw20_pwr[jj] = fuse->txpwrlevel_ht40_1s[jj][i] +
-                                         fuse->txpwr_ht20diff[jj][i];
-                        if (fuse->txpwr_legacyhtdiff[jj][i] > 0xf)
-                                ofdm[jj] = fuse->txpwrlevel_ht40_1s[jj][i] -
-                                        (~(fuse->txpwr_legacyhtdiff[jj][i])+1);
-                        else
-                                ofdm[jj] = fuse->txpwrlevel_ht40_1s[jj][i] +
-                                           fuse->txpwr_legacyhtdiff[jj][i];
-                        bw40_pwr[jj] = fuse->txpwrlevel_ht40_1s[jj][i];
-
-                } else if (rf_path == kk) {
-                        cckpower[kk] = fuse->txpwrlevel_cck[kk][i];
-                        bw20_pwr[kk] = fuse->txpwrlevel_ht40_1s[kk][i] +
-                                       fuse->txpwr_ht20diff[kk][i];
-                        ofdm[kk] = fuse->txpwrlevel_ht40_1s[kk][i] +
-                                        fuse->txpwr_legacyhtdiff[kk][i];
-                        bw40_pwr[kk] = fuse->txpwrlevel_ht40_1s[kk][i];
+                if (rf_path == RF90_PATH_A) {
+                        handle_path_a(rtlefuse, index, cckpowerlevel,
+                                      ofdmpowerlevel, bw20powerlevel,
+                                      bw40powerlevel);
+                } else if (rf_path == RF90_PATH_B) {
+                        cckpowerlevel[RF90_PATH_B] =
+                          rtlefuse->txpwrlevel_cck[RF90_PATH_B][index];
+                        bw20powerlevel[RF90_PATH_B] =
+                          rtlefuse->txpwrlevel_ht40_1s[RF90_PATH_B][index] +
+                          rtlefuse->txpwr_ht20diff[RF90_PATH_B][index];
+                        ofdmpowerlevel[RF90_PATH_B] =
+                          rtlefuse->txpwrlevel_ht40_1s[RF90_PATH_B][index] +
+                          rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][index];
+                        bw40powerlevel[RF90_PATH_B] =
+                          rtlefuse->txpwrlevel_ht40_1s[RF90_PATH_B][index];
                 }
         }
+
 }
 
 static void _rtl88e_ccxpower_index_check(struct ieee80211_hw *hw,
-                                         u8 channel, u8 *cckpower,
-                                         u8 *ofdm, u8 *bw20_pwr,
-                                         u8 *bw40_pwr)
+                                         u8 channel, u8 *cckpowerlevel,
+                                         u8 *ofdmpowerlevel, u8 *bw20powerlevel,
+                                         u8 *bw40powerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        rtlphy->cur_cck_txpwridx = cckpowerlevel[0];
+        rtlphy->cur_ofdm24g_txpwridx = ofdmpowerlevel[0];
+        rtlphy->cur_bw20_txpwridx = bw20powerlevel[0];
+        rtlphy->cur_bw40_txpwridx = bw40powerlevel[0];
 
-        rtlphy->cur_cck_txpwridx = cckpower[0];
-        rtlphy->cur_ofdm24g_txpwridx = ofdm[0];
-        rtlphy->cur_bw20_txpwridx = bw20_pwr[0];
-        rtlphy->cur_bw40_txpwridx = bw40_pwr[0];
 }
 
 void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
 {
-        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
-        u8 cckpower[MAX_TX_COUNT]  = {0}, ofdm[MAX_TX_COUNT] = {0};
-        u8 bw20_pwr[MAX_TX_COUNT] = {0}, bw40_pwr[MAX_TX_COUNT] = {0};
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 cckpowerlevel[MAX_TX_COUNT]  = {0};
+        u8 ofdmpowerlevel[MAX_TX_COUNT] = {0};
+        u8 bw20powerlevel[MAX_TX_COUNT] = {0};
+        u8 bw40powerlevel[MAX_TX_COUNT] = {0};
 
-        if (fuse->txpwr_fromeprom == false)
+        if (!rtlefuse->txpwr_fromeprom)
                 return;
-        _rtl88e_get_txpower_index(hw, channel, &cckpower[0], &ofdm[0],
-                                  &bw20_pwr[0], &bw40_pwr[0]);
-        _rtl88e_ccxpower_index_check(hw, channel, &cckpower[0], &ofdm[0],
-                                     &bw20_pwr[0], &bw40_pwr[0]);
-        rtl88e_phy_rf6052_set_cck_txpower(hw, &cckpower[0]);
-        rtl88e_phy_rf6052_set_ofdm_txpower(hw, &ofdm[0], &bw20_pwr[0],
-                                           &bw40_pwr[0], channel);
+        _rtl88e_get_txpower_index(hw, channel,
+                                  &cckpowerlevel[0], &ofdmpowerlevel[0],
+                                  &bw20powerlevel[0], &bw40powerlevel[0]);
+        _rtl88e_ccxpower_index_check(hw, channel,
+                                     &cckpowerlevel[0], &ofdmpowerlevel[0],
+                                     &bw20powerlevel[0], &bw40powerlevel[0]);
+        rtl88e_phy_rf6052_set_cck_txpower(hw, &cckpowerlevel[0]);
+        rtl88e_phy_rf6052_set_ofdm_txpower(hw, &ofdmpowerlevel[0],
+                                           &bw20powerlevel[0],
+                                           &bw40powerlevel[0], channel);
+}
+
+static long _rtl88e_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
+                                         enum wireless_mode wirelessmode,
+                                         u8 txpwridx)
+{
+        long offset;
+        long pwrout_dbm;
+
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                offset = -7;
+                break;
+        case WIRELESS_MODE_G:
+        case WIRELESS_MODE_N_24G:
+                offset = -8;
+                break;
+        default:
+                offset = -8;
+                break;
+        }
+        pwrout_dbm = txpwridx / 2 + offset;
+        return pwrout_dbm;
+}
+
+void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        enum io_type iotype;
+
+        if (!is_hal_stop(rtlhal)) {
+                switch (operation) {
+                case SCAN_OPT_BACKUP_BAND0:
+                        iotype = IO_CMD_PAUSE_BAND0_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+
+                        break;
+                case SCAN_OPT_RESTORE:
+                        iotype = IO_CMD_RESUME_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Unknown Scan Backup operation.\n");
+                        break;
+                }
+        }
 }
 
 void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u8 reg_bw_opmode;
         u8 reg_prsr_rsc;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
                  "Switch to %s bandwidth\n",
-                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                 "20MHz" : "40MHz");
+                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                  "20MHz" : "40MHz");
 
         if (is_hal_stop(rtlhal)) {
                 rtlphy->set_bwmode_inprogress = false;
@@ -1162,7 +1174,7 @@ void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw,
                             enum nl80211_channel_type ch_type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 tmp_bw = rtlphy->current_chan_bw;
 
@@ -1173,7 +1185,7 @@ void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw,
                 rtl88e_phy_set_bw_mode_callback(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         "FALSE driver sleep or unload\n");
+                         "false driver sleep or unload\n");
                 rtlphy->set_bwmode_inprogress = false;
                 rtlphy->current_chan_bw = tmp_bw;
         }
@@ -1183,7 +1195,7 @@ void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u32 delay;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
@@ -1193,9 +1205,9 @@ void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw)
         do {
                 if (!rtlphy->sw_chnl_inprogress)
                         break;
-                if (!chnl_step_by_step(hw, rtlphy->current_channel,
-                                       &rtlphy->sw_chnl_stage,
-                                       &rtlphy->sw_chnl_step, &delay)) {
+                if (!_rtl88e_phy_sw_chnl_step_by_step
+                    (hw, rtlphy->current_channel, &rtlphy->sw_chnl_stage,
+                     &rtlphy->sw_chnl_step, &delay)) {
                         if (delay > 0)
                                 mdelay(delay);
                         else
@@ -1211,7 +1223,7 @@ void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw)
 u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
         if (rtlphy->sw_chnl_inprogress)
@@ -1237,9 +1249,140 @@ u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw)
         return 1;
 }
 
+static bool _rtl88e_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+                                             u8 channel, u8 *stage, u8 *step,
+                                             u32 *delay)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct swchnlcmd precommoncmd[MAX_PRECMD_CNT];
+        u32 precommoncmdcnt;
+        struct swchnlcmd postcommoncmd[MAX_POSTCMD_CNT];
+        u32 postcommoncmdcnt;
+        struct swchnlcmd rfdependcmd[MAX_RFDEPENDCMD_CNT];
+        u32 rfdependcmdcnt;
+        struct swchnlcmd *currentcmd = NULL;
+        u8 rfpath;
+        u8 num_total_rfpath = rtlphy->num_total_rfpath;
+
+        precommoncmdcnt = 0;
+        _rtl88e_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
+                                         MAX_PRECMD_CNT,
+                                         CMDID_SET_TXPOWEROWER_LEVEL, 0, 0, 0);
+        _rtl88e_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
+                                         MAX_PRECMD_CNT, CMDID_END, 0, 0, 0);
+
+        postcommoncmdcnt = 0;
+
+        _rtl88e_phy_set_sw_chnl_cmdarray(postcommoncmd, postcommoncmdcnt++,
+                                         MAX_POSTCMD_CNT, CMDID_END, 0, 0, 0);
+
+        rfdependcmdcnt = 0;
+
+        RT_ASSERT((channel >= 1 && channel <= 14),
+                  "illegal channel for Zebra: %d\n", channel);
+
+        _rtl88e_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
+                                         MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
+                                         RF_CHNLBW, channel, 10);
+
+        _rtl88e_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
+                                         MAX_RFDEPENDCMD_CNT, CMDID_END, 0, 0,
+                                         0);
+
+        do {
+                switch (*stage) {
+                case 0:
+                        currentcmd = &precommoncmd[*step];
+                        break;
+                case 1:
+                        currentcmd = &rfdependcmd[*step];
+                        break;
+                case 2:
+                        currentcmd = &postcommoncmd[*step];
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Invalid 'stage' = %d, Check it!\n", *stage);
+                        return true;
+                }
+
+                if (currentcmd->cmdid == CMDID_END) {
+                        if ((*stage) == 2)
+                                return true;
+                        (*stage)++;
+                        (*step) = 0;
+                        continue;
+                }
+
+                switch (currentcmd->cmdid) {
+                case CMDID_SET_TXPOWEROWER_LEVEL:
+                        rtl88e_phy_set_txpower_level(hw, channel);
+                        break;
+                case CMDID_WRITEPORT_ULONG:
+                        rtl_write_dword(rtlpriv, currentcmd->para1,
+                                        currentcmd->para2);
+                        break;
+                case CMDID_WRITEPORT_USHORT:
+                        rtl_write_word(rtlpriv, currentcmd->para1,
+                                       (u16)currentcmd->para2);
+                        break;
+                case CMDID_WRITEPORT_UCHAR:
+                        rtl_write_byte(rtlpriv, currentcmd->para1,
+                                       (u8)currentcmd->para2);
+                        break;
+                case CMDID_RF_WRITEREG:
+                        for (rfpath = 0; rfpath < num_total_rfpath; rfpath++) {
+                                rtlphy->rfreg_chnlval[rfpath] =
+                                    ((rtlphy->rfreg_chnlval[rfpath] &
+                                      0xfffffc00) | currentcmd->para2);
+
+                                rtl_set_rfreg(hw, (enum radio_path)rfpath,
+                                              currentcmd->para1,
+                                              RFREG_OFFSET_MASK,
+                                              rtlphy->rfreg_chnlval[rfpath]);
+                        }
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
+                        break;
+                }
+
+                break;
+        } while (true);
+
+        (*delay) = currentcmd->msdelay;
+        (*step)++;
+        return false;
+}
+
+static bool _rtl88e_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
+                                             u32 cmdtableidx, u32 cmdtablesz,
+                                             enum swchnlcmd_id cmdid,
+                                             u32 para1, u32 para2, u32 msdelay)
+{
+        struct swchnlcmd *pcmd;
+
+        if (cmdtable == NULL) {
+                RT_ASSERT(false, "cmdtable cannot be NULL.\n");
+                return false;
+        }
+
+        if (cmdtableidx >= cmdtablesz)
+                return false;
+
+        pcmd = cmdtable + cmdtableidx;
+        pcmd->cmdid = cmdid;
+        pcmd->para1 = para1;
+        pcmd->para2 = para2;
+        pcmd->msdelay = msdelay;
+        return true;
+}
+
 static u8 _rtl88e_phy_path_a_iqk(struct ieee80211_hw *hw, bool config_pathb)
 {
-        u32 reg_eac, reg_e94, reg_e9c;
+        u32 reg_eac, reg_e94, reg_e9c, reg_ea4;
         u8 result = 0x00;
 
         rtl_set_bbreg(hw, 0xe30, MASKDWORD, 0x10008c1c);
@@ -1256,6 +1399,7 @@ static u8 _rtl88e_phy_path_a_iqk(struct ieee80211_hw *hw, bool config_pathb)
         reg_eac = rtl_get_bbreg(hw, 0xeac, MASKDWORD);
         reg_e94 = rtl_get_bbreg(hw, 0xe94, MASKDWORD);
         reg_e9c = rtl_get_bbreg(hw, 0xe9c, MASKDWORD);
+        reg_ea4 = rtl_get_bbreg(hw, 0xea4, MASKDWORD);
 
         if (!(reg_eac & BIT(28)) &&
             (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
@@ -1295,15 +1439,14 @@ static u8 _rtl88e_phy_path_a_rx_iqk(struct ieee80211_hw *hw, bool config_pathb)
 {
         u32 reg_eac, reg_e94, reg_e9c, reg_ea4, u32temp;
         u8 result = 0x00;
-        int jj = RF90_PATH_A;
 
         /*Get TXIMR Setting*/
         /*Modify RX IQK mode table*/
         rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
-        rtl_set_rfreg(hw, jj, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
-        rtl_set_rfreg(hw, jj, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
-        rtl_set_rfreg(hw, jj, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
-        rtl_set_rfreg(hw, jj, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf117b);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf117b);
         rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
 
         /*IQK Setting*/
@@ -1318,7 +1461,7 @@ static u8 _rtl88e_phy_path_a_rx_iqk(struct ieee80211_hw *hw, bool config_pathb)
 
         /*LO calibration Setting*/
         rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a911);
-        /*one shot, path A LOK & iqk*/
+        /*one shot,path A LOK & iqk*/
         rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
         rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
 
@@ -1336,16 +1479,16 @@ static u8 _rtl88e_phy_path_a_rx_iqk(struct ieee80211_hw *hw, bool config_pathb)
         else
                 return result;
 
-        u32temp = 0x80007C00 | (reg_e94&0x3FF0000)  |
+        u32temp = 0x80007C00 | (reg_e94&0x3FF0000) |
                   ((reg_e9c&0x3FF0000) >> 16);
         rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, u32temp);
         /*RX IQK*/
         /*Modify RX IQK mode table*/
         rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
-        rtl_set_rfreg(hw, jj, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
-        rtl_set_rfreg(hw, jj, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
-        rtl_set_rfreg(hw, jj, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
-        rtl_set_rfreg(hw, jj, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7ffa);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7ffa);
         rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
 
         /*IQK Setting*/
@@ -1359,7 +1502,7 @@ static u8 _rtl88e_phy_path_a_rx_iqk(struct ieee80211_hw *hw, bool config_pathb)
 
         /*LO calibration Setting*/
         rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a911);
-        /*one shot, path A LOK & iqk*/
+        /*one shot,path A LOK & iqk*/
         rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
         rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
 
@@ -1377,57 +1520,58 @@ static u8 _rtl88e_phy_path_a_rx_iqk(struct ieee80211_hw *hw, bool config_pathb)
         return result;
 }
 
-static void fill_iqk(struct ieee80211_hw *hw, bool iqk_ok, long result[][8],
-                     u8 final, bool btxonly)
+static void _rtl88e_phy_path_a_fill_iqk_matrix(struct ieee80211_hw *hw,
+                                               bool iqk_ok, long result[][8],
+                                               u8 final_candidate, bool btxonly)
 {
         u32 oldval_0, x, tx0_a, reg;
         long y, tx0_c;
 
-        if (final == 0xFF) {
+        if (final_candidate == 0xFF) {
                 return;
         } else if (iqk_ok) {
-                oldval_0 = (rtl_get_bbreg(hw, ROFDM0_XATXIQIMBAL,
+                oldval_0 = (rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
                                           MASKDWORD) >> 22) & 0x3FF;
-                x = result[final][0];
+                x = result[final_candidate][0];
                 if ((x & 0x00000200) != 0)
                         x = x | 0xFFFFFC00;
                 tx0_a = (x * oldval_0) >> 8;
-                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBAL, 0x3FF, tx0_a);
-                rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(31),
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, 0x3FF, tx0_a);
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(31),
                               ((x * oldval_0 >> 7) & 0x1));
-                y = result[final][1];
+                y = result[final_candidate][1];
                 if ((y & 0x00000200) != 0)
-                        y |= 0xFFFFFC00;
+                        y = y | 0xFFFFFC00;
                 tx0_c = (y * oldval_0) >> 8;
                 rtl_set_bbreg(hw, ROFDM0_XCTXAFE, 0xF0000000,
                               ((tx0_c & 0x3C0) >> 6));
-                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBAL, 0x003F0000,
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, 0x003F0000,
                               (tx0_c & 0x3F));
-                rtl_set_bbreg(hw, ROFDM0_ECCATHRES, BIT(29),
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(29),
                               ((y * oldval_0 >> 7) & 0x1));
                 if (btxonly)
                         return;
-                reg = result[final][2];
-                rtl_set_bbreg(hw, ROFDM0_XARXIQIMBAL, 0x3FF, reg);
-                reg = result[final][3] & 0x3F;
-                rtl_set_bbreg(hw, ROFDM0_XARXIQIMBAL, 0xFC00, reg);
-                reg = (result[final][3] >> 6) & 0xF;
+                reg = result[final_candidate][2];
+                rtl_set_bbreg(hw, ROFDM0_XARXIQIMBALANCE, 0x3FF, reg);
+                reg = result[final_candidate][3] & 0x3F;
+                rtl_set_bbreg(hw, ROFDM0_XARXIQIMBALANCE, 0xFC00, reg);
+                reg = (result[final_candidate][3] >> 6) & 0xF;
                 rtl_set_bbreg(hw, 0xca0, 0xF0000000, reg);
         }
 }
 
-static void save_adda_reg(struct ieee80211_hw *hw,
-                          const u32 *addareg, u32 *backup,
-                          u32 registernum)
+static void _rtl88e_phy_save_adda_registers(struct ieee80211_hw *hw,
+                                            u32 *addareg, u32 *addabackup,
+                                            u32 registernum)
 {
         u32 i;
 
         for (i = 0; i < registernum; i++)
-                backup[i] = rtl_get_bbreg(hw, addareg[i], MASKDWORD);
+                addabackup[i] = rtl_get_bbreg(hw, addareg[i], MASKDWORD);
 }
 
-static void save_mac_reg(struct ieee80211_hw *hw, const u32 *macreg,
-                         u32 *macbackup)
+static void _rtl88e_phy_save_mac_registers(struct ieee80211_hw *hw,
+                                           u32 *macreg, u32 *macbackup)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
@@ -1437,17 +1581,18 @@ static void save_mac_reg(struct ieee80211_hw *hw, const u32 *macreg,
         macbackup[i] = rtl_read_dword(rtlpriv, macreg[i]);
 }
 
-static void reload_adda(struct ieee80211_hw *hw, const u32 *addareg,
-                        u32 *backup, u32 reg_num)
+static void _rtl88e_phy_reload_adda_registers(struct ieee80211_hw *hw,
+                                              u32 *addareg, u32 *addabackup,
+                                              u32 regiesternum)
 {
         u32 i;
 
-        for (i = 0; i < reg_num; i++)
-                rtl_set_bbreg(hw, addareg[i], MASKDWORD, backup[i]);
+        for (i = 0; i < regiesternum; i++)
+                rtl_set_bbreg(hw, addareg[i], MASKDWORD, addabackup[i]);
 }
 
-static void reload_mac(struct ieee80211_hw *hw, const u32 *macreg,
-                       u32 *macbackup)
+static void _rtl88e_phy_reload_mac_registers(struct ieee80211_hw *hw,
+                                             u32 *macreg, u32 *macbackup)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
@@ -1458,8 +1603,7 @@ static void reload_mac(struct ieee80211_hw *hw, const u32 *macreg,
 }
 
 static void _rtl88e_phy_path_adda_on(struct ieee80211_hw *hw,
-                                     const u32 *addareg, bool is_patha_on,
-                                     bool is2t)
+                                     u32 *addareg, bool is_patha_on, bool is2t)
 {
         u32 pathon;
         u32 i;
@@ -1477,8 +1621,7 @@ static void _rtl88e_phy_path_adda_on(struct ieee80211_hw *hw,
 }
 
 static void _rtl88e_phy_mac_setting_calibration(struct ieee80211_hw *hw,
-                                                const u32 *macreg,
-                                                u32 *macbackup)
+                                                u32 *macreg, u32 *macbackup)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i = 0;
@@ -1507,12 +1650,13 @@ static void _rtl88e_phy_pi_mode_switch(struct ieee80211_hw *hw, bool pi_mode)
         rtl_set_bbreg(hw, 0x828, MASKDWORD, mode);
 }
 
-static bool sim_comp(struct ieee80211_hw *hw, long result[][8], u8 c1, u8 c2)
+static bool _rtl88e_phy_simularity_compare(struct ieee80211_hw *hw,
+                                           long result[][8], u8 c1, u8 c2)
 {
-        u32 i, j, diff, bitmap, bound;
+        u32 i, j, diff, simularity_bitmap, bound;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-        u8 final[2] = {0xFF, 0xFF};
+        u8 final_candidate[2] = { 0xFF, 0xFF };
         bool bresult = true, is2t = IS_92C_SERIAL(rtlhal->version);
 
         if (is2t)
@@ -1520,81 +1664,88 @@ static bool sim_comp(struct ieee80211_hw *hw, long result[][8], u8 c1, u8 c2)
         else
                 bound = 4;
 
-        bitmap = 0;
+        simularity_bitmap = 0;
 
         for (i = 0; i < bound; i++) {
                 diff = (result[c1][i] > result[c2][i]) ?
-                       (result[c1][i] - result[c2][i]) :
-                       (result[c2][i] - result[c1][i]);
+                    (result[c1][i] - result[c2][i]) :
+                    (result[c2][i] - result[c1][i]);
 
                 if (diff > MAX_TOLERANCE) {
-                        if ((i == 2 || i == 6) && !bitmap) {
+                        if ((i == 2 || i == 6) && !simularity_bitmap) {
                                 if (result[c1][i] + result[c1][i + 1] == 0)
-                                        final[(i / 4)] = c2;
+                                        final_candidate[(i / 4)] = c2;
                                 else if (result[c2][i] + result[c2][i + 1] == 0)
-                                        final[(i / 4)] = c1;
+                                        final_candidate[(i / 4)] = c1;
                                 else
-                                        bitmap = bitmap | (1 << i);
-                        } else {
-                                bitmap = bitmap | (1 << i);
-                        }
+                                        simularity_bitmap = simularity_bitmap |
+                                            (1 << i);
+                        } else
+                                simularity_bitmap =
+                                    simularity_bitmap | (1 << i);
                 }
         }
 
-        if (bitmap == 0) {
+        if (simularity_bitmap == 0) {
                 for (i = 0; i < (bound / 4); i++) {
-                        if (final[i] != 0xFF) {
+                        if (final_candidate[i] != 0xFF) {
                                 for (j = i * 4; j < (i + 1) * 4 - 2; j++)
-                                        result[3][j] = result[final[i]][j];
+                                        result[3][j] =
+                                            result[final_candidate[i]][j];
                                 bresult = false;
                         }
                 }
                 return bresult;
-        } else if (!(bitmap & 0x0F)) {
+        } else if (!(simularity_bitmap & 0x0F)) {
                 for (i = 0; i < 4; i++)
                         result[3][i] = result[c1][i];
                 return false;
-        } else if (!(bitmap & 0xF0) && is2t) {
+        } else if (!(simularity_bitmap & 0xF0) && is2t) {
                 for (i = 4; i < 8; i++)
                         result[3][i] = result[c1][i];
                 return false;
         } else {
                 return false;
         }
+
 }
 
 static void _rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw,
                                      long result[][8], u8 t, bool is2t)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u32 i;
         u8 patha_ok, pathb_ok;
-        const u32 adda_reg[IQK_ADDA_REG_NUM] = {
+        u32 adda_reg[IQK_ADDA_REG_NUM] = {
                 0x85c, 0xe6c, 0xe70, 0xe74,
                 0xe78, 0xe7c, 0xe80, 0xe84,
                 0xe88, 0xe8c, 0xed0, 0xed4,
                 0xed8, 0xedc, 0xee0, 0xeec
         };
-        const u32 iqk_mac_reg[IQK_MAC_REG_NUM] = {
+        u32 iqk_mac_reg[IQK_MAC_REG_NUM] = {
                 0x522, 0x550, 0x551, 0x040
         };
-        const u32 iqk_bb_reg[IQK_BB_REG_NUM] = {
-                ROFDM0_TRXPATHENABLE, ROFDM0_TRMUXPAR, RFPGA0_XCD_RFINTERFACESW,
-                0xb68, 0xb6c, 0x870, 0x860, 0x864, 0x800
+        u32 iqk_bb_reg[IQK_BB_REG_NUM] = {
+                ROFDM0_TRXPATHENABLE, ROFDM0_TRMUXPAR,
+                RFPGA0_XCD_RFINTERFACESW, 0xb68, 0xb6c,
+                0x870, 0x860, 0x864, 0x800
         };
         const u32 retrycount = 2;
 
         if (t == 0) {
-                save_adda_reg(hw, adda_reg, rtlphy->adda_backup, 16);
-                save_mac_reg(hw, iqk_mac_reg, rtlphy->iqk_mac_backup);
-                save_adda_reg(hw, iqk_bb_reg, rtlphy->iqk_bb_backup,
-                              IQK_BB_REG_NUM);
+                _rtl88e_phy_save_adda_registers(hw, adda_reg,
+                                                rtlphy->adda_backup, 16);
+                _rtl88e_phy_save_mac_registers(hw, iqk_mac_reg,
+                                               rtlphy->iqk_mac_backup);
+                _rtl88e_phy_save_adda_registers(hw, iqk_bb_reg,
+                                                rtlphy->iqk_bb_backup,
+                                                IQK_BB_REG_NUM);
         }
         _rtl88e_phy_path_adda_on(hw, adda_reg, true, is2t);
         if (t == 0) {
-                rtlphy->rfpi_enable = (u8) rtl_get_bbreg(hw,
-                                           RFPGA0_XA_HSSIPARAMETER1, BIT(8));
+                rtlphy->rfpi_enable =
+                  (u8)rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1, BIT(8));
         }
 
         if (!rtlphy->rfpi_enable)
@@ -1652,10 +1803,9 @@ static void _rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw,
                 }
         }
 
-        if (0 == patha_ok) {
+        if (0 == patha_ok)
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "Path A IQK Success!!\n");
-        }
         if (is2t) {
                 _rtl88e_phy_path_a_standby(hw);
                 _rtl88e_phy_path_adda_on(hw, adda_reg, false, is2t);
@@ -1663,21 +1813,23 @@ static void _rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw,
                         pathb_ok = _rtl88e_phy_path_b_iqk(hw);
                         if (pathb_ok == 0x03) {
                                 result[t][4] = (rtl_get_bbreg(hw,
-                                                0xeb4, MASKDWORD) &
+                                                              0xeb4,
+                                                              MASKDWORD) &
                                                 0x3FF0000) >> 16;
                                 result[t][5] =
                                     (rtl_get_bbreg(hw, 0xebc, MASKDWORD) &
-                                                   0x3FF0000) >> 16;
+                                     0x3FF0000) >> 16;
                                 result[t][6] =
                                     (rtl_get_bbreg(hw, 0xec4, MASKDWORD) &
-                                                   0x3FF0000) >> 16;
+                                     0x3FF0000) >> 16;
                                 result[t][7] =
                                     (rtl_get_bbreg(hw, 0xecc, MASKDWORD) &
-                                                   0x3FF0000) >> 16;
+                                     0x3FF0000) >> 16;
                                 break;
                         } else if (i == (retrycount - 1) && pathb_ok == 0x01) {
                                 result[t][4] = (rtl_get_bbreg(hw,
-                                                0xeb4, MASKDWORD) &
+                                                              0xeb4,
+                                                              MASKDWORD) &
                                                 0x3FF0000) >> 16;
                         }
                         result[t][5] = (rtl_get_bbreg(hw, 0xebc, MASKDWORD) &
@@ -1690,10 +1842,13 @@ static void _rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw,
         if (t != 0) {
                 if (!rtlphy->rfpi_enable)
                         _rtl88e_phy_pi_mode_switch(hw, false);
-                reload_adda(hw, adda_reg, rtlphy->adda_backup, 16);
-                reload_mac(hw, iqk_mac_reg, rtlphy->iqk_mac_backup);
-                reload_adda(hw, iqk_bb_reg, rtlphy->iqk_bb_backup,
-                            IQK_BB_REG_NUM);
+                _rtl88e_phy_reload_adda_registers(hw, adda_reg,
+                                                  rtlphy->adda_backup, 16);
+                _rtl88e_phy_reload_mac_registers(hw, iqk_mac_reg,
+                                                 rtlphy->iqk_mac_backup);
+                _rtl88e_phy_reload_adda_registers(hw, iqk_bb_reg,
+                                                  rtlphy->iqk_bb_backup,
+                                                  IQK_BB_REG_NUM);
 
                 rtl_set_bbreg(hw, 0x840, MASKDWORD, 0x00032ed3);
                 if (is2t)
@@ -1709,8 +1864,6 @@ static void _rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
         u8 tmpreg;
         u32 rf_a_mode = 0, rf_b_mode = 0, lc_cal;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        int jj = RF90_PATH_A;
-        int kk = RF90_PATH_B;
 
         tmpreg = rtl_read_byte(rtlpriv, 0xd03);
 
@@ -1720,51 +1873,52 @@ static void _rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
 
         if ((tmpreg & 0x70) != 0) {
-                rf_a_mode = rtl_get_rfreg(hw, jj, 0x00, MASK12BITS);
+                rf_a_mode = rtl_get_rfreg(hw, RF90_PATH_A, 0x00, MASK12BITS);
 
                 if (is2t)
-                        rf_b_mode = rtl_get_rfreg(hw, kk, 0x00,
+                        rf_b_mode = rtl_get_rfreg(hw, RF90_PATH_B, 0x00,
                                                   MASK12BITS);
 
-                rtl_set_rfreg(hw, jj, 0x00, MASK12BITS,
+                rtl_set_rfreg(hw, RF90_PATH_A, 0x00, MASK12BITS,
                               (rf_a_mode & 0x8FFFF) | 0x10000);
 
                 if (is2t)
-                        rtl_set_rfreg(hw, kk, 0x00, MASK12BITS,
+                        rtl_set_rfreg(hw, RF90_PATH_B, 0x00, MASK12BITS,
                                       (rf_b_mode & 0x8FFFF) | 0x10000);
         }
-        lc_cal = rtl_get_rfreg(hw, jj, 0x18, MASK12BITS);
+        lc_cal = rtl_get_rfreg(hw, RF90_PATH_A, 0x18, MASK12BITS);
 
-        rtl_set_rfreg(hw, jj, 0x18, MASK12BITS, lc_cal | 0x08000);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x18, MASK12BITS, lc_cal | 0x08000);
 
         mdelay(100);
 
         if ((tmpreg & 0x70) != 0) {
                 rtl_write_byte(rtlpriv, 0xd03, tmpreg);
-                rtl_set_rfreg(hw, jj, 0x00, MASK12BITS, rf_a_mode);
+                rtl_set_rfreg(hw, RF90_PATH_A, 0x00, MASK12BITS, rf_a_mode);
 
                 if (is2t)
-                        rtl_set_rfreg(hw, kk, 0x00, MASK12BITS,
+                        rtl_set_rfreg(hw, RF90_PATH_B, 0x00, MASK12BITS,
                                       rf_b_mode);
         } else {
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+
 }
 
-static void rfpath_switch(struct ieee80211_hw *hw,
-                          bool bmain, bool is2t)
+static void _rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw,
+                                          bool bmain, bool is2t)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_efuse *fuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
 
         if (is_hal_stop(rtlhal)) {
                 u8 u1btmp;
                 u1btmp = rtl_read_byte(rtlpriv, REG_LEDCFG0);
                 rtl_write_byte(rtlpriv, REG_LEDCFG0, u1btmp | BIT(7));
-                rtl_set_bbreg(hw, rFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
+                rtl_set_bbreg(hw, RFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
         }
         if (is2t) {
                 if (bmain)
@@ -1777,24 +1931,24 @@ static void rfpath_switch(struct ieee80211_hw *hw,
                 rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW, BIT(8) | BIT(9), 0);
                 rtl_set_bbreg(hw, 0x914, MASKLWORD, 0x0201);
 
-                /* We use the RF definition of MAIN and AUX, left antenna and
-                 * right antenna repectively.
+                /* We use the RF definition of MAIN and AUX,
+                 * left antenna and right antenna repectively.
                  * Default output at AUX.
                  */
                 if (bmain) {
-                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, BIT(14) |
-                                      BIT(13) | BIT(12), 0);
-                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE, BIT(5) |
-                                      BIT(4) | BIT(3), 0);
-                        if (fuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
-                                rtl_set_bbreg(hw, RCONFIG_RAM64X16, BIT(31), 0);
+                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE,
+                                      BIT(14) | BIT(13) | BIT(12), 0);
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
+                                      BIT(5) | BIT(4) | BIT(3), 0);
+                        if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                                rtl_set_bbreg(hw, RCONFIG_RAM64x16, BIT(31), 0);
                 } else {
-                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, BIT(14) |
-                                      BIT(13) | BIT(12), 1);
-                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE, BIT(5) |
-                                      BIT(4) | BIT(3), 1);
-                        if (fuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
-                                rtl_set_bbreg(hw, RCONFIG_RAM64X16, BIT(31), 1);
+                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE,
+                                      BIT(14) | BIT(13) | BIT(12), 1);
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
+                                      BIT(5) | BIT(4) | BIT(3), 1);
+                        if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                                rtl_set_bbreg(hw, RCONFIG_RAM64x16, BIT(31), 1);
                 }
         }
 }
@@ -1802,35 +1956,44 @@ static void rfpath_switch(struct ieee80211_hw *hw,
 #undef IQK_ADDA_REG_NUM
 #undef IQK_DELAY_TIME
 
-void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
+void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         long result[4][8];
-        u8 i, final;
-        bool patha_ok;
-        long reg_e94, reg_e9c, reg_ea4, reg_eb4, reg_ebc, reg_tmp = 0;
+        u8 i, final_candidate;
+        bool b_patha_ok, b_pathb_ok;
+        long reg_e94, reg_e9c, reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4,
+            reg_ecc, reg_tmp = 0;
         bool is12simular, is13simular, is23simular;
         u32 iqk_bb_reg[9] = {
-                ROFDM0_XARXIQIMBAL,
-                ROFDM0_XBRXIQIMBAL,
-                ROFDM0_ECCATHRES,
+                ROFDM0_XARXIQIMBALANCE,
+                ROFDM0_XBRXIQIMBALANCE,
+                ROFDM0_ECCATHRESHOLD,
                 ROFDM0_AGCRSSITABLE,
-                ROFDM0_XATXIQIMBAL,
-                ROFDM0_XBTXIQIMBAL,
+                ROFDM0_XATXIQIMBALANCE,
+                ROFDM0_XBTXIQIMBALANCE,
                 ROFDM0_XCTXAFE,
                 ROFDM0_XDTXAFE,
                 ROFDM0_RXIQEXTANTA
         };
 
-        if (recovery) {
-                reload_adda(hw, iqk_bb_reg, rtlphy->iqk_bb_backup, 9);
+        if (b_recovery) {
+                _rtl88e_phy_reload_adda_registers(hw,
+                                                  iqk_bb_reg,
+                                                  rtlphy->iqk_bb_backup, 9);
                 return;
         }
 
-        memset(result, 0, 32 * sizeof(long));
-        final = 0xff;
-        patha_ok = false;
+        for (i = 0; i < 8; i++) {
+                result[0][i] = 0;
+                result[1][i] = 0;
+                result[2][i] = 0;
+                result[3][i] = 0;
+        }
+        final_candidate = 0xff;
+        b_patha_ok = false;
+        b_pathb_ok = false;
         is12simular = false;
         is23simular = false;
         is13simular = false;
@@ -1840,29 +2003,32 @@ void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 else
                         _rtl88e_phy_iq_calibrate(hw, result, i, false);
                 if (i == 1) {
-                        is12simular = sim_comp(hw, result, 0, 1);
+                        is12simular =
+                          _rtl88e_phy_simularity_compare(hw, result, 0, 1);
                         if (is12simular) {
-                                final = 0;
+                                final_candidate = 0;
                                 break;
                         }
                 }
                 if (i == 2) {
-                        is13simular = sim_comp(hw, result, 0, 2);
+                        is13simular =
+                          _rtl88e_phy_simularity_compare(hw, result, 0, 2);
                         if (is13simular) {
-                                final = 0;
+                                final_candidate = 0;
                                 break;
                         }
-                        is23simular = sim_comp(hw, result, 1, 2);
+                        is23simular =
+                           _rtl88e_phy_simularity_compare(hw, result, 1, 2);
                         if (is23simular) {
-                                final = 1;
+                                final_candidate = 1;
                         } else {
                                 for (i = 0; i < 8; i++)
                                         reg_tmp += result[3][i];
 
                                 if (reg_tmp != 0)
-                                        final = 3;
+                                        final_candidate = 3;
                                 else
-                                        final = 0xFF;
+                                        final_candidate = 0xFF;
                         }
                 }
         }
@@ -1870,47 +2036,55 @@ void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 reg_e94 = result[i][0];
                 reg_e9c = result[i][1];
                 reg_ea4 = result[i][2];
+                reg_eac = result[i][3];
                 reg_eb4 = result[i][4];
                 reg_ebc = result[i][5];
+                reg_ec4 = result[i][6];
+                reg_ecc = result[i][7];
         }
-        if (final != 0xff) {
-                reg_e94 = result[final][0];
-                rtlphy->reg_e94 = reg_e94;
-                reg_e9c = result[final][1];
-                rtlphy->reg_e9c = reg_e9c;
-                reg_ea4 = result[final][2];
-                reg_eb4 = result[final][4];
+        if (final_candidate != 0xff) {
+                reg_e94 = result[final_candidate][0];
+                reg_e9c = result[final_candidate][1];
+                reg_ea4 = result[final_candidate][2];
+                reg_eac = result[final_candidate][3];
+                reg_eb4 = result[final_candidate][4];
+                reg_ebc = result[final_candidate][5];
+                reg_ec4 = result[final_candidate][6];
+                reg_ecc = result[final_candidate][7];
                 rtlphy->reg_eb4 = reg_eb4;
-                reg_ebc = result[final][5];
                 rtlphy->reg_ebc = reg_ebc;
-                patha_ok = true;
+                rtlphy->reg_e94 = reg_e94;
+                rtlphy->reg_e9c = reg_e9c;
+                b_patha_ok = true;
+                b_pathb_ok = true;
         } else {
                 rtlphy->reg_e94 = 0x100;
                 rtlphy->reg_eb4 = 0x100;
-                rtlphy->reg_ebc = 0x0;
                 rtlphy->reg_e9c = 0x0;
+                rtlphy->reg_ebc = 0x0;
         }
         if (reg_e94 != 0) /*&&(reg_ea4 != 0) */
-                fill_iqk(hw, patha_ok, result, final, (reg_ea4 == 0));
-        if (final != 0xFF) {
+                _rtl88e_phy_path_a_fill_iqk_matrix(hw, b_patha_ok, result,
+                                                   final_candidate,
+                                                   (reg_ea4 == 0));
+        if (final_candidate != 0xFF) {
                 for (i = 0; i < IQK_MATRIX_REG_NUM; i++)
-                        rtlphy->iqk_matrix[0].value[0][i] = result[final][i];
+                        rtlphy->iqk_matrix[0].value[0][i] =
+                                result[final_candidate][i];
                 rtlphy->iqk_matrix[0].iqk_done = true;
+
         }
-        save_adda_reg(hw, iqk_bb_reg, rtlphy->iqk_bb_backup, 9);
+        _rtl88e_phy_save_adda_registers(hw, iqk_bb_reg,
+                                        rtlphy->iqk_bb_backup, 9);
 }
 
 void rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct rtl_hal *rtlhal = &(rtlpriv->rtlhal);
-        bool start_conttx = false, singletone = false;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = &rtlpriv->rtlhal;
         u32 timeout = 2000, timecount = 0;
 
-        if (start_conttx || singletone)
-                return;
-
         while (rtlpriv->mac80211.act_scanning && timecount < timeout) {
                 udelay(50);
                 timecount += 50;
@@ -1928,18 +2102,18 @@ void rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw)
 
 void rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain)
 {
-        rfpath_switch(hw, bmain, false);
+        _rtl88e_phy_set_rfpath_switch(hw, bmain, false);
 }
 
 bool rtl88e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         bool postprocessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                  "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
-                 iotype, rtlphy->set_io_inprogress);
+                  iotype, rtlphy->set_io_inprogress);
         do {
                 switch (iotype) {
                 case IO_CMD_RESUME_DM_BY_SCAN:
@@ -1947,14 +2121,14 @@ bool rtl88e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                                  "[IO CMD] Resume DM after scan.\n");
                         postprocessing = true;
                         break;
-                case IO_CMD_PAUSE_DM_BY_SCAN:
+                case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                                  "[IO CMD] Pause DM before scan.\n");
                         postprocessing = true;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
                         break;
                 }
         } while (false);
@@ -1969,6 +2143,37 @@ bool rtl88e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
         return true;
 }
 
+static void rtl88e_phy_set_io(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                  rtlphy->current_io_type, rtlphy->set_io_inprogress);
+        switch (rtlphy->current_io_type) {
+        case IO_CMD_RESUME_DM_BY_SCAN:
+                dm_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
+                /*rtl92c_dm_write_dig(hw);*/
+                rtl88e_phy_set_txpower_level(hw, rtlphy->current_channel);
+                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x83);
+                break;
+        case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
+                rtlphy->initgain_backup.xaagccore1 = dm_digtable->cur_igvalue;
+                dm_digtable->cur_igvalue = 0x17;
+                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x40);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
+                break;
+        }
+        rtlphy->set_io_inprogress = false;
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "(%#x)\n", rtlphy->current_io_type);
+}
+
 static void rtl88ee_phy_set_rf_on(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1984,10 +2189,9 @@ static void rtl88ee_phy_set_rf_on(struct ieee80211_hw *hw)
 static void _rtl88ee_phy_set_rf_sleep(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        int jj = RF90_PATH_A;
 
         rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
-        rtl_set_rfreg(hw, jj, 0x00, RFREG_OFFSET_MASK, 0x00);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x00, RFREG_OFFSET_MASK, 0x00);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
         rtl_write_byte(rtlpriv, REG_SPS0_CTRL, 0x22);
 }
@@ -1999,42 +2203,49 @@ static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        struct rtl8192_tx_ring *ring = NULL;
         bool bresult = true;
         u8 i, queue_id;
+        struct rtl8192_tx_ring *ring = NULL;
 
         switch (rfpwr_state) {
-        case ERFON:{
+        case ERFON:
                 if ((ppsc->rfpwr_state == ERFOFF) &&
                     RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
                         bool rtstatus;
-                        u32 init = 0;
+                        u32 initializecount = 0;
+
                         do {
-                                init++;
+                                initializecount++;
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                          "IPS Set eRf nic enable\n");
                                 rtstatus = rtl_ps_enable_nic(hw);
-                        } while ((rtstatus != true) && (init < 10));
+                        } while (!rtstatus &&
+                                 (initializecount < 10));
                         RT_CLEAR_PS_LEVEL(ppsc,
                                           RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                  "Set ERFON sleeped:%d ms\n",
-                                 jiffies_to_msecs(jiffies - ppsc->
-                                                  last_sleep_jiffies));
+                                  jiffies_to_msecs(jiffies -
+                                                   ppsc->
+                                                   last_sleep_jiffies));
                         ppsc->last_awake_jiffies = jiffies;
                         rtl88ee_phy_set_rf_on(hw);
                 }
-                if (mac->link_state == MAC80211_LINKED)
-                        rtlpriv->cfg->ops->led_control(hw, LED_CTL_LINK);
-                else
-                        rtlpriv->cfg->ops->led_control(hw, LED_CTL_NO_LINK);
-                break; }
-        case ERFOFF:{
+                if (mac->link_state == MAC80211_LINKED) {
+                        rtlpriv->cfg->ops->led_control(hw,
+                                                       LED_CTL_LINK);
+                } else {
+                        rtlpriv->cfg->ops->led_control(hw,
+                                                       LED_CTL_NO_LINK);
+                }
+                break;
+        case ERFOFF:
                 for (queue_id = 0, i = 0;
                      queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
                         ring = &pcipriv->dev.tx_ring[queue_id];
-                        if (skb_queue_len(&ring->queue) == 0) {
+                        if (queue_id == BEACON_QUEUE ||
+                            skb_queue_len(&ring->queue) == 0) {
                                 queue_id++;
                                 continue;
                         } else {
@@ -2055,6 +2266,7 @@ static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 break;
                         }
                 }
+
                 if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                  "IPS Set eRf nic disable\n");
@@ -2063,49 +2275,51 @@ static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 } else {
                         if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS) {
                                 rtlpriv->cfg->ops->led_control(hw,
-                                                LED_CTL_NO_LINK);
+                                                               LED_CTL_NO_LINK);
                         } else {
                                 rtlpriv->cfg->ops->led_control(hw,
-                                                LED_CTL_POWER_OFF);
+                                                               LED_CTL_POWER_OFF);
                         }
                 }
-                break; }
+                break;
         case ERFSLEEP:{
-                if (ppsc->rfpwr_state == ERFOFF)
-                        break;
-                for (queue_id = 0, i = 0;
-                     queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
-                        ring = &pcipriv->dev.tx_ring[queue_id];
-                        if (skb_queue_len(&ring->queue) == 0) {
-                                queue_id++;
-                                continue;
-                        } else {
-                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
-                                         (i + 1), queue_id,
-                                         skb_queue_len(&ring->queue));
-
-                                udelay(10);
-                                i++;
-                        }
-                        if (i >= MAX_DOZE_WAITING_TIMES_9x) {
-                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
-                                         MAX_DOZE_WAITING_TIMES_9x,
-                                         queue_id,
-                                         skb_queue_len(&ring->queue));
+                        if (ppsc->rfpwr_state == ERFOFF)
                                 break;
+                        for (queue_id = 0, i = 0;
+                             queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
+                                ring = &pcipriv->dev.tx_ring[queue_id];
+                                if (skb_queue_len(&ring->queue) == 0) {
+                                        queue_id++;
+                                        continue;
+                                } else {
+                                        RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                                 "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                                 (i + 1), queue_id,
+                                                 skb_queue_len(&ring->queue));
+
+                                        udelay(10);
+                                        i++;
+                                }
+                                if (i >= MAX_DOZE_WAITING_TIMES_9x) {
+                                        RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                                 "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                                 MAX_DOZE_WAITING_TIMES_9x,
+                                                 queue_id,
+                                                 skb_queue_len(&ring->queue));
+                                        break;
+                                }
                         }
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                 "Set ERFSLEEP awaked:%d ms\n",
+                                  jiffies_to_msecs(jiffies -
+                                  ppsc->last_awake_jiffies));
+                        ppsc->last_sleep_jiffies = jiffies;
+                        _rtl88ee_phy_set_rf_sleep(hw);
+                        break;
                 }
-                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         "Set ERFSLEEP awaked:%d ms\n",
-                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));
-                ppsc->last_sleep_jiffies = jiffies;
-                _rtl88ee_phy_set_rf_sleep(hw);
-                break; }
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
                 bresult = false;
                 break;
         }
@@ -2118,10 +2332,11 @@ bool rtl88e_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                    enum rf_pwrstate rfpwr_state)
 {
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        bool bresult;
+
+        bool bresult = false;
 
         if (rfpwr_state == ppsc->rfpwr_state)
-                return false;
+                return bresult;
         bresult = _rtl88ee_phy_set_rf_power_state(hw, rfpwr_state);
         return bresult;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h
index 89f0f1ef1465..b29bd77210f4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,33 +26,35 @@
 #ifndef __RTL92C_PHY_H__
 #define __RTL92C_PHY_H__
 
-/*It must always set to 4, otherwise read efuse table secquence will be wrong.*/
-#define MAX_TX_COUNT                            4
+/* MAX_TX_COUNT must always set to 4, otherwise read efuse
+ * table secquence will be wrong.
+ */
+#define         MAX_TX_COUNT                            4
 
 #define MAX_PRECMD_CNT                          16
-#define MAX_RFDEPENDCMD_CNT                     16
+#define MAX_RFDEPENDCMD_CNT             16
 #define MAX_POSTCMD_CNT                         16
 
-#define MAX_DOZE_WAITING_TIMES_9x               64
+#define MAX_DOZE_WAITING_TIMES_9x       64
 
 #define RT_CANNOT_IO(hw)                        false
-#define HIGHPOWER_RADIOA_ARRAYLEN               22
+#define HIGHPOWER_RADIOA_ARRAYLEN       22
 
 #define IQK_ADDA_REG_NUM                        16
 #define IQK_BB_REG_NUM                          9
 #define MAX_TOLERANCE                           5
 #define IQK_DELAY_TIME                          10
-#define IDX_MAP                                 15
+#define INDEX_MAPPING_NUM       15
 
 #define APK_BB_REG_NUM                          5
 #define APK_AFE_REG_NUM                         16
 #define APK_CURVE_REG_NUM                       4
-#define PATH_NUM                                2
+#define PATH_NUM                                        2
 
-#define LOOP_LIMIT                              5
+#define LOOP_LIMIT                                      5
 #define MAX_STALL_TIME                          50
-#define ANTENNADIVERSITYVALUE                   0x80
-#define MAX_TXPWR_IDX_NMODE_92S                 63
+#define ANTENNADIVERSITYVALUE           0x80
+#define MAX_TXPWR_IDX_NMODE_92S         63
 #define RESET_CNT_LIMIT                         3
 
 #define IQK_ADDA_REG_NUM                        16
@@ -66,8 +64,8 @@
 
 #define CT_OFFSET_MAC_ADDR                      0X16
 
-#define CT_OFFSET_CCK_TX_PWR_IDX                0x5A
-#define CT_OFFSET_HT401S_TX_PWR_IDX             0x60
+#define CT_OFFSET_CCK_TX_PWR_IDX                        0x5A
+#define CT_OFFSET_HT401S_TX_PWR_IDX                     0x60
 #define CT_OFFSET_HT402S_TX_PWR_IDX_DIFF        0x66
 #define CT_OFFSET_HT20_TX_PWR_IDX_DIFF          0x69
 #define CT_OFFSET_OFDM_TX_PWR_IDX_DIFF          0x6C
@@ -75,13 +73,13 @@
 #define CT_OFFSET_HT40_MAX_PWR_OFFSET           0x6F
 #define CT_OFFSET_HT20_MAX_PWR_OFFSET           0x72
 
-#define CT_OFFSET_CHANNEL_PLAH                  0x75
-#define CT_OFFSET_THERMAL_METER                 0x78
-#define CT_OFFSET_RF_OPTION                     0x79
-#define CT_OFFSET_VERSION                       0x7E
-#define CT_OFFSET_CUSTOMER_ID                   0x7F
+#define CT_OFFSET_CHANNEL_PLAH                          0x75
+#define CT_OFFSET_THERMAL_METER                         0x78
+#define CT_OFFSET_RF_OPTION                                     0x79
+#define CT_OFFSET_VERSION                                       0x7E
+#define CT_OFFSET_CUSTOMER_ID                           0x7F
 
-#define RTL92C_MAX_PATH_NUM                     2
+#define RTL92C_MAX_PATH_NUM                                     2
 
 enum swchnlcmd_id {
         CMDID_END,
@@ -160,7 +158,6 @@ struct r_antenna_select_cck {
         u8 r_ccktx_enable:4;
 };
 
-
 struct efuse_contents {
         u8 mac_addr[ETH_ALEN];
         u8 cck_tx_power_idx[6];
@@ -192,10 +189,10 @@ struct tx_power_struct {
 };
 
 enum _ANT_DIV_TYPE {
-        NO_ANTDIV                       = 0xFF,
+        NO_ANTDIV                               = 0xFF,
         CG_TRX_HW_ANTDIV                = 0x01,
         CGCS_RX_HW_ANTDIV               = 0x02,
-        FIXED_HW_ANTDIV                 = 0x03,
+        FIXED_HW_ANTDIV         = 0x03,
         CG_TRX_SMART_ANTDIV             = 0x04,
         CGCS_RX_SW_ANTDIV               = 0x05,
 };
@@ -217,6 +214,8 @@ void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw);
 void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw,
                                   long *powerlevel);
 void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel);
+void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw,
+                                      u8 operation);
 void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
 void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw,
                             enum nl80211_channel_type ch_type);
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c
index 6dc4e3a954f6..ef28c8ea1e84 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -32,78 +28,78 @@
 
 /* drivers should parse below arrays and do the corresponding actions */
 /*3 Power on  Array*/
-struct wlan_pwr_cfg rtl8188e_power_on_flow[RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS +
-                                           RTL8188E_TRANS_END_STEPS] = {
-        RTL8188E_TRANS_CARDEMU_TO_ACT
-        RTL8188E_TRANS_END
+struct wlan_pwr_cfg rtl8188ee_power_on_flow[RTL8188EE_TRANS_CARDEMU_TO_ACT_STEPS
+                                        + RTL8188EE_TRANS_END_STEPS] = {
+        RTL8188EE_TRANS_CARDEMU_TO_ACT
+        RTL8188EE_TRANS_END
 };
 
 /*3Radio off GPIO Array */
-struct wlan_pwr_cfg rtl8188e_radio_off_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS
-                                            + RTL8188E_TRANS_END_STEPS] = {
-        RTL8188E_TRANS_ACT_TO_CARDEMU
-        RTL8188E_TRANS_END
+struct wlan_pwr_cfg rtl8188ee_radio_off_flow[RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8188EE_TRANS_END_STEPS] = {
+        RTL8188EE_TRANS_ACT_TO_CARDEMU
+        RTL8188EE_TRANS_END
 };
 
 /*3Card Disable Array*/
-struct wlan_pwr_cfg rtl8188e_card_disable_flow
-        [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
-        RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
-        RTL8188E_TRANS_END_STEPS] = {
-                RTL8188E_TRANS_ACT_TO_CARDEMU
-                RTL8188E_TRANS_CARDEMU_TO_CARDDIS
-                RTL8188E_TRANS_END
+struct wlan_pwr_cfg rtl8188ee_card_disable_flow
+                [RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8188EE_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8188EE_TRANS_END_STEPS] = {
+        RTL8188EE_TRANS_ACT_TO_CARDEMU
+        RTL8188EE_TRANS_CARDEMU_TO_CARDDIS
+        RTL8188EE_TRANS_END
 };
 
 /*3 Card Enable Array*/
-struct wlan_pwr_cfg rtl8188e_card_enable_flow
-        [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
-        RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
-        RTL8188E_TRANS_END_STEPS] = {
-                RTL8188E_TRANS_CARDDIS_TO_CARDEMU
-                RTL8188E_TRANS_CARDEMU_TO_ACT
-                RTL8188E_TRANS_END
+struct wlan_pwr_cfg rtl8188ee_card_enable_flow
+                [RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8188EE_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8188EE_TRANS_END_STEPS] = {
+        RTL8188EE_TRANS_CARDDIS_TO_CARDEMU
+        RTL8188EE_TRANS_CARDEMU_TO_ACT
+        RTL8188EE_TRANS_END
 };
 
 /*3Suspend Array*/
-struct wlan_pwr_cfg rtl8188e_suspend_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS
-                                        + RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS
-                                        + RTL8188E_TRANS_END_STEPS] = {
-        RTL8188E_TRANS_ACT_TO_CARDEMU
-        RTL8188E_TRANS_CARDEMU_TO_SUS
-        RTL8188E_TRANS_END
+struct wlan_pwr_cfg rtl8188ee_suspend_flow[RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8188EE_TRANS_CARDEMU_TO_SUS_STEPS
+                                        + RTL8188EE_TRANS_END_STEPS] = {
+        RTL8188EE_TRANS_ACT_TO_CARDEMU
+        RTL8188EE_TRANS_CARDEMU_TO_SUS
+        RTL8188EE_TRANS_END
 };
 
 /*3 Resume Array*/
-struct wlan_pwr_cfg rtl8188e_resume_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS
-                                        + RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS
-                                        + RTL8188E_TRANS_END_STEPS] = {
-        RTL8188E_TRANS_SUS_TO_CARDEMU
-        RTL8188E_TRANS_CARDEMU_TO_ACT
-        RTL8188E_TRANS_END
+struct wlan_pwr_cfg rtl8188ee_resume_flow[RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8188EE_TRANS_CARDEMU_TO_SUS_STEPS
+                                        + RTL8188EE_TRANS_END_STEPS] = {
+        RTL8188EE_TRANS_SUS_TO_CARDEMU
+        RTL8188EE_TRANS_CARDEMU_TO_ACT
+        RTL8188EE_TRANS_END
 };
 
 /*3HWPDN Array*/
-struct wlan_pwr_cfg rtl8188e_hwpdn_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS
-                                + RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS
-                                + RTL8188E_TRANS_END_STEPS] = {
-        RTL8188E_TRANS_ACT_TO_CARDEMU
-        RTL8188E_TRANS_CARDEMU_TO_PDN
-        RTL8188E_TRANS_END
+struct wlan_pwr_cfg rtl8188ee_hwpdn_flow[RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS
+                                + RTL8188EE_TRANS_CARDEMU_TO_PDN_STEPS
+                                + RTL8188EE_TRANS_END_STEPS] = {
+        RTL8188EE_TRANS_ACT_TO_CARDEMU
+        RTL8188EE_TRANS_CARDEMU_TO_PDN
+        RTL8188EE_TRANS_END
 };
 
 /*3 Enter LPS */
-struct wlan_pwr_cfg rtl8188e_enter_lps_flow[RTL8188E_TRANS_ACT_TO_LPS_STEPS
-                                        + RTL8188E_TRANS_END_STEPS] = {
+struct wlan_pwr_cfg rtl8188ee_enter_lps_flow[RTL8188EE_TRANS_ACT_TO_LPS_STEPS
+                                        + RTL8188EE_TRANS_END_STEPS] = {
         /*FW behavior*/
-        RTL8188E_TRANS_ACT_TO_LPS
-        RTL8188E_TRANS_END
+        RTL8188EE_TRANS_ACT_TO_LPS
+        RTL8188EE_TRANS_END
 };
 
 /*3 Leave LPS */
-struct wlan_pwr_cfg rtl8188e_leave_lps_flow[RTL8188E_TRANS_LPS_TO_ACT_STEPS
-                                        + RTL8188E_TRANS_END_STEPS] = {
+struct wlan_pwr_cfg rtl8188ee_leave_lps_flow[RTL8188EE_TRANS_LPS_TO_ACT_STEPS
+                                        + RTL8188EE_TRANS_END_STEPS] = {
         /*FW behavior*/
-        RTL8188E_TRANS_LPS_TO_ACT
-        RTL8188E_TRANS_END
+        RTL8188EE_TRANS_LPS_TO_ACT
+        RTL8188EE_TRANS_END
 };
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h
index 32e135ab9a63..79103347d967 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,297 +26,286 @@
 #ifndef __RTL8723E_PWRSEQ_H__
 #define __RTL8723E_PWRSEQ_H__
 
-/*
-        Check document WM-20110607-Paul-RTL8188E_Power_Architecture-R02.vsd
-        There are 6 HW Power States:
-        0: POFF--Power Off
-        1: PDN--Power Down
-        2: CARDEMU--Card Emulation
-        3: ACT--Active Mode
-        4: LPS--Low Power State
-        5: SUS--Suspend
-
-        The transision from different states are defined below
-        TRANS_CARDEMU_TO_ACT
-        TRANS_ACT_TO_CARDEMU
-        TRANS_CARDEMU_TO_SUS
-        TRANS_SUS_TO_CARDEMU
-        TRANS_CARDEMU_TO_PDN
-        TRANS_ACT_TO_LPS
-        TRANS_LPS_TO_ACT
-
-        TRANS_END
-        PWR SEQ Version: rtl8188e_PwrSeq_V09.h
-*/
-
-#define RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS     10
-#define RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS     10
-#define RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS     10
-#define RTL8188E_TRANS_SUS_TO_CARDEMU_STEPS     10
-#define RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS     10
-#define RTL8188E_TRANS_PDN_TO_CARDEMU_STEPS     10
-#define RTL8188E_TRANS_ACT_TO_LPS_STEPS         15
-#define RTL8188E_TRANS_LPS_TO_ACT_STEPS         15
-#define RTL8188E_TRANS_END_STEPS                1
+#include "pwrseqcmd.h"
+/* Check document WM-20110607-Paul-RTL8188EE_Power_Architecture-R02.vsd
+ *      There are 6 HW Power States:
+ *      0: POFF--Power Off
+ *      1: PDN--Power Down
+ *      2: CARDEMU--Card Emulation
+ *      3: ACT--Active Mode
+ *      4: LPS--Low Power State
+ *      5: SUS--Suspend
+ *
+ *      The transision from different states are defined below
+ *      TRANS_CARDEMU_TO_ACT
+ *      TRANS_ACT_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_SUS
+ *      TRANS_SUS_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_PDN
+ *      TRANS_ACT_TO_LPS
+ *      TRANS_LPS_TO_ACT
+ *
+ *      TRANS_END
+ *      PWR SEQ Version: rtl8188ee_PwrSeq_V09.h
+ */
 
+#define RTL8188EE_TRANS_CARDEMU_TO_ACT_STEPS    10
+#define RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS    10
+#define RTL8188EE_TRANS_CARDEMU_TO_SUS_STEPS    10
+#define RTL8188EE_TRANS_SUS_TO_CARDEMU_STEPS    10
+#define RTL8188EE_TRANS_CARDEMU_TO_PDN_STEPS    10
+#define RTL8188EE_TRANS_PDN_TO_CARDEMU_STEPS    10
+#define RTL8188EE_TRANS_ACT_TO_LPS_STEPS                15
+#define RTL8188EE_TRANS_LPS_TO_ACT_STEPS                15
+#define RTL8188EE_TRANS_END_STEPS               1
 
-#define RTL8188E_TRANS_CARDEMU_TO_ACT                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+/* The following macros have the following format:
+ * { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value
+ *   comments },
+ */
+#define RTL8188EE_TRANS_CARDEMU_TO_ACT                                  \
         {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /* wait till 0x04[17] = 1    power ready*/                      \
-        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), BIT(1)},             \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), BIT(1)               \
+        /* wait till 0x04[17] = 1    power ready*/},                    \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /* 0x02[1:0] = 0        reset BB*/                              \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0)|BIT(1), 0},             \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0)|BIT(1), 0               \
+        /* 0x02[1:0] = 0        reset BB*/},                            \
         {0x0026, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*0x24[23] = 2b'01 schmit trigger */                            \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)},               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)                 \
+        /*0x24[23] = 2b'01 schmit trigger */},                          \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /* 0x04[15] = 0 disable HWPDN (control by DRV)*/                \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0                      \
+        /* 0x04[15] = 0 disable HWPDN (control by DRV)*/},              \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*0x04[12:11] = 2b'00 disable WL suspend*/                      \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4)|BIT(3), 0},             \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4)|BIT(3), 0               \
+        /*0x04[12:11] = 2b'00 disable WL suspend*/},                    \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*0x04[8] = 1 polling until return 0*/                          \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)                 \
+        /*0x04[8] = 1 polling until return 0*/},                        \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*wait till 0x04[8] = 0*/                                       \
-        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(0), 0},                  \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(0), 0                    \
+        /*wait till 0x04[8] = 0*/},                                     \
         {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0}, /*LDO normal mode*/\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0                      \
+        /*LDO normal mode*/},                                           \
         {0x0074, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)}, /*SDIO Driving*/\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)                 \
+        /*SDIO Driving*/},
 
-#define RTL8188E_TRANS_ACT_TO_CARDEMU                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+#define RTL8188EE_TRANS_ACT_TO_CARDEMU                                  \
         {0x001F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},/*0x1F[7:0] = 0 turn off RF*/\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0                        \
+        /*0x1F[7:0] = 0 turn off RF*/},                                 \
         {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)}, /*LDO Sleep mode*/\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)                 \
+        /*LDO Sleep mode*/},                                            \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*0x04[9] = 1 turn off MAC by HW state machine*/                \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)                 \
+        /*0x04[9] = 1 turn off MAC by HW state machine*/},              \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*wait till 0x04[9] = 0 polling until return 0 to disable*/     \
-        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), 0},                  \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), 0                    \
+        /*wait till 0x04[9] = 0 polling until return 0 to disable*/},
 
-
-#define RTL8188E_TRANS_CARDEMU_TO_SUS                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+#define RTL8188EE_TRANS_CARDEMU_TO_SUS                                  \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
-        /*0x04[12:11] = 2b'01enable WL suspend*/                        \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},        \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)          \
+        /*0x04[12:11] = 2b'01enable WL suspend*/},                      \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
-        /*0x04[12:11] = 2b'11enable WL suspend for PCIe*/               \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)|BIT(4)},\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)|BIT(4)   \
+        /*0x04[12:11] = 2b'11enable WL suspend for PCIe*/},             \
         {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
-        /*  0x04[31:30] = 2b'10 enable enable bandgap mbias in suspend */\
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, BIT(7)},                 \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, BIT(7)                   \
+        /*  0x04[31:30] = 2b'10 enable enable bandgap mbias in suspend */},\
         {0x0041, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
-        /*Clear SIC_EN register 0x40[12] = 1'b0 */                      \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0                      \
+        /*Clear SIC_EN register 0x40[12] = 1'b0 */},                    \
         {0xfe10, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
-        /*Set USB suspend enable local register  0xfe10[4]= 1 */        \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)},               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)                 \
+        /*Set USB suspend enable local register  0xfe10[4]=1 */},       \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        /*Set SDIO suspend local register*/                             \
-        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)},              \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)                \
+        /*Set SDIO suspend local register*/},                           \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        /*wait power state to suspend*/                                 \
-        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), 0},
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), 0                   \
+        /*wait power state to suspend*/},
 
-#define RTL8188E_TRANS_SUS_TO_CARDEMU                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+#define RTL8188EE_TRANS_SUS_TO_CARDEMU                                  \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        /*Set SDIO suspend local register*/                             \
-        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0},                   \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0                     \
+        /*Set SDIO suspend local register*/},                           \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        /*wait power state to suspend*/                                 \
-        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)},            \
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)              \
+        /*wait power state to suspend*/},                               \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*0x04[12:11] = 2b'01enable WL suspend*/                        \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0},
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3) | BIT(4), 0             \
+        /*0x04[12:11] = 2b'01enable WL suspend*/},
 
-#define RTL8188E_TRANS_CARDEMU_TO_CARDDIS                               \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+#define RTL8188EE_TRANS_CARDEMU_TO_CARDDIS                              \
         {0x0026, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*0x24[23] = 2b'01 schmit trigger */                            \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)},               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)                 \
+        /*0x24[23] = 2b'01 schmit trigger */},                          \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
-        /*0x04[12:11] = 2b'01 enable WL suspend*/                       \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},        \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3) | BIT(4), BIT(3)        \
+        /*0x04[12:11] = 2b'01 enable WL suspend*/},                     \
         {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
-        /*  0x04[31:30] = 2b'10 enable enable bandgap mbias in suspend */\
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},                      \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0                        \
+        /*  0x04[31:30] = 2b'10 enable enable bandgap mbias in suspend */},\
         {0x0041, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
-        /*Clear SIC_EN register 0x40[12] = 1'b0 */                      \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0                      \
+        /*Clear SIC_EN register 0x40[12] = 1'b0 */},                    \
         {0xfe10, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
-        /*Set USB suspend enable local register  0xfe10[4]= 1 */        \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)},               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)                 \
+        /*Set USB suspend enable local register  0xfe10[4]=1 */},       \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        /*Set SDIO suspend local register*/                             \
-        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)},              \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)                \
+        /*Set SDIO suspend local register*/},                           \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        PWR_CMD_POLLING, BIT(1), 0}, /*wait power state to suspend*/
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), 0                   \
+        /*wait power state to suspend*/},
 
-#define RTL8188E_TRANS_CARDDIS_TO_CARDEMU                               \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+#define RTL8188EE_TRANS_CARDDIS_TO_CARDEMU                              \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        PWR_BASEADDR_SDIO,\
-        PWR_CMD_WRITE, BIT(0), 0}, /*Set SDIO suspend local register*/  \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0                     \
+        /*Set SDIO suspend local register*/},                           \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        PWR_BASEADDR_SDIO,\
-        PWR_CMD_POLLING, BIT(1), BIT(1)}, /*wait power state to suspend*/\
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)              \
+        /*wait power state to suspend*/},                               \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC,                                               \
-        PWR_CMD_WRITE, BIT(3)|BIT(4), 0},                               \
-        /*0x04[12:11] = 2b'01enable WL suspend*/
-
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0               \
+        /*0x04[12:11] = 2b'01enable WL suspend*/},
 
-#define RTL8188E_TRANS_CARDEMU_TO_PDN                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+#define RTL8188EE_TRANS_CARDEMU_TO_PDN                                  \
         {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},/* 0x04[16] = 0*/   \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0/* 0x04[16] = 0*/},   \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)},/* 0x04[15] = 1*/
-
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)                 \
+        /* 0x04[15] = 1*/},
 
-#define RTL8188E_TRANS_PDN_TO_CARDEMU                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+#define RTL8188EE_TRANS_PDN_TO_CARDEMU                                  \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},/* 0x04[15] = 0*/
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0/* 0x04[15] = 0*/},
 
-
-#define RTL8188E_TRANS_ACT_TO_LPS                                       \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+#define RTL8188EE_TRANS_ACT_TO_LPS                                      \
         {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x7F},/*Tx Pause*/       \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x7F                     \
+        /*Tx Pause*/},                                                  \
         {0x05F8, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*zero if no pkt is tx*/\
-        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0                      \
+        /*Should be zero if no packet is transmitting*/},               \
         {0x05F9, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*Should be zero if no packet is transmitting*/ \
-        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0                      \
+        /*Should be zero if no packet is transmitting*/},               \
         {0x05FA, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*Should be zero if no packet is transmitting*/                 \
-        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0                      \
+        /*Should be zero if no packet is transmitting*/},               \
         {0x05FB, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*Should be zero if no packet is transmitting*/                 \
-        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0                      \
+        /*Should be zero if no packet is transmitting*/},               \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*CCK and OFDM are disabled, and clock are gated*/              \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0                      \
+        /*CCK and OFDM are disabled,and clock are gated*/},             \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US},/*Delay 1us*/\
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US             \
+        /*Delay 1us*/},                                                 \
         {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x3F},/*Reset MAC TRX*/  \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x3F                     \
+        /*Reset MAC TRX*/},                                             \
         {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*check if removed later*/                                      \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0                      \
+        /*check if removed later*/},                                    \
         {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*Respond TxOK to scheduler*/                                   \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(5), BIT(5)},               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(5), BIT(5)                 \
+        /*Respond TxOK to scheduler*/},
 
 
-#define RTL8188E_TRANS_LPS_TO_ACT                                       \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+#define RTL8188EE_TRANS_LPS_TO_ACT                                      \
         {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, 0xFF, 0x84}, /*SDIO RPWM*/    \
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, 0xFF, 0x84                    \
+        /*SDIO RPWM*/},                                                 \
         {0xFE58, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84}, /*USB RPWM*/      \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84                     \
+        /*USB RPWM*/},                                                  \
         {0x0361, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84}, /*PCIe RPWM*/     \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84                     \
+        /*PCIe RPWM*/},                                                 \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS}, /*Delay*/ \
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS             \
+        /*Delay*/},                                                     \
         {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*.     0x08[4] = 0              switch TSF to 40M*/            \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0                      \
+        /*.     0x08[4] = 0              switch TSF to 40M*/},          \
         {0x0109, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*Polling 0x109[7]= 0  TSF in 40M*/                             \
-        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(7), 0},                  \
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(7), 0                    \
+        /*Polling 0x109[7]=0  TSF in 40M*/},                            \
         {0x0029, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*. 0x29[7:6] = 2b'00    enable BB clock*/                      \
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(6)|BIT(7), 0},             \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(6)|BIT(7), 0               \
+        /*.     0x29[7:6] = 2b'00        enable BB clock*/},            \
         {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*.     0x101[1] = 1*/\
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},               \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)                 \
+        /*.     0x101[1] = 1*/},                                        \
         {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*.     0x100[7:0] = 0xFF        enable WMAC TRX*/\
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF},                   \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF                     \
+        /*.     0x100[7:0] = 0xFF        enable WMAC TRX*/},            \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-        /*. 0x02[1:0] = 2b'11  enable BB macro*/\
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1)|BIT(0), BIT(1)|BIT(0)}, \
-        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
-        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0}, /*.  0x522 = 0*/
-
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1)|BIT(0), BIT(1)|BIT(0)   \
+        /*.     0x02[1:0] = 2b'11        enable BB macro*/},            \
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0                        \
+        /*.     0x522 = 0*/},
 
-#define RTL8188E_TRANS_END                                              \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+#define RTL8188EE_TRANS_END             \
         {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
         0, PWR_CMD_END, 0, 0}
 
-extern struct wlan_pwr_cfg rtl8188e_power_on_flow
-                [RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS +
-                RTL8188E_TRANS_END_STEPS];
-extern struct wlan_pwr_cfg rtl8188e_radio_off_flow
-                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
-                RTL8188E_TRANS_END_STEPS];
-extern struct wlan_pwr_cfg rtl8188e_card_disable_flow
-                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
-                RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
-                RTL8188E_TRANS_END_STEPS];
-extern struct wlan_pwr_cfg rtl8188e_card_enable_flow
-                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
-                RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
-                RTL8188E_TRANS_END_STEPS];
-extern struct wlan_pwr_cfg rtl8188e_suspend_flow
-                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
-                RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS +
-                RTL8188E_TRANS_END_STEPS];
-extern struct wlan_pwr_cfg rtl8188e_resume_flow
-                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
-                RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS +
-                RTL8188E_TRANS_END_STEPS];
-extern struct wlan_pwr_cfg rtl8188e_hwpdn_flow
-                [RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS +
-                RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS +
-                RTL8188E_TRANS_END_STEPS];
-extern struct wlan_pwr_cfg rtl8188e_enter_lps_flow
-                [RTL8188E_TRANS_ACT_TO_LPS_STEPS +
-                RTL8188E_TRANS_END_STEPS];
-extern struct wlan_pwr_cfg rtl8188e_leave_lps_flow
-                [RTL8188E_TRANS_LPS_TO_ACT_STEPS +
-                RTL8188E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_power_on_flow
+                [RTL8188EE_TRANS_CARDEMU_TO_ACT_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_radio_off_flow
+                [RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_card_disable_flow
+                [RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8188EE_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_card_enable_flow
+                [RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8188EE_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_suspend_flow
+                [RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8188EE_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_resume_flow
+                [RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8188EE_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_hwpdn_flow
+                [RTL8188EE_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8188EE_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_enter_lps_flow
+                [RTL8188EE_TRANS_ACT_TO_LPS_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8188ee_leave_lps_flow
+                [RTL8188EE_TRANS_LPS_TO_ACT_STEPS +
+                 RTL8188EE_TRANS_END_STEPS];
 
 /* RTL8723 Power Configuration CMDs for PCIe interface */
-#define Rtl8188E_NIC_PWR_ON_FLOW        rtl8188e_power_on_flow
-#define Rtl8188E_NIC_RF_OFF_FLOW        rtl8188e_radio_off_flow
-#define Rtl8188E_NIC_DISABLE_FLOW       rtl8188e_card_disable_flow
-#define Rtl8188E_NIC_ENABLE_FLOW        rtl8188e_card_enable_flow
-#define Rtl8188E_NIC_SUSPEND_FLOW       rtl8188e_suspend_flow
-#define Rtl8188E_NIC_RESUME_FLOW        rtl8188e_resume_flow
-#define Rtl8188E_NIC_PDN_FLOW           rtl8188e_hwpdn_flow
-#define Rtl8188E_NIC_LPS_ENTER_FLOW     rtl8188e_enter_lps_flow
-#define Rtl8188E_NIC_LPS_LEAVE_FLOW     rtl8188e_leave_lps_flow
+#define RTL8188EE_NIC_PWR_ON_FLOW       rtl8188ee_power_on_flow
+#define RTL8188EE_NIC_RF_OFF_FLOW       rtl8188ee_radio_off_flow
+#define RTL8188EE_NIC_DISABLE_FLOW      rtl8188ee_card_disable_flow
+#define RTL8188EE_NIC_ENABLE_FLOW       rtl8188ee_card_enable_flow
+#define RTL8188EE_NIC_SUSPEND_FLOW      rtl8188ee_suspend_flow
+#define RTL8188EE_NIC_RESUME_FLOW       rtl8188ee_resume_flow
+#define RTL8188EE_NIC_PDN_FLOW          rtl8188ee_hwpdn_flow
+#define RTL8188EE_NIC_LPS_ENTER_FLOW    rtl8188ee_enter_lps_flow
+#define RTL8188EE_NIC_LPS_LEAVE_FLOW    rtl8188ee_leave_lps_flow
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
deleted file mode 100644
index 0f9314205526..000000000000
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/******************************************************************************
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * 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>
- *
- *****************************************************************************/
-
-#include "pwrseq.h"
-
-
-/*      Description:
- *              This routine deal with the Power Configuration CMDs
- *               parsing for RTL8723/RTL8188E Series IC.
- *      Assumption:
- *              We should follow specific format which was released from HW SD.
- *
- *      2011.07.07, added by Roger.
- */
-
-bool rtl88_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
-                                u8 fab_version, u8 interface_type,
-                                struct wlan_pwr_cfg pwrcfgcmd[])
-{
-        struct wlan_pwr_cfg cmd = {0};
-        bool polling_bit = false;
-        u32 ary_idx = 0;
-        u8 val = 0;
-        u32 offset = 0;
-        u32 polling_count = 0;
-        u32 max_polling_cnt = 5000;
-
-        do {
-                cmd = pwrcfgcmd[ary_idx];
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "rtl88_hal_pwrseqcmdparsing(): offset(%#x), cut_msk(%#x), fab_msk(%#x),"
-                         "interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), val(%#x)\n",
-                         GET_PWR_CFG_OFFSET(cmd),
-                         GET_PWR_CFG_CUT_MASK(cmd),
-                         GET_PWR_CFG_FAB_MASK(cmd),
-                         GET_PWR_CFG_INTF_MASK(cmd),
-                         GET_PWR_CFG_BASE(cmd),
-                         GET_PWR_CFG_CMD(cmd),
-                         GET_PWR_CFG_MASK(cmd),
-                         GET_PWR_CFG_VALUE(cmd));
-
-                if ((GET_PWR_CFG_FAB_MASK(cmd) & fab_version) &&
-                    (GET_PWR_CFG_CUT_MASK(cmd) & cut_version) &&
-                    (GET_PWR_CFG_INTF_MASK(cmd) & interface_type)) {
-                        switch (GET_PWR_CFG_CMD(cmd)) {
-                        case PWR_CMD_READ:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_READ\n");
-                                break;
-                        case PWR_CMD_WRITE: {
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_WRITE\n");
-                                offset = GET_PWR_CFG_OFFSET(cmd);
-
-                                        /*Read the val from system register*/
-                                        val = rtl_read_byte(rtlpriv, offset);
-                                        val &= (~(GET_PWR_CFG_MASK(cmd)));
-                                        val |= (GET_PWR_CFG_VALUE(cmd) &
-                                                GET_PWR_CFG_MASK(cmd));
-
-                                        /*Write the val back to sytem register*/
-                                        rtl_write_byte(rtlpriv, offset, val);
-                                }
-                                break;
-                        case PWR_CMD_POLLING:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_POLLING\n");
-                                polling_bit = false;
-                                offset = GET_PWR_CFG_OFFSET(cmd);
-
-                                do {
-                                        val = rtl_read_byte(rtlpriv, offset);
-
-                                        val = val & GET_PWR_CFG_MASK(cmd);
-                                        if (val == (GET_PWR_CFG_VALUE(cmd) &
-                                                    GET_PWR_CFG_MASK(cmd)))
-                                                polling_bit = true;
-                                        else
-                                                udelay(10);
-
-                                        if (polling_count++ > max_polling_cnt) {
-                                                RT_TRACE(rtlpriv, COMP_INIT,
-                                                         DBG_LOUD,
-                                                         "polling fail in pwrseqcmd\n");
-                                                return false;
-                                        }
-                                } while (!polling_bit);
-
-                                break;
-                        case PWR_CMD_DELAY:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_DELAY\n");
-                                if (GET_PWR_CFG_VALUE(cmd) == PWRSEQ_DELAY_US)
-                                        udelay(GET_PWR_CFG_OFFSET(cmd));
-                                else
-                                        mdelay(GET_PWR_CFG_OFFSET(cmd));
-                                break;
-                        case PWR_CMD_END:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_END\n");
-                                return true;
-                        default:
-                                RT_ASSERT(false,
-                                          "rtl88_hal_pwrseqcmdparsing(): Unknown CMD!!\n");
-                                break;
-                        }
-                }
-
-                ary_idx++;
-        } while (1);
-
-        return true;
-}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h
deleted file mode 100644
index d9ae280bb1a2..000000000000
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************************************************************************
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * 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>
- *
- *****************************************************************************/
-
-#ifndef __RTL8723E_PWRSEQCMD_H__
-#define __RTL8723E_PWRSEQCMD_H__
-
-#include "../wifi.h"
-/*---------------------------------------------*/
-/* The value of cmd: 4 bits */
-/*---------------------------------------------*/
-#define PWR_CMD_READ            0x00
-#define PWR_CMD_WRITE           0x01
-#define PWR_CMD_POLLING         0x02
-#define PWR_CMD_DELAY           0x03
-#define PWR_CMD_END             0x04
-
-/* define the base address of each block */
-#define PWR_BASEADDR_MAC        0x00
-#define PWR_BASEADDR_USB        0x01
-#define PWR_BASEADDR_PCIE       0x02
-#define PWR_BASEADDR_SDIO       0x03
-
-#define PWR_INTF_SDIO_MSK       BIT(0)
-#define PWR_INTF_USB_MSK        BIT(1)
-#define PWR_INTF_PCI_MSK        BIT(2)
-#define PWR_INTF_ALL_MSK        (BIT(0)|BIT(1)|BIT(2)|BIT(3))
-
-#define PWR_FAB_TSMC_MSK        BIT(0)
-#define PWR_FAB_UMC_MSK         BIT(1)
-#define PWR_FAB_ALL_MSK         (BIT(0)|BIT(1)|BIT(2)|BIT(3))
-
-#define PWR_CUT_TESTCHIP_MSK    BIT(0)
-#define PWR_CUT_A_MSK           BIT(1)
-#define PWR_CUT_B_MSK           BIT(2)
-#define PWR_CUT_C_MSK           BIT(3)
-#define PWR_CUT_D_MSK           BIT(4)
-#define PWR_CUT_E_MSK           BIT(5)
-#define PWR_CUT_F_MSK           BIT(6)
-#define PWR_CUT_G_MSK           BIT(7)
-#define PWR_CUT_ALL_MSK         0xFF
-
-enum pwrseq_delay_unit {
-        PWRSEQ_DELAY_US,
-        PWRSEQ_DELAY_MS,
-};
-
-struct wlan_pwr_cfg {
-        u16 offset;
-        u8 cut_msk;
-        u8 fab_msk:4;
-        u8 interface_msk:4;
-        u8 base:4;
-        u8 cmd:4;
-        u8 msk;
-        u8 value;
-};
-
-#define GET_PWR_CFG_OFFSET(__PWR)       (__PWR.offset)
-#define GET_PWR_CFG_CUT_MASK(__PWR)     (__PWR.cut_msk)
-#define GET_PWR_CFG_FAB_MASK(__PWR)     (__PWR.fab_msk)
-#define GET_PWR_CFG_INTF_MASK(__PWR)    (__PWR.interface_msk)
-#define GET_PWR_CFG_BASE(__PWR)         (__PWR.base)
-#define GET_PWR_CFG_CMD(__PWR)          (__PWR.cmd)
-#define GET_PWR_CFG_MASK(__PWR)         (__PWR.msk)
-#define GET_PWR_CFG_VALUE(__PWR)        (__PWR.value)
-
-bool rtl88_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
-                                u8 fab_version, u8 interface_type,
-                                struct wlan_pwr_cfg pwrcfgcmd[]);
-
-#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h
index cd7e7a527133..15400ee6c04b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,62 +26,60 @@
 #ifndef __RTL92C_REG_H__
 #define __RTL92C_REG_H__
 
-#define TXPKT_BUF_SELECT                        0x69
-#define RXPKT_BUF_SELECT                        0xA5
-#define DISABLE_TRXPKT_BUF_ACCESS               0x0
+#define TXPKT_BUF_SELECT                                0x69
+#define RXPKT_BUF_SELECT                                0xA5
+#define DISABLE_TRXPKT_BUF_ACCESS                       0x0
 
 #define REG_SYS_ISO_CTRL                        0x0000
 #define REG_SYS_FUNC_EN                         0x0002
 #define REG_APS_FSMCO                           0x0004
 #define REG_SYS_CLKR                            0x0008
-#define REG_9346CR                              0x000A
-#define REG_EE_VPD                              0x000C
+#define REG_9346CR                                      0x000A
+#define REG_EE_VPD                                      0x000C
 #define REG_AFE_MISC                            0x0010
 #define REG_SPS0_CTRL                           0x0011
 #define REG_SPS_OCP_CFG                         0x0018
 #define REG_RSV_CTRL                            0x001C
-#define REG_RF_CTRL                             0x001F
+#define REG_RF_CTRL                                     0x001F
 #define REG_LDOA15_CTRL                         0x0020
 #define REG_LDOV12D_CTRL                        0x0021
 #define REG_LDOHCI12_CTRL                       0x0022
 #define REG_LPLDO_CTRL                          0x0023
 #define REG_AFE_XTAL_CTRL                       0x0024
-#define REG_AFE_LDO_CTRL                        0x0027 /* 1.5v for 8188EE test
-                                                        * chip, 1.4v for MP chip
-                                                        */
+/* 1.5v for 8188EE test chip, 1.4v for MP chip */
+#define REG_AFE_LDO_CTRL                        0x0027
 #define REG_AFE_PLL_CTRL                        0x0028
 #define REG_EFUSE_CTRL                          0x0030
 #define REG_EFUSE_TEST                          0x0034
 #define REG_PWR_DATA                            0x0038
 #define REG_CAL_TIMER                           0x003C
 #define REG_ACLK_MON                            0x003E
-#define REG_GPIO_MUXCFG                         0x0040
+#define REG_GPIO_MUXCFG                 0x0040
 #define REG_GPIO_IO_SEL                         0x0042
-#define REG_MAC_PINMUX_CFG                      0x0043
+#define REG_MAC_PINMUX_CFG              0x0043
 #define REG_GPIO_PIN_CTRL                       0x0044
 #define REG_GPIO_INTM                           0x0048
-#define REG_LEDCFG0                             0x004C
-#define REG_LEDCFG1                             0x004D
-#define REG_LEDCFG2                             0x004E
-#define REG_LEDCFG3                             0x004F
-#define REG_FSIMR                               0x0050
-#define REG_FSISR                               0x0054
-#define REG_HSIMR                               0x0058
-#define REG_HSISR                               0x005c
-#define REG_GPIO_PIN_CTRL_2                     0x0060
+#define REG_LEDCFG0                                     0x004C
+#define REG_LEDCFG1                                     0x004D
+#define REG_LEDCFG2                                     0x004E
+#define REG_LEDCFG3                                     0x004F
+#define REG_FSIMR                                       0x0050
+#define REG_FSISR                                       0x0054
+#define REG_HSIMR                                       0x0058
+#define REG_HSISR                                       0x005c
+#define REG_GPIO_PIN_CTRL_2             0x0060
 #define REG_GPIO_IO_SEL_2                       0x0062
-#define REG_GPIO_OUTPUT                         0x006c
-#define REG_AFE_XTAL_CTRL_EXT                   0x0078
+#define REG_GPIO_OUTPUT                 0x006c
+#define REG_AFE_XTAL_CTRL_EXT           0x0078
 #define REG_XCK_OUT_CTRL                        0x007c
 #define REG_MCUFWDL                             0x0080
 #define REG_WOL_EVENT                           0x0081
 #define REG_MCUTSTCFG                           0x0084
 
-
-#define REG_HIMR                                0x00B0
-#define REG_HISR                                0x00B4
-#define REG_HIMRE                               0x00B8
-#define REG_HISRE                               0x00BC
+#define REG_HIMR                                        0x00B0
+#define REG_HISR                                        0x00B4
+#define REG_HIMRE                                       0x00B8
+#define REG_HISRE                                       0x00BC
 
 #define REG_EFUSE_ACCESS                        0x00CF
 
@@ -96,23 +90,23 @@
 #define REG_PCIE_MIO_INTF                       0x00E4
 #define REG_PCIE_MIO_INTD                       0x00E8
 #define REG_HPON_FSM                            0x00EC
-#define REG_SYS_CFG                             0x00F0
+#define REG_SYS_CFG                                     0x00F0
 
-#define REG_CR                                  0x0100
-#define REG_PBP                                 0x0104
-#define REG_PKT_BUFF_ACCESS_CTRL                0x0106
+#define REG_CR                                          0x0100
+#define REG_PBP                                         0x0104
+#define REG_PKT_BUFF_ACCESS_CTRL        0x0106
 #define REG_TRXDMA_CTRL                         0x010C
 #define REG_TRXFF_BNDY                          0x0114
 #define REG_TRXFF_STATUS                        0x0118
 #define REG_RXFF_PTR                            0x011C
 
-#define REG_CPWM                                0x012F
-#define REG_FWIMR                               0x0130
-#define REG_FWISR                               0x0134
+#define REG_CPWM                                        0x012F
+#define REG_FWIMR                                       0x0130
+#define REG_FWISR                                       0x0134
 #define REG_PKTBUF_DBG_CTRL                     0x0140
-#define REG_PKTBUF_DBG_DATA_L                   0x0144
-#define REG_PKTBUF_DBG_DATA_H                   0x0148
-#define REG_RXPKTBUF_CTRL                       (REG_PKTBUF_DBG_CTRL+2)
+#define REG_PKTBUF_DBG_DATA_L           0x0144
+#define REG_PKTBUF_DBG_DATA_H           0x0148
+#define REG_RXPKTBUF_CTRL       (REG_PKTBUF_DBG_CTRL+2)
 
 #define REG_TC0_CTRL                            0x0150
 #define REG_TC1_CTRL                            0x0154
@@ -123,13 +117,13 @@
 #define REG_MBIST_START                         0x0174
 #define REG_MBIST_DONE                          0x0178
 #define REG_MBIST_FAIL                          0x017C
-#define REG_32K_CTRL                            0x0194
-#define REG_C2HEVT_MSG_NORMAL                   0x01A0
+#define REG_32K_CTRL                                    0x0194
+#define REG_C2HEVT_MSG_NORMAL           0x01A0
 #define REG_C2HEVT_CLEAR                        0x01AF
 #define REG_C2HEVT_MSG_TEST                     0x01B8
 #define REG_MCUTST_1                            0x01c0
-#define REG_FMETHR                              0x01C8
-#define REG_HMETFR                              0x01CC
+#define REG_FMETHR                                      0x01C8
+#define REG_HMETFR                                      0x01CC
 #define REG_HMEBOX_0                            0x01D0
 #define REG_HMEBOX_1                            0x01D4
 #define REG_HMEBOX_2                            0x01D8
@@ -144,36 +138,37 @@
 #define REG_HMEBOX_EXT_2                        0x01F8
 #define REG_HMEBOX_EXT_3                        0x01FC
 
-#define REG_RQPN                                0x0200
+#define REG_RQPN                                        0x0200
 #define REG_FIFOPAGE                            0x0204
-#define REG_TDECTRL                             0x0208
-#define REG_TXDMA_OFFSET_CHK                    0x020C
+#define REG_TDECTRL                                     0x0208
+#define REG_TXDMA_OFFSET_CHK            0x020C
 #define REG_TXDMA_STATUS                        0x0210
 #define REG_RQPN_NPQ                            0x0214
 
-#define REG_RXDMA_AGG_PG_TH                     0x0280
-#define REG_FW_UPD_RDPTR                        0x0284 /* FW shall update this
-                                                * register before FW * write
-                                                * RXPKT_RELEASE_POLL to 1
-                                                */
-#define REG_RXDMA_CONTROL                       0x0286 /* Control the RX DMA.*/
-#define REG_RXPKT_NUM                           0x0287 /* The number of packets
-                                                        * in RXPKTBUF.
-                                                         */
+#define REG_RXDMA_AGG_PG_TH             0x0280
+/* FW shall update this register before
+ * FW write RXPKT_RELEASE_POLL to 1
+ */
+#define REG_FW_UPD_RDPTR                        0x0284
+/* Control the RX DMA.*/
+#define REG_RXDMA_CONTROL                       0x0286
+/* The number of packets in RXPKTBUF.   */
+#define REG_RXPKT_NUM                           0x0287
+
 #define REG_PCIE_CTRL_REG                       0x0300
-#define REG_INT_MIG                             0x0304
+#define REG_INT_MIG                                     0x0304
 #define REG_BCNQ_DESA                           0x0308
-#define REG_HQ_DESA                             0x0310
+#define REG_HQ_DESA                                     0x0310
 #define REG_MGQ_DESA                            0x0318
 #define REG_VOQ_DESA                            0x0320
 #define REG_VIQ_DESA                            0x0328
 #define REG_BEQ_DESA                            0x0330
 #define REG_BKQ_DESA                            0x0338
-#define REG_RX_DESA                             0x0340
+#define REG_RX_DESA                                     0x0340
 
-#define REG_DBI                                 0x0348
-#define REG_MDIO                                0x0354
-#define REG_DBG_SEL                             0x0360
+#define REG_DBI                                         0x0348
+#define REG_MDIO                                        0x0354
+#define REG_DBG_SEL                                     0x0360
 #define REG_PCIE_HRPWM                          0x0361
 #define REG_PCIE_HCPWM                          0x0363
 #define REG_UART_CTRL                           0x0364
@@ -181,7 +176,6 @@
 #define REG_UART_TX_DESA                        0x0370
 #define REG_UART_RX_DESA                        0x0378
 
-
 #define REG_HDAQ_DESA_NODEF                     0x0000
 #define REG_CMDQ_DESA_NODEF                     0x0000
 
@@ -191,33 +185,32 @@
 #define REG_BKQ_INFORMATION                     0x040C
 #define REG_MGQ_INFORMATION                     0x0410
 #define REG_HGQ_INFORMATION                     0x0414
-#define REG_BCNQ_INFORMATION                    0x0418
+#define REG_BCNQ_INFORMATION            0x0418
 #define REG_TXPKT_EMPTY                         0x041A
 
-
-#define REG_CPU_MGQ_INFORMATION                 0x041C
+#define REG_CPU_MGQ_INFORMATION         0x041C
 #define REG_FWHW_TXQ_CTRL                       0x0420
 #define REG_HWSEQ_CTRL                          0x0423
-#define REG_TXPKTBUF_BCNQ_BDNY                  0x0424
-#define REG_TXPKTBUF_MGQ_BDNY                   0x0425
+#define REG_TXPKTBUF_BCNQ_BDNY          0x0424
+#define REG_TXPKTBUF_MGQ_BDNY           0x0425
 #define REG_MULTI_BCNQ_EN                       0x0426
-#define REG_MULTI_BCNQ_OFFSET                   0x0427
+#define REG_MULTI_BCNQ_OFFSET           0x0427
 #define REG_SPEC_SIFS                           0x0428
-#define REG_RL                                  0x042A
-#define REG_DARFRC                              0x0430
-#define REG_RARFRC                              0x0438
-#define REG_RRSR                                0x0440
-#define REG_ARFR0                               0x0444
-#define REG_ARFR1                               0x0448
-#define REG_ARFR2                               0x044C
-#define REG_ARFR3                               0x0450
+#define REG_RL                                          0x042A
+#define REG_DARFRC                                      0x0430
+#define REG_RARFRC                                      0x0438
+#define REG_RRSR                                        0x0440
+#define REG_ARFR0                                       0x0444
+#define REG_ARFR1                                       0x0448
+#define REG_ARFR2                                       0x044C
+#define REG_ARFR3                                       0x0450
 #define REG_AGGLEN_LMT                          0x0458
 #define REG_AMPDU_MIN_SPACE                     0x045C
-#define REG_TXPKTBUF_WMAC_LBK_BF_HD             0x045D
+#define REG_TXPKTBUF_WMAC_LBK_BF_HD     0x045D
 #define REG_FAST_EDCA_CTRL                      0x0460
 #define REG_RD_RESP_PKT_TH                      0x0463
 #define REG_INIRTS_RATE_SEL                     0x0480
-#define REG_INIDATA_RATE_SEL                    0x0484
+#define REG_INIDATA_RATE_SEL            0x0484
 #define REG_POWER_STATUS                        0x04A4
 #define REG_POWER_STAGE1                        0x04B4
 #define REG_POWER_STAGE2                        0x04B8
@@ -225,32 +218,32 @@
 #define REG_STBC_SETTING                        0x04C4
 #define REG_PROT_MODE_CTRL                      0x04C8
 #define REG_BAR_MODE_CTRL                       0x04CC
-#define REG_RA_TRY_RATE_AGG_LMT                 0x04CF
-#define REG_EARLY_MODE_CONTROL                  0x04D0
+#define REG_RA_TRY_RATE_AGG_LMT         0x04CF
+#define REG_EARLY_MODE_CONTROL          0x04D0
 #define REG_NQOS_SEQ                            0x04DC
-#define REG_QOS_SEQ                             0x04DE
+#define REG_QOS_SEQ                                     0x04DE
 #define REG_NEED_CPU_HANDLE                     0x04E0
 #define REG_PKT_LOSE_RPT                        0x04E1
 #define REG_PTCL_ERR_STATUS                     0x04E2
 #define REG_TX_RPT_CTRL                         0x04EC
 #define REG_TX_RPT_TIME                         0x04F0
-#define REG_DUMMY                               0x04FC
+#define REG_DUMMY                                       0x04FC
 
 #define REG_EDCA_VO_PARAM                       0x0500
 #define REG_EDCA_VI_PARAM                       0x0504
 #define REG_EDCA_BE_PARAM                       0x0508
 #define REG_EDCA_BK_PARAM                       0x050C
-#define REG_BCNTCFG                             0x0510
-#define REG_PIFS                                0x0512
+#define REG_BCNTCFG                                     0x0510
+#define REG_PIFS                                        0x0512
 #define REG_RDG_PIFS                            0x0513
 #define REG_SIFS_CTX                            0x0514
 #define REG_SIFS_TRX                            0x0516
 #define REG_AGGR_BREAK_TIME                     0x051A
-#define REG_SLOT                                0x051B
+#define REG_SLOT                                        0x051B
 #define REG_TX_PTCL_CTRL                        0x0520
-#define REG_TXPAUSE                             0x0522
+#define REG_TXPAUSE                                     0x0522
 #define REG_DIS_TXREQ_CLR                       0x0523
-#define REG_RD_CTRL                             0x0524
+#define REG_RD_CTRL                                     0x0524
 #define REG_TBTT_PROHIBIT                       0x0540
 #define REG_RD_NAV_NXT                          0x0544
 #define REG_NAV_PROT_LEN                        0x0546
@@ -259,21 +252,21 @@
 #define REG_MBID_NUM                            0x0552
 #define REG_DUAL_TSF_RST                        0x0553
 #define REG_BCN_INTERVAL                        0x0554
-#define REG_MBSSID_BCN_SPACE                    0x0554
+#define REG_MBSSID_BCN_SPACE            0x0554
 #define REG_DRVERLYINT                          0x0558
 #define REG_BCNDMATIM                           0x0559
-#define REG_ATIMWND                             0x055A
+#define REG_ATIMWND                                     0x055A
 #define REG_BCN_MAX_ERR                         0x055D
-#define REG_RXTSF_OFFSET_CCK                    0x055E
-#define REG_RXTSF_OFFSET_OFDM                   0x055F
-#define REG_TSFTR                               0x0560
+#define REG_RXTSF_OFFSET_CCK            0x055E
+#define REG_RXTSF_OFFSET_OFDM           0x055F
+#define REG_TSFTR                                       0x0560
 #define REG_INIT_TSFTR                          0x0564
-#define REG_PSTIMER                             0x0580
-#define REG_TIMER0                              0x0584
-#define REG_TIMER1                              0x0588
+#define REG_PSTIMER                                     0x0580
+#define REG_TIMER0                                      0x0584
+#define REG_TIMER1                                      0x0588
 #define REG_ACMHWCTRL                           0x05C0
 #define REG_ACMRSTCTRL                          0x05C1
-#define REG_ACMAVG                              0x05C2
+#define REG_ACMAVG                                      0x05C2
 #define REG_VO_ADMTIME                          0x05C4
 #define REG_VI_ADMTIME                          0x05C6
 #define REG_BE_ADMTIME                          0x05C8
@@ -282,38 +275,38 @@
 
 #define REG_APSD_CTRL                           0x0600
 #define REG_BWOPMODE                            0x0603
-#define REG_TCR                                 0x0604
-#define REG_RCR                                 0x0608
+#define REG_TCR                                         0x0604
+#define REG_RCR                                         0x0608
 #define REG_RX_PKT_LIMIT                        0x060C
 #define REG_RX_DLK_TIME                         0x060D
 #define REG_RX_DRVINFO_SZ                       0x060F
 
-#define REG_MACID                               0x0610
-#define REG_BSSID                               0x0618
-#define REG_MAR                                 0x0620
+#define REG_MACID                                       0x0610
+#define REG_BSSID                                       0x0618
+#define REG_MAR                                         0x0620
 #define REG_MBIDCAMCFG                          0x0628
 
 #define REG_USTIME_EDCA                         0x0638
 #define REG_MAC_SPEC_SIFS                       0x063A
 #define REG_RESP_SIFS_CCK                       0x063C
 #define REG_RESP_SIFS_OFDM                      0x063E
-#define REG_ACKTO                               0x0640
-#define REG_CTS2TO                              0x0641
-#define REG_EIFS                                0x0642
+#define REG_ACKTO                                       0x0640
+#define REG_CTS2TO                                      0x0641
+#define REG_EIFS                                        0x0642
 
 #define REG_NAV_CTRL                            0x0650
 #define REG_BACAMCMD                            0x0654
 #define REG_BACAMCONTENT                        0x0658
-#define REG_LBDLY                               0x0660
-#define REG_FWDLY                               0x0661
+#define REG_LBDLY                                       0x0660
+#define REG_FWDLY                                       0x0661
 #define REG_RXERR_RPT                           0x0664
 #define REG_TRXPTCL_CTL                         0x0668
 
-#define REG_CAMCMD                              0x0670
+#define REG_CAMCMD                                      0x0670
 #define REG_CAMWRITE                            0x0674
-#define REG_CAMREAD                             0x0678
-#define REG_CAMDBG                              0x067C
-#define REG_SECCFG                              0x0680
+#define REG_CAMREAD                                     0x0678
+#define REG_CAMDBG                                      0x067C
+#define REG_SECCFG                                      0x0680
 
 #define REG_WOW_CTRL                            0x0690
 #define REG_PSSTATUS                            0x0691
@@ -329,10 +322,10 @@
 #define REG_CALB32K_CTRL                        0x06AC
 #define REG_PKT_MON_CTRL                        0x06B4
 #define REG_BT_COEX_TABLE                       0x06C0
-#define REG_WMAC_RESP_TXINFO                    0x06D8
+#define REG_WMAC_RESP_TXINFO            0x06D8
 
 #define REG_USB_INFO                            0xFE17
-#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_SPECIAL_OPTION          0xFE55
 #define REG_USB_DMA_AGG_TO                      0xFE5B
 #define REG_USB_AGG_TO                          0xFE5C
 #define REG_USB_AGG_TH                          0xFE5D
@@ -340,523 +333,545 @@
 #define REG_TEST_USB_TXQS                       0xFE48
 #define REG_TEST_SIE_VID                        0xFE60
 #define REG_TEST_SIE_PID                        0xFE62
-#define REG_TEST_SIE_OPTIONAL                   0xFE64
-#define REG_TEST_SIE_CHIRP_K                    0xFE65
+#define REG_TEST_SIE_OPTIONAL           0xFE64
+#define REG_TEST_SIE_CHIRP_K            0xFE65
 #define REG_TEST_SIE_PHY                        0xFE66
-#define REG_TEST_SIE_MAC_ADDR                   0xFE70
+#define REG_TEST_SIE_MAC_ADDR           0xFE70
 #define REG_TEST_SIE_STRING                     0xFE80
 
 #define REG_NORMAL_SIE_VID                      0xFE60
 #define REG_NORMAL_SIE_PID                      0xFE62
-#define REG_NORMAL_SIE_OPTIONAL                 0xFE64
+#define REG_NORMAL_SIE_OPTIONAL         0xFE64
 #define REG_NORMAL_SIE_EP                       0xFE65
 #define REG_NORMAL_SIE_PHY                      0xFE68
-#define REG_NORMAL_SIE_MAC_ADDR                 0xFE70
-#define REG_NORMAL_SIE_STRING                   0xFE80
+#define REG_NORMAL_SIE_MAC_ADDR         0xFE70
+#define REG_NORMAL_SIE_STRING           0xFE80
 
-#define CR9346                                  REG_9346CR
-#define MSR                                     (REG_CR + 2)
-#define ISR                                     REG_HISR
-#define TSFR                                    REG_TSFTR
+#define CR9346                          REG_9346CR
+#define MSR                             (REG_CR + 2)
+#define ISR                             REG_HISR
+#define TSFR                            REG_TSFTR
 
-#define MACIDR0                                 REG_MACID
-#define MACIDR4                                 (REG_MACID + 4)
+#define MACIDR0                         REG_MACID
+#define MACIDR4                         (REG_MACID + 4)
 
-#define PBP                                     REG_PBP
+#define PBP                             REG_PBP
 
-#define IDR0                                    MACIDR0
-#define IDR4                                    MACIDR4
+#define IDR0                            MACIDR0
+#define IDR4                            MACIDR4
 
-#define UNUSED_REGISTER                         0x1BF
-#define DCAM                                    UNUSED_REGISTER
-#define PSR                                     UNUSED_REGISTER
-#define BBADDR                                  UNUSED_REGISTER
-#define PHYDATAR                                UNUSED_REGISTER
+#define UNUSED_REGISTER                 0x1BF
+#define DCAM                            UNUSED_REGISTER
+#define PSR                             UNUSED_REGISTER
+#define BBADDR                          UNUSED_REGISTER
+#define PHYDATAR                        UNUSED_REGISTER
 
-#define INVALID_BBRF_VALUE                      0x12345678
+#define INVALID_BBRF_VALUE              0x12345678
 
-#define MAX_MSS_DENSITY_2T                      0x13
-#define MAX_MSS_DENSITY_1T                      0x0A
+#define MAX_MSS_DENSITY_2T              0x13
+#define MAX_MSS_DENSITY_1T              0x0A
 
-#define CMDEEPROM_EN                            BIT(5)
-#define CMDEEPROM_SEL                           BIT(4)
-#define CMD9346CR_9356SEL                       BIT(4)
-#define AUTOLOAD_EEPROM                         (CMDEEPROM_EN|CMDEEPROM_SEL)
-#define AUTOLOAD_EFUSE                          CMDEEPROM_EN
+#define CMDEEPROM_EN                    BIT(5)
+#define CMDEEPROM_SEL                   BIT(4)
+#define CMD9346CR_9356SEL               BIT(4)
+#define AUTOLOAD_EEPROM                 (CMDEEPROM_EN|CMDEEPROM_SEL)
+#define AUTOLOAD_EFUSE                  CMDEEPROM_EN
 
-#define GPIOSEL_GPIO                            0
-#define GPIOSEL_ENBT                            BIT(5)
+#define GPIOSEL_GPIO                    0
+#define GPIOSEL_ENBT                    BIT(5)
 
-#define GPIO_IN                                 REG_GPIO_PIN_CTRL
-#define GPIO_OUT                                (REG_GPIO_PIN_CTRL+1)
-#define GPIO_IO_SEL                             (REG_GPIO_PIN_CTRL+2)
-#define GPIO_MOD                                (REG_GPIO_PIN_CTRL+3)
+#define GPIO_IN                         REG_GPIO_PIN_CTRL
+#define GPIO_OUT                        (REG_GPIO_PIN_CTRL+1)
+#define GPIO_IO_SEL                     (REG_GPIO_PIN_CTRL+2)
+#define GPIO_MOD                        (REG_GPIO_PIN_CTRL+3)
 
-/* 8723/8188E Host System Interrupt Mask Register (offset 0x58, 32 byte) */
+/*8723/8188E Host System Interrupt
+ *Mask Register (offset 0x58, 32 byte)
+ */
 #define HSIMR_GPIO12_0_INT_EN                   BIT(0)
 #define HSIMR_SPS_OCP_INT_EN                    BIT(5)
 #define HSIMR_RON_INT_EN                        BIT(6)
 #define HSIMR_PDN_INT_EN                        BIT(7)
 #define HSIMR_GPIO9_INT_EN                      BIT(25)
 
-
-/* 8723/8188E Host System Interrupt Status Register (offset 0x5C, 32 byte) */
+/*       8723/8188E Host System Interrupt
+ *              Status Register (offset 0x5C, 32 byte)
+ */
 #define HSISR_GPIO12_0_INT                      BIT(0)
 #define HSISR_SPS_OCP_INT                       BIT(5)
 #define HSISR_RON_INT_EN                        BIT(6)
 #define HSISR_PDNINT                            BIT(7)
 #define HSISR_GPIO9_INT                         BIT(25)
 
-#define MSR_NOLINK                              0x00
-#define MSR_ADHOC                               0x01
-#define MSR_INFRA                               0x02
-#define MSR_AP                                  0x03
-#define MSR_MASK                                0x03
+#define MSR_NOLINK                                      0x00
+#define MSR_ADHOC                                       0x01
+#define MSR_INFRA                                       0x02
+#define MSR_AP                                          0x03
 
 #define RRSR_RSC_OFFSET                         21
 #define RRSR_SHORT_OFFSET                       23
 #define RRSR_RSC_BW_40M                         0x600000
 #define RRSR_RSC_UPSUBCHNL                      0x400000
 #define RRSR_RSC_LOWSUBCHNL                     0x200000
-#define RRSR_SHORT                              0x800000
-#define RRSR_1M                                 BIT(0)
-#define RRSR_2M                                 BIT(1)
-#define RRSR_5_5M                               BIT(2)
-#define RRSR_11M                                BIT(3)
-#define RRSR_6M                                 BIT(4)
-#define RRSR_9M                                 BIT(5)
-#define RRSR_12M                                BIT(6)
-#define RRSR_18M                                BIT(7)
-#define RRSR_24M                                BIT(8)
-#define RRSR_36M                                BIT(9)
-#define RRSR_48M                                BIT(10)
-#define RRSR_54M                                BIT(11)
-#define RRSR_MCS0                               BIT(12)
-#define RRSR_MCS1                               BIT(13)
-#define RRSR_MCS2                               BIT(14)
-#define RRSR_MCS3                               BIT(15)
-#define RRSR_MCS4                               BIT(16)
-#define RRSR_MCS5                               BIT(17)
-#define RRSR_MCS6                               BIT(18)
-#define RRSR_MCS7                               BIT(19)
+#define RRSR_SHORT                                      0x800000
+#define RRSR_1M                                         BIT(0)
+#define RRSR_2M                                         BIT(1)
+#define RRSR_5_5M                                       BIT(2)
+#define RRSR_11M                                        BIT(3)
+#define RRSR_6M                                         BIT(4)
+#define RRSR_9M                                         BIT(5)
+#define RRSR_12M                                        BIT(6)
+#define RRSR_18M                                        BIT(7)
+#define RRSR_24M                                        BIT(8)
+#define RRSR_36M                                        BIT(9)
+#define RRSR_48M                                        BIT(10)
+#define RRSR_54M                                        BIT(11)
+#define RRSR_MCS0                                       BIT(12)
+#define RRSR_MCS1                                       BIT(13)
+#define RRSR_MCS2                                       BIT(14)
+#define RRSR_MCS3                                       BIT(15)
+#define RRSR_MCS4                                       BIT(16)
+#define RRSR_MCS5                                       BIT(17)
+#define RRSR_MCS6                                       BIT(18)
+#define RRSR_MCS7                                       BIT(19)
 #define BRSR_ACKSHORTPMB                        BIT(23)
 
-#define RATR_1M                                 0x00000001
-#define RATR_2M                                 0x00000002
-#define RATR_55M                                0x00000004
-#define RATR_11M                                0x00000008
-#define RATR_6M                                 0x00000010
-#define RATR_9M                                 0x00000020
-#define RATR_12M                                0x00000040
-#define RATR_18M                                0x00000080
-#define RATR_24M                                0x00000100
-#define RATR_36M                                0x00000200
-#define RATR_48M                                0x00000400
-#define RATR_54M                                0x00000800
-#define RATR_MCS0                               0x00001000
-#define RATR_MCS1                               0x00002000
-#define RATR_MCS2                               0x00004000
-#define RATR_MCS3                               0x00008000
-#define RATR_MCS4                               0x00010000
-#define RATR_MCS5                               0x00020000
-#define RATR_MCS6                               0x00040000
-#define RATR_MCS7                               0x00080000
-#define RATR_MCS8                               0x00100000
-#define RATR_MCS9                               0x00200000
-#define RATR_MCS10                              0x00400000
-#define RATR_MCS11                              0x00800000
-#define RATR_MCS12                              0x01000000
-#define RATR_MCS13                              0x02000000
-#define RATR_MCS14                              0x04000000
-#define RATR_MCS15                              0x08000000
-
-#define RATE_1M                                 BIT(0)
-#define RATE_2M                                 BIT(1)
-#define RATE_5_5M                               BIT(2)
-#define RATE_11M                                BIT(3)
-#define RATE_6M                                 BIT(4)
-#define RATE_9M                                 BIT(5)
-#define RATE_12M                                BIT(6)
-#define RATE_18M                                BIT(7)
-#define RATE_24M                                BIT(8)
-#define RATE_36M                                BIT(9)
-#define RATE_48M                                BIT(10)
-#define RATE_54M                                BIT(11)
-#define RATE_MCS0                               BIT(12)
-#define RATE_MCS1                               BIT(13)
-#define RATE_MCS2                               BIT(14)
-#define RATE_MCS3                               BIT(15)
-#define RATE_MCS4                               BIT(16)
-#define RATE_MCS5                               BIT(17)
-#define RATE_MCS6                               BIT(18)
-#define RATE_MCS7                               BIT(19)
-#define RATE_MCS8                               BIT(20)
-#define RATE_MCS9                               BIT(21)
-#define RATE_MCS10                              BIT(22)
-#define RATE_MCS11                              BIT(23)
-#define RATE_MCS12                              BIT(24)
-#define RATE_MCS13                              BIT(25)
-#define RATE_MCS14                              BIT(26)
-#define RATE_MCS15                              BIT(27)
+#define RATR_1M                                         0x00000001
+#define RATR_2M                                         0x00000002
+#define RATR_55M                                        0x00000004
+#define RATR_11M                                        0x00000008
+#define RATR_6M                                         0x00000010
+#define RATR_9M                                         0x00000020
+#define RATR_12M                                        0x00000040
+#define RATR_18M                                        0x00000080
+#define RATR_24M                                        0x00000100
+#define RATR_36M                                        0x00000200
+#define RATR_48M                                        0x00000400
+#define RATR_54M                                        0x00000800
+#define RATR_MCS0                                       0x00001000
+#define RATR_MCS1                                       0x00002000
+#define RATR_MCS2                                       0x00004000
+#define RATR_MCS3                                       0x00008000
+#define RATR_MCS4                                       0x00010000
+#define RATR_MCS5                                       0x00020000
+#define RATR_MCS6                                       0x00040000
+#define RATR_MCS7                                       0x00080000
+#define RATR_MCS8                                       0x00100000
+#define RATR_MCS9                                       0x00200000
+#define RATR_MCS10                                      0x00400000
+#define RATR_MCS11                                      0x00800000
+#define RATR_MCS12                                      0x01000000
+#define RATR_MCS13                                      0x02000000
+#define RATR_MCS14                                      0x04000000
+#define RATR_MCS15                                      0x08000000
+
+#define RATE_1M                                         BIT(0)
+#define RATE_2M                                         BIT(1)
+#define RATE_5_5M                                       BIT(2)
+#define RATE_11M                                        BIT(3)
+#define RATE_6M                                         BIT(4)
+#define RATE_9M                                         BIT(5)
+#define RATE_12M                                        BIT(6)
+#define RATE_18M                                        BIT(7)
+#define RATE_24M                                        BIT(8)
+#define RATE_36M                                        BIT(9)
+#define RATE_48M                                        BIT(10)
+#define RATE_54M                                        BIT(11)
+#define RATE_MCS0                                       BIT(12)
+#define RATE_MCS1                                       BIT(13)
+#define RATE_MCS2                                       BIT(14)
+#define RATE_MCS3                                       BIT(15)
+#define RATE_MCS4                                       BIT(16)
+#define RATE_MCS5                                       BIT(17)
+#define RATE_MCS6                                       BIT(18)
+#define RATE_MCS7                                       BIT(19)
+#define RATE_MCS8                                       BIT(20)
+#define RATE_MCS9                                       BIT(21)
+#define RATE_MCS10                                      BIT(22)
+#define RATE_MCS11                                      BIT(23)
+#define RATE_MCS12                                      BIT(24)
+#define RATE_MCS13                                      BIT(25)
+#define RATE_MCS14                                      BIT(26)
+#define RATE_MCS15                                      BIT(27)
 
 #define RATE_ALL_CCK            (RATR_1M | RATR_2M | RATR_55M | RATR_11M)
-#define RATE_ALL_OFDM_AG        (RATR_6M | RATR_9M | RATR_12M | RATR_18M | \
+#define RATE_ALL_OFDM_AG        (RATR_6M | RATR_9M | RATR_12M | RATR_18M |\
                                 RATR_24M | RATR_36M | RATR_48M | RATR_54M)
-#define RATE_ALL_OFDM_1SS       (RATR_MCS0 | RATR_MCS1 | RATR_MCS2 | \
-                                RATR_MCS3 | RATR_MCS4 | RATR_MCS5 | \
+#define RATE_ALL_OFDM_1SS       (RATR_MCS0 | RATR_MCS1 | RATR_MCS2 |\
+                                RATR_MCS3 | RATR_MCS4 | RATR_MCS5 |\
                                 RATR_MCS6 | RATR_MCS7)
-#define RATE_ALL_OFDM_2SS       (RATR_MCS8 | RATR_MCS9 | RATR_MCS10 | \
-                                RATR_MCS11 | RATR_MCS12 | RATR_MCS13 | \
+#define RATE_ALL_OFDM_2SS       (RATR_MCS8 | RATR_MCS9 | RATR_MCS10 |\
+                                RATR_MCS11 | RATR_MCS12 | RATR_MCS13 |\
                                 RATR_MCS14 | RATR_MCS15)
 
 #define BW_OPMODE_20MHZ                         BIT(2)
 #define BW_OPMODE_5G                            BIT(1)
 #define BW_OPMODE_11J                           BIT(0)
 
-#define CAM_VALID                               BIT(15)
+#define CAM_VALID                                       BIT(15)
 #define CAM_NOTVALID                            0x0000
-#define CAM_USEDK                               BIT(5)
+#define CAM_USEDK                                       BIT(5)
 
-#define CAM_NONE                                0x0
-#define CAM_WEP40                               0x01
-#define CAM_TKIP                                0x02
-#define CAM_AES                                 0x04
-#define CAM_WEP104                              0x05
+#define CAM_NONE                                        0x0
+#define CAM_WEP40                                       0x01
+#define CAM_TKIP                                        0x02
+#define CAM_AES                                         0x04
+#define CAM_WEP104                                      0x05
 
 #define TOTAL_CAM_ENTRY                         32
 #define HALF_CAM_ENTRY                          16
 
-#define CAM_WRITE                               BIT(16)
-#define CAM_READ                                0x00000000
+#define CAM_WRITE                                       BIT(16)
+#define CAM_READ                                        0x00000000
 #define CAM_POLLINIG                            BIT(31)
 
-#define SCR_USEDK                               0x01
+#define SCR_USEDK                                       0x01
 #define SCR_TXSEC_ENABLE                        0x02
 #define SCR_RXSEC_ENABLE                        0x04
 
-#define WOW_PMEN                                BIT(0)
-#define WOW_WOMEN                               BIT(1)
-#define WOW_MAGIC                               BIT(2)
-#define WOW_UWF                                 BIT(3)
+#define WOW_PMEN                                        BIT(0)
+#define WOW_WOMEN                                       BIT(1)
+#define WOW_MAGIC                                       BIT(2)
+#define WOW_UWF                                         BIT(3)
 
 /*********************************************
 *       8188 IMR/ISR bits
 **********************************************/
-#define IMR_DISABLED                            0x0
+#define IMR_DISABLED                    0x0
 /* IMR DW0(0x0060-0063) Bit 0-31 */
-#define IMR_TXCCK               BIT(30) /* TXRPT interrupt when CCX bit of
-                                         * the packet is set
-                                         */
-#define IMR_PSTIMEOUT           BIT(29) /* Power Save Time Out Interrupt */
-#define IMR_GTINT4              BIT(28) /* When GTIMER4 expires,
-                                         * this bit is set to 1
-                                         */
-#define IMR_GTINT3              BIT(27) /* When GTIMER3 expires,
-                                         * this bit is set to 1
-                                         */
-#define IMR_TBDER               BIT(26) /* Transmit Beacon0 Error */
-#define IMR_TBDOK               BIT(25) /* Transmit Beacon0 OK  */
-#define IMR_TSF_BIT32_TOGGLE    BIT(24) /* TSF Timer BIT32 toggle ind int */
-#define IMR_BCNDMAINT0          BIT(20) /* Beacon DMA Interrupt 0 */
-#define IMR_BCNDOK0             BIT(16) /* Beacon Queue DMA OK0 */
-#define IMR_HSISR_IND_ON_INT    BIT(15) /* HSISR Indicator (HSIMR & HSISR is
-                                         * true, this bit is set to 1)
-                                         */
-#define IMR_BCNDMAINT_E         BIT(14) /* Beacon DMA Int Extension for Win7 */
-#define IMR_ATIMEND             BIT(12) /* CTWidnow End or ATIM Window End */
-#define IMR_HISR1_IND_INT       BIT(11) /* HISR1 Indicator (HISR1 & HIMR1 is
-                                         * true, this bit is set to 1)
-                                         */
-#define IMR_C2HCMD              BIT(10) /* CPU to Host Command INT Status,
-                                         * Write 1 clear
-                                         */
-#define IMR_CPWM2               BIT(9)  /* CPU power Mode exchange INT Status,
-                                         * Write 1 clear
-                                         */
-#define IMR_CPWM                BIT(8)  /* CPU power Mode exchange INT Status,
-                                         * Write 1 clear
-                                         */
-#define IMR_HIGHDOK             BIT(7)  /* High Queue DMA OK    */
-#define IMR_MGNTDOK             BIT(6)  /* Management Queue DMA OK */
-#define IMR_BKDOK               BIT(5)  /* AC_BK DMA OK         */
-#define IMR_BEDOK               BIT(4)  /* AC_BE DMA OK */
-#define IMR_VIDOK               BIT(3)  /* AC_VI DMA OK */
-#define IMR_VODOK               BIT(2)  /* AC_VO DMA OK */
-#define IMR_RDU                 BIT(1)  /* Rx Descriptor Unavailable */
-#define IMR_ROK                 BIT(0)  /* Receive DMA OK */
+/* TXRPT interrupt when CCX bit of the packet is set    */
+#define IMR_TXCCK                               BIT(30)
+/* Power Save Time Out Interrupt */
+#define IMR_PSTIMEOUT                   BIT(29)
+/* When GTIMER4 expires, this bit is set to 1   */
+#define IMR_GTINT4                              BIT(28)
+/* When GTIMER3 expires, this bit is set to 1   */
+#define IMR_GTINT3                              BIT(27)
+/* Transmit Beacon0 Error                       */
+#define IMR_TBDER                               BIT(26)
+/* Transmit Beacon0 OK                  */
+#define IMR_TBDOK                               BIT(25)
+/* TSF Timer BIT32 toggle indication interrupt  */
+#define IMR_TSF_BIT32_TOGGLE            BIT(24)
+/* Beacon DMA Interrupt 0                       */
+#define IMR_BCNDMAINT0                  BIT(20)
+/* Beacon Queue DMA OK0                 */
+#define IMR_BCNDOK0                             BIT(16)
+/* HSISR Indicator (HSIMR & HSISR is true, this bit is set to 1)        */
+#define IMR_HSISR_IND_ON_INT            BIT(15)
+/* Beacon DMA Interrupt Extension for Win7                      */
+#define IMR_BCNDMAINT_E                 BIT(14)
+/* CTWidnow End or ATIM Window End */
+#define IMR_ATIMEND                             BIT(12)
+/* HISR1 Indicator (HISR1 & HIMR1 is true, this bit is set to 1)*/
+#define IMR_HISR1_IND_INT                       BIT(11)
+/* CPU to Host Command INT Status, Write 1 clear        */
+#define IMR_C2HCMD                              BIT(10)
+/* CPU power Mode exchange INT Status, Write 1 clear    */
+#define IMR_CPWM2                       BIT(9)
+/* CPU power Mode exchange INT Status, Write 1 clear    */
+#define IMR_CPWM                                BIT(8)
+/* High Queue DMA OK    */
+#define IMR_HIGHDOK                             BIT(7)
+/* Management Queue DMA OK      */
+#define IMR_MGNTDOK                             BIT(6)
+/* AC_BK DMA OK         */
+#define IMR_BKDOK                               BIT(5)
+/* AC_BE DMA OK */
+#define IMR_BEDOK                               BIT(4)
+/* AC_VI DMA OK */
+#define IMR_VIDOK                               BIT(3)
+/* AC_VO DMA OK */
+#define IMR_VODOK                               BIT(2)
+/* Rx Descriptor Unavailable    */
+#define IMR_RDU                         BIT(1)
+/* Receive DMA OK */
+#define IMR_ROK                         BIT(0)
 
 /* IMR DW1(0x00B4-00B7) Bit 0-31 */
-#define IMR_BCNDMAINT7          BIT(27) /* Beacon DMA Interrupt 7 */
-#define IMR_BCNDMAINT6          BIT(26) /* Beacon DMA Interrupt 6 */
-#define IMR_BCNDMAINT5          BIT(25) /* Beacon DMA Interrupt 5 */
-#define IMR_BCNDMAINT4          BIT(24) /* Beacon DMA Interrupt 4 */
-#define IMR_BCNDMAINT3          BIT(23) /* Beacon DMA Interrupt 3 */
-#define IMR_BCNDMAINT2          BIT(22) /* Beacon DMA Interrupt 2 */
-#define IMR_BCNDMAINT1          BIT(21) /* Beacon DMA Interrupt 1 */
-#define IMR_BCNDOK7             BIT(20) /* Beacon Queue DMA OK Interrup 7 */
-#define IMR_BCNDOK6             BIT(19) /* Beacon Queue DMA OK Interrup 6 */
-#define IMR_BCNDOK5             BIT(18) /* Beacon Queue DMA OK Interrup 5 */
-#define IMR_BCNDOK4             BIT(17) /* Beacon Queue DMA OK Interrup 4 */
-#define IMR_BCNDOK3             BIT(16) /* Beacon Queue DMA OK Interrup 3 */
-#define IMR_BCNDOK2             BIT(15) /* Beacon Queue DMA OK Interrup 2 */
-#define IMR_BCNDOK1             BIT(14) /* Beacon Queue DMA OK Interrup 1 */
-#define IMR_ATIMEND_E           BIT(13) /* ATIM Window End Extension for Win7 */
-#define IMR_TXERR               BIT(11) /* Tx Err Flag Int Status,
-                                         * write 1 clear.
-                                         */
-#define IMR_RXERR               BIT(10) /* Rx Err Flag INT Status,
-                                         * Write 1 clear
-                                         */
-#define IMR_TXFOVW              BIT(9)  /* Transmit FIFO Overflow */
-#define IMR_RXFOVW              BIT(8)  /* Receive FIFO Overflow */
-
+/* Beacon DMA Interrupt 7       */
+#define IMR_BCNDMAINT7                  BIT(27)
+/* Beacon DMA Interrupt 6               */
+#define IMR_BCNDMAINT6                  BIT(26)
+/* Beacon DMA Interrupt 5               */
+#define IMR_BCNDMAINT5                  BIT(25)
+/* Beacon DMA Interrupt 4               */
+#define IMR_BCNDMAINT4                  BIT(24)
+/* Beacon DMA Interrupt 3               */
+#define IMR_BCNDMAINT3                  BIT(23)
+/* Beacon DMA Interrupt 2               */
+#define IMR_BCNDMAINT2                  BIT(22)
+/* Beacon DMA Interrupt 1               */
+#define IMR_BCNDMAINT1                  BIT(21)
+/* Beacon Queue DMA OK Interrup 7 */
+#define IMR_BCNDOK7                             BIT(20)
+/* Beacon Queue DMA OK Interrup 6 */
+#define IMR_BCNDOK6                             BIT(19)
+/* Beacon Queue DMA OK Interrup 5 */
+#define IMR_BCNDOK5                             BIT(18)
+/* Beacon Queue DMA OK Interrup 4 */
+#define IMR_BCNDOK4                             BIT(17)
+/* Beacon Queue DMA OK Interrup 3 */
+#define IMR_BCNDOK3                             BIT(16)
+/* Beacon Queue DMA OK Interrup 2 */
+#define IMR_BCNDOK2                             BIT(15)
+/* Beacon Queue DMA OK Interrup 1 */
+#define IMR_BCNDOK1                             BIT(14)
+/* ATIM Window End Extension for Win7 */
+#define IMR_ATIMEND_E           BIT(13)
+/* Tx Error Flag Interrupt Status, write 1 clear. */
+#define IMR_TXERR                               BIT(11)
+/* Rx Error Flag INT Status, Write 1 clear */
+#define IMR_RXERR                               BIT(10)
+/* Transmit FIFO Overflow */
+#define IMR_TXFOVW                              BIT(9)
+/* Receive FIFO Overflow */
+#define IMR_RXFOVW                              BIT(8)
 
 #define HWSET_MAX_SIZE                          512
 #define   EFUSE_MAX_SECTION                     64
-#define   EFUSE_REAL_CONTENT_LEN                256
-#define EFUSE_OOB_PROTECT_BYTES                 18 /* PG data exclude header,
-                                                    * dummy 7 bytes frome CP
-                                                    * test and reserved 1byte.
-                                                    */
-
-#define EEPROM_DEFAULT_TSSI                     0x0
-#define EEPROM_DEFAULT_TXPOWERDIFF              0x0
-#define EEPROM_DEFAULT_CRYSTALCAP               0x5
-#define EEPROM_DEFAULT_BOARDTYPE                0x02
-#define EEPROM_DEFAULT_TXPOWER                  0x1010
-#define EEPROM_DEFAULT_HT2T_TXPWR               0x10
+#define   EFUSE_REAL_CONTENT_LEN                        256
+/* PG data exclude header, dummy 7 bytes frome CP test and reserved 1byte.*/
+#define         EFUSE_OOB_PROTECT_BYTES         18
+
+#define EEPROM_DEFAULT_TSSI                                     0x0
+#define EEPROM_DEFAULT_TXPOWERDIFF                      0x0
+#define EEPROM_DEFAULT_CRYSTALCAP                       0x5
+#define EEPROM_DEFAULT_BOARDTYPE                        0x02
+#define EEPROM_DEFAULT_TXPOWER                          0x1010
+#define EEPROM_DEFAULT_HT2T_TXPWR                       0x10
 
 #define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
-#define EEPROM_DEFAULT_THERMALMETER             0x18
+#define EEPROM_DEFAULT_THERMALMETER                     0x18
 #define EEPROM_DEFAULT_ANTTXPOWERDIFF           0x0
 #define EEPROM_DEFAULT_TXPWDIFF_CRYSTALCAP      0x5
-#define EEPROM_DEFAULT_TXPOWERLEVEL             0x22
-#define EEPROM_DEFAULT_HT40_2SDIFF              0x0
-#define EEPROM_DEFAULT_HT20_DIFF                2
+#define EEPROM_DEFAULT_TXPOWERLEVEL                     0x22
+#define EEPROM_DEFAULT_HT40_2SDIFF                      0x0
+#define EEPROM_DEFAULT_HT20_DIFF                        2
 #define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
 #define EEPROM_DEFAULT_HT40_PWRMAXOFFSET        0
 #define EEPROM_DEFAULT_HT20_PWRMAXOFFSET        0
 
-#define RF_OPTION1                              0x79
-#define RF_OPTION2                              0x7A
-#define RF_OPTION3                              0x7B
-#define RF_OPTION4                              0x7C
+#define RF_OPTION1                                                      0x79
+#define RF_OPTION2                                                      0x7A
+#define RF_OPTION3                                                      0x7B
+#define RF_OPTION4                                                      0x7C
 
-#define EEPROM_DEFAULT_PID                      0x1234
-#define EEPROM_DEFAULT_VID                      0x5678
-#define EEPROM_DEFAULT_CUSTOMERID               0xAB
+#define EEPROM_DEFAULT_PID                                      0x1234
+#define EEPROM_DEFAULT_VID                                      0x5678
+#define EEPROM_DEFAULT_CUSTOMERID                       0xAB
 #define EEPROM_DEFAULT_SUBCUSTOMERID            0xCD
-#define EEPROM_DEFAULT_VERSION                  0
-
-#define EEPROM_CHANNEL_PLAN_FCC                 0x0
-#define EEPROM_CHANNEL_PLAN_IC                  0x1
-#define EEPROM_CHANNEL_PLAN_ETSI                0x2
-#define EEPROM_CHANNEL_PLAN_SPAIN               0x3
-#define EEPROM_CHANNEL_PLAN_FRANCE              0x4
-#define EEPROM_CHANNEL_PLAN_MKK                 0x5
-#define EEPROM_CHANNEL_PLAN_MKK1                0x6
-#define EEPROM_CHANNEL_PLAN_ISRAEL              0x7
-#define EEPROM_CHANNEL_PLAN_TELEC               0x8
+#define EEPROM_DEFAULT_VERSION                          0
+
+#define EEPROM_CHANNEL_PLAN_FCC                         0x0
+#define EEPROM_CHANNEL_PLAN_IC                          0x1
+#define EEPROM_CHANNEL_PLAN_ETSI                        0x2
+#define EEPROM_CHANNEL_PLAN_SPAIN                       0x3
+#define EEPROM_CHANNEL_PLAN_FRANCE                      0x4
+#define EEPROM_CHANNEL_PLAN_MKK                         0x5
+#define EEPROM_CHANNEL_PLAN_MKK1                        0x6
+#define EEPROM_CHANNEL_PLAN_ISRAEL                      0x7
+#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
-#define EEPROM_CID_TOSHIBA                      0x4
-#define EEPROM_CID_CCX                          0x10
-#define EEPROM_CID_QMI                          0x0D
-#define EEPROM_CID_WHQL                         0xFE
+#define EEPROM_CID_DEFAULT                                      0x0
+#define EEPROM_CID_TOSHIBA                                      0x4
+#define EEPROM_CID_CCX                                          0x10
+#define EEPROM_CID_QMI                                          0x0D
+#define EEPROM_CID_WHQL                                         0xFE
 
-#define RTL8188E_EEPROM_ID                      0x8129
+#define RTL8188E_EEPROM_ID                                      0x8129
 
-#define EEPROM_HPON                             0x02
-#define EEPROM_CLK                              0x06
-#define EEPROM_TESTR                            0x08
+#define EEPROM_HPON                                                     0x02
+#define EEPROM_CLK                                                      0x06
+#define EEPROM_TESTR                                            0x08
 
 #define EEPROM_TXPOWERCCK                       0x10
-#define EEPROM_TXPOWERHT40_1S                   0x16
-#define EEPROM_TXPOWERHT20DIFF                  0x1B
-#define EEPROM_TXPOWER_OFDMDIFF                 0x1B
+#define EEPROM_TXPOWERHT40_1S           0x16
+#define EEPROM_TXPOWERHT20DIFF          0x1B
+#define EEPROM_TXPOWER_OFDMDIFF         0x1B
 
-#define EEPROM_TX_PWR_INX                       0x10
+#define EEPROM_TX_PWR_INX                               0x10
 
-#define EEPROM_CHANNELPLAN                      0xB8
-#define EEPROM_XTAL_88E                         0xB9
-#define EEPROM_THERMAL_METER_88E                0xBA
-#define EEPROM_IQK_LCK_88E                      0xBB
+#define EEPROM_CHANNELPLAN                                      0xB8
+#define EEPROM_XTAL_88E                                         0xB9
+#define EEPROM_THERMAL_METER_88E                        0xBA
+#define EEPROM_IQK_LCK_88E                                      0xBB
 
-#define EEPROM_RF_BOARD_OPTION_88E              0xC1
+#define EEPROM_RF_BOARD_OPTION_88E                      0xC1
 #define EEPROM_RF_FEATURE_OPTION_88E            0xC2
-#define EEPROM_RF_BT_SETTING_88E                0xC3
-#define EEPROM_VERSION                          0xC4
-#define EEPROM_CUSTOMER_ID                      0xC5
-#define EEPROM_RF_ANTENNA_OPT_88E               0xC9
-
-#define EEPROM_MAC_ADDR                         0xD0
-#define EEPROM_VID                              0xD6
-#define EEPROM_DID                              0xD8
-#define EEPROM_SVID                             0xDA
-#define EEPROM_SMID                             0xDC
-
-#define STOPBECON                               BIT(6)
-#define STOPHIGHT                               BIT(5)
-#define STOPMGT                                 BIT(4)
-#define STOPVO                                  BIT(3)
-#define STOPVI                                  BIT(2)
-#define STOPBE                                  BIT(1)
-#define STOPBK                                  BIT(0)
-
-#define RCR_APPFCS                              BIT(31)
-#define RCR_APP_MIC                             BIT(30)
-#define RCR_APP_ICV                             BIT(29)
+#define EEPROM_RF_BT_SETTING_88E                                0xC3
+#define EEPROM_VERSION                                  0xC4
+#define EEPROM_CUSTOMER_ID                                      0xC5
+#define EEPROM_RF_ANTENNA_OPT_88E                       0xC9
+
+#define EEPROM_MAC_ADDR                                 0xD0
+#define EEPROM_VID                                                      0xD6
+#define EEPROM_DID                                                      0xD8
+#define EEPROM_SVID                                                     0xDA
+#define EEPROM_SMID                                             0xDC
+
+#define STOPBECON                                       BIT(6)
+#define STOPHIGHT                                       BIT(5)
+#define STOPMGT                                         BIT(4)
+#define STOPVO                                          BIT(3)
+#define STOPVI                                          BIT(2)
+#define STOPBE                                          BIT(1)
+#define STOPBK                                          BIT(0)
+
+#define RCR_APPFCS                                      BIT(31)
+#define RCR_APP_MIC                                     BIT(30)
+#define RCR_APP_ICV                                     BIT(29)
 #define RCR_APP_PHYST_RXFF                      BIT(28)
 #define RCR_APP_BA_SSN                          BIT(27)
-#define RCR_ENMBID                              BIT(24)
-#define RCR_LSIGEN                              BIT(23)
-#define RCR_MFBEN                               BIT(22)
+#define RCR_ENMBID                                      BIT(24)
+#define RCR_LSIGEN                                      BIT(23)
+#define RCR_MFBEN                                       BIT(22)
 #define RCR_HTC_LOC_CTRL                        BIT(14)
-#define RCR_AMF                                 BIT(13)
-#define RCR_ACF                                 BIT(12)
-#define RCR_ADF                                 BIT(11)
-#define RCR_AICV                                BIT(9)
-#define RCR_ACRC32                              BIT(8)
+#define RCR_AMF                                         BIT(13)
+#define RCR_ACF                                         BIT(12)
+#define RCR_ADF                                         BIT(11)
+#define RCR_AICV                                        BIT(9)
+#define RCR_ACRC32                                      BIT(8)
 #define RCR_CBSSID_BCN                          BIT(7)
 #define RCR_CBSSID_DATA                         BIT(6)
-#define RCR_CBSSID                              RCR_CBSSID_DATA
-#define RCR_APWRMGT                             BIT(5)
-#define RCR_ADD3                                BIT(4)
-#define RCR_AB                                  BIT(3)
-#define RCR_AM                                  BIT(2)
-#define RCR_APM                                 BIT(1)
-#define RCR_AAP                                 BIT(0)
+#define RCR_CBSSID                                      RCR_CBSSID_DATA
+#define RCR_APWRMGT                                     BIT(5)
+#define RCR_ADD3                                        BIT(4)
+#define RCR_AB                                          BIT(3)
+#define RCR_AM                                          BIT(2)
+#define RCR_APM                                         BIT(1)
+#define RCR_AAP                                         BIT(0)
 #define RCR_MXDMA_OFFSET                        8
 #define RCR_FIFO_OFFSET                         13
 
-#define RSV_CTRL                                0x001C
-#define RD_CTRL                                 0x0524
+#define RSV_CTRL                                        0x001C
+#define RD_CTRL                                         0x0524
 
 #define REG_USB_INFO                            0xFE17
-#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_SPECIAL_OPTION          0xFE55
 #define REG_USB_DMA_AGG_TO                      0xFE5B
 #define REG_USB_AGG_TO                          0xFE5C
 #define REG_USB_AGG_TH                          0xFE5D
 
-#define REG_USB_VID                             0xFE60
-#define REG_USB_PID                             0xFE62
+#define REG_USB_VID                                     0xFE60
+#define REG_USB_PID                                     0xFE62
 #define REG_USB_OPTIONAL                        0xFE64
 #define REG_USB_CHIRP_K                         0xFE65
-#define REG_USB_PHY                             0xFE66
+#define REG_USB_PHY                                     0xFE66
 #define REG_USB_MAC_ADDR                        0xFE70
 #define REG_USB_HRPWM                           0xFE58
 #define REG_USB_HCPWM                           0xFE57
 
-#define SW18_FPWM                               BIT(3)
+#define SW18_FPWM                                       BIT(3)
 
-#define ISO_MD2PP                               BIT(0)
-#define ISO_UA2USB                              BIT(1)
-#define ISO_UD2CORE                             BIT(2)
-#define ISO_PA2PCIE                             BIT(3)
-#define ISO_PD2CORE                             BIT(4)
-#define ISO_IP2MAC                              BIT(5)
-#define ISO_DIOP                                BIT(6)
-#define ISO_DIOE                                BIT(7)
-#define ISO_EB2CORE                             BIT(8)
-#define ISO_DIOR                                BIT(9)
+#define ISO_MD2PP                                       BIT(0)
+#define ISO_UA2USB                                      BIT(1)
+#define ISO_UD2CORE                                     BIT(2)
+#define ISO_PA2PCIE                                     BIT(3)
+#define ISO_PD2CORE                                     BIT(4)
+#define ISO_IP2MAC                                      BIT(5)
+#define ISO_DIOP                                        BIT(6)
+#define ISO_DIOE                                        BIT(7)
+#define ISO_EB2CORE                                     BIT(8)
+#define ISO_DIOR                                        BIT(9)
 
-#define PWC_EV25V                               BIT(14)
-#define PWC_EV12V                               BIT(15)
+#define PWC_EV25V                                       BIT(14)
+#define PWC_EV12V                                       BIT(15)
 
-#define FEN_BBRSTB                              BIT(0)
+#define FEN_BBRSTB                                      BIT(0)
 #define FEN_BB_GLB_RSTN                         BIT(1)
-#define FEN_USBA                                BIT(2)
-#define FEN_UPLL                                BIT(3)
-#define FEN_USBD                                BIT(4)
+#define FEN_USBA                                        BIT(2)
+#define FEN_UPLL                                        BIT(3)
+#define FEN_USBD                                        BIT(4)
 #define FEN_DIO_PCIE                            BIT(5)
-#define FEN_PCIEA                               BIT(6)
-#define FEN_PPLL                                BIT(7)
-#define FEN_PCIED                               BIT(8)
-#define FEN_DIOE                                BIT(9)
-#define FEN_CPUEN                               BIT(10)
-#define FEN_DCORE                               BIT(11)
-#define FEN_ELDR                                BIT(12)
-#define FEN_DIO_RF                              BIT(13)
-#define FEN_HWPDN                               BIT(14)
-#define FEN_MREGEN                              BIT(15)
-
-#define PFM_LDALL                               BIT(0)
-#define PFM_ALDN                                BIT(1)
-#define PFM_LDKP                                BIT(2)
-#define PFM_WOWL                                BIT(3)
-#define ENPDN                                   BIT(4)
-#define PDN_PL                                  BIT(5)
-#define APFM_ONMAC                              BIT(8)
-#define APFM_OFF                                BIT(9)
-#define APFM_RSM                                BIT(10)
-#define AFSM_HSUS                               BIT(11)
-#define AFSM_PCIE                               BIT(12)
-#define APDM_MAC                                BIT(13)
-#define APDM_HOST                               BIT(14)
-#define APDM_HPDN                               BIT(15)
-#define RDY_MACON                               BIT(16)
-#define SUS_HOST                                BIT(17)
-#define ROP_ALD                                 BIT(20)
-#define ROP_PWR                                 BIT(21)
-#define ROP_SPS                                 BIT(22)
-#define SOP_MRST                                BIT(25)
-#define SOP_FUSE                                BIT(26)
-#define SOP_ABG                                 BIT(27)
-#define SOP_AMB                                 BIT(28)
-#define SOP_RCK                                 BIT(29)
-#define SOP_A8M                                 BIT(30)
-#define XOP_BTCK                                BIT(31)
-
-#define ANAD16V_EN                              BIT(0)
-#define ANA8M                                   BIT(1)
-#define MACSLP                                  BIT(4)
+#define FEN_PCIEA                                       BIT(6)
+#define FEN_PPLL                                        BIT(7)
+#define FEN_PCIED                                       BIT(8)
+#define FEN_DIOE                                        BIT(9)
+#define FEN_CPUEN                                       BIT(10)
+#define FEN_DCORE                                       BIT(11)
+#define FEN_ELDR                                        BIT(12)
+#define FEN_DIO_RF                                      BIT(13)
+#define FEN_HWPDN                                       BIT(14)
+#define FEN_MREGEN                                      BIT(15)
+
+#define PFM_LDALL                                       BIT(0)
+#define PFM_ALDN                                        BIT(1)
+#define PFM_LDKP                                        BIT(2)
+#define PFM_WOWL                                        BIT(3)
+#define ENPDN                                           BIT(4)
+#define PDN_PL                                          BIT(5)
+#define APFM_ONMAC                                      BIT(8)
+#define APFM_OFF                                        BIT(9)
+#define APFM_RSM                                        BIT(10)
+#define AFSM_HSUS                                       BIT(11)
+#define AFSM_PCIE                                       BIT(12)
+#define APDM_MAC                                        BIT(13)
+#define APDM_HOST                                       BIT(14)
+#define APDM_HPDN                                       BIT(15)
+#define RDY_MACON                                       BIT(16)
+#define SUS_HOST                                        BIT(17)
+#define ROP_ALD                                         BIT(20)
+#define ROP_PWR                                         BIT(21)
+#define ROP_SPS                                         BIT(22)
+#define SOP_MRST                                        BIT(25)
+#define SOP_FUSE                                        BIT(26)
+#define SOP_ABG                                         BIT(27)
+#define SOP_AMB                                         BIT(28)
+#define SOP_RCK                                         BIT(29)
+#define SOP_A8M                                         BIT(30)
+#define XOP_BTCK                                        BIT(31)
+
+#define ANAD16V_EN                                      BIT(0)
+#define ANA8M                                           BIT(1)
+#define MACSLP                                          BIT(4)
 #define LOADER_CLK_EN                           BIT(5)
 #define _80M_SSC_DIS                            BIT(7)
 #define _80M_SSC_EN_HO                          BIT(8)
 #define PHY_SSC_RSTB                            BIT(9)
-#define SEC_CLK_EN                              BIT(10)
-#define MAC_CLK_EN                              BIT(11)
-#define SYS_CLK_EN                              BIT(12)
-#define RING_CLK_EN                             BIT(13)
+#define SEC_CLK_EN                                      BIT(10)
+#define MAC_CLK_EN                                      BIT(11)
+#define SYS_CLK_EN                                      BIT(12)
+#define RING_CLK_EN                                     BIT(13)
 
 #define BOOT_FROM_EEPROM                        BIT(4)
-#define EEPROM_EN                               BIT(5)
+#define EEPROM_EN                                       BIT(5)
 
-#define AFE_BGEN                                BIT(0)
-#define AFE_MBEN                                BIT(1)
-#define MAC_ID_EN                               BIT(7)
+#define AFE_BGEN                                        BIT(0)
+#define AFE_MBEN                                        BIT(1)
+#define MAC_ID_EN                                       BIT(7)
 
-#define WLOCK_ALL                               BIT(0)
-#define WLOCK_00                                BIT(1)
-#define WLOCK_04                                BIT(2)
-#define WLOCK_08                                BIT(3)
-#define WLOCK_40                                BIT(4)
+#define WLOCK_ALL                                       BIT(0)
+#define WLOCK_00                                        BIT(1)
+#define WLOCK_04                                        BIT(2)
+#define WLOCK_08                                        BIT(3)
+#define WLOCK_40                                        BIT(4)
 #define R_DIS_PRST_0                            BIT(5)
 #define R_DIS_PRST_1                            BIT(6)
-#define LOCK_ALL_EN                             BIT(7)
+#define LOCK_ALL_EN                                     BIT(7)
 
-#define RF_EN                                   BIT(0)
-#define RF_RSTB                                 BIT(1)
-#define RF_SDMRSTB                              BIT(2)
+#define RF_EN                                           BIT(0)
+#define RF_RSTB                                         BIT(1)
+#define RF_SDMRSTB                                      BIT(2)
 
-#define LDA15_EN                                BIT(0)
-#define LDA15_STBY                              BIT(1)
-#define LDA15_OBUF                              BIT(2)
+#define LDA15_EN                                        BIT(0)
+#define LDA15_STBY                                      BIT(1)
+#define LDA15_OBUF                                      BIT(2)
 #define LDA15_REG_VOS                           BIT(3)
 #define _LDA15_VOADJ(x)                         (((x) & 0x7) << 4)
 
-#define LDV12_EN                                BIT(0)
-#define LDV12_SDBY                              BIT(1)
-#define LPLDO_HSM                               BIT(2)
+#define LDV12_EN                                        BIT(0)
+#define LDV12_SDBY                                      BIT(1)
+#define LPLDO_HSM                                       BIT(2)
 #define LPLDO_LSM_DIS                           BIT(3)
 #define _LDV12_VADJ(x)                          (((x) & 0xF) << 4)
 
-#define XTAL_EN                                 BIT(0)
-#define XTAL_BSEL                               BIT(1)
+#define XTAL_EN                                         BIT(0)
+#define XTAL_BSEL                                       BIT(1)
 #define _XTAL_BOSC(x)                           (((x) & 0x3) << 2)
 #define _XTAL_CADJ(x)                           (((x) & 0xF) << 4)
 #define XTAL_GATE_USB                           BIT(8)
@@ -871,145 +886,145 @@
 #define _XTAL_BT_DRV(x)                         (((x) & 0x3) << 21)
 #define _XTAL_GPIO(x)                           (((x) & 0x7) << 23)
 
-#define CKDLY_AFE                               BIT(26)
-#define CKDLY_USB                               BIT(27)
-#define CKDLY_DIG                               BIT(28)
-#define CKDLY_BT                                BIT(29)
+#define CKDLY_AFE                                       BIT(26)
+#define CKDLY_USB                                       BIT(27)
+#define CKDLY_DIG                                       BIT(28)
+#define CKDLY_BT                                        BIT(29)
 
-#define APLL_EN                                 BIT(0)
-#define APLL_320_EN                             BIT(1)
+#define APLL_EN                                         BIT(0)
+#define APLL_320_EN                                     BIT(1)
 #define APLL_FREF_SEL                           BIT(2)
 #define APLL_EDGE_SEL                           BIT(3)
-#define APLL_WDOGB                              BIT(4)
-#define APLL_LPFEN                              BIT(5)
+#define APLL_WDOGB                                      BIT(4)
+#define APLL_LPFEN                                      BIT(5)
 
 #define APLL_REF_CLK_13MHZ                      0x1
-#define APLL_REF_CLK_19_2MHZ                    0x2
+#define APLL_REF_CLK_19_2MHZ            0x2
 #define APLL_REF_CLK_20MHZ                      0x3
 #define APLL_REF_CLK_25MHZ                      0x4
 #define APLL_REF_CLK_26MHZ                      0x5
-#define APLL_REF_CLK_38_4MHZ                    0x6
+#define APLL_REF_CLK_38_4MHZ            0x6
 #define APLL_REF_CLK_40MHZ                      0x7
 
-#define APLL_320EN                              BIT(14)
-#define APLL_80EN                               BIT(15)
-#define APLL_1MEN                               BIT(24)
-
-#define ALD_EN                                  BIT(18)
-#define EF_PD                                   BIT(19)
-#define EF_FLAG                                 BIT(31)
-
-#define EF_TRPT                                 BIT(7)
-#define LDOE25_EN                               BIT(31)
-
-#define RSM_EN                                  BIT(0)
-#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 SIC_SWRST                               BIT(11)
-#define ENSIC                                   BIT(12)
-#define SIC_23                                  BIT(13)
-#define ENHDP                                   BIT(14)
-#define SIC_LBK                                 BIT(15)
-
-#define LED0PL                                  BIT(4)
-#define LED1PL                                  BIT(12)
-#define LED0DIS                                 BIT(7)
-
-#define MCUFWDL_EN                              BIT(0)
-#define MCUFWDL_RDY                             BIT(1)
+#define APLL_320EN                                      BIT(14)
+#define APLL_80EN                                       BIT(15)
+#define APLL_1MEN                                       BIT(24)
+
+#define ALD_EN                                          BIT(18)
+#define EF_PD                                           BIT(19)
+#define EF_FLAG                                         BIT(31)
+
+#define EF_TRPT                                         BIT(7)
+#define LDOE25_EN                                       BIT(31)
+
+#define RSM_EN                                          BIT(0)
+#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 SIC_SWRST                                       BIT(11)
+#define ENSIC                                           BIT(12)
+#define SIC_23                                          BIT(13)
+#define ENHDP                                           BIT(14)
+#define SIC_LBK                                         BIT(15)
+
+#define LED0PL                                          BIT(4)
+#define LED1PL                                          BIT(12)
+#define LED0DIS                                         BIT(7)
+
+#define MCUFWDL_EN                                      BIT(0)
+#define MCUFWDL_RDY                                     BIT(1)
 #define FWDL_CHKSUM_RPT                         BIT(2)
-#define MACINI_RDY                              BIT(3)
-#define BBINI_RDY                               BIT(4)
-#define RFINI_RDY                               BIT(5)
-#define WINTINI_RDY                             BIT(6)
-#define CPRST                                   BIT(23)
-
-#define XCLK_VLD                                BIT(0)
-#define ACLK_VLD                                BIT(1)
-#define UCLK_VLD                                BIT(2)
-#define PCLK_VLD                                BIT(3)
-#define PCIRSTB                                 BIT(4)
-#define V15_VLD                                 BIT(5)
-#define TRP_B15V_EN                             BIT(7)
-#define SIC_IDLE                                BIT(8)
-#define BD_MAC2                                 BIT(9)
-#define BD_MAC1                                 BIT(10)
+#define MACINI_RDY                                      BIT(3)
+#define BBINI_RDY                                       BIT(4)
+#define RFINI_RDY                                       BIT(5)
+#define WINTINI_RDY                                     BIT(6)
+#define CPRST                                           BIT(23)
+
+#define XCLK_VLD                                        BIT(0)
+#define ACLK_VLD                                        BIT(1)
+#define UCLK_VLD                                        BIT(2)
+#define PCLK_VLD                                        BIT(3)
+#define PCIRSTB                                         BIT(4)
+#define V15_VLD                                         BIT(5)
+#define TRP_B15V_EN                                     BIT(7)
+#define SIC_IDLE                                        BIT(8)
+#define BD_MAC2                                         BIT(9)
+#define BD_MAC1                                         BIT(10)
 #define IC_MACPHY_MODE                          BIT(11)
-#define VENDOR_ID                               BIT(19)
+#define VENDOR_ID                                       BIT(19)
 #define PAD_HWPD_IDN                            BIT(22)
-#define TRP_VAUX_EN                             BIT(23)
-#define TRP_BT_EN                               BIT(24)
-#define BD_PKG_SEL                              BIT(25)
-#define BD_HCI_SEL                              BIT(26)
-#define TYPE_ID                                 BIT(27)
+#define TRP_VAUX_EN                                     BIT(23)
+#define TRP_BT_EN                                       BIT(24)
+#define BD_PKG_SEL                                      BIT(25)
+#define BD_HCI_SEL                                      BIT(26)
+#define TYPE_ID                                         BIT(27)
 
 #define CHIP_VER_RTL_MASK                       0xF000
 #define CHIP_VER_RTL_SHIFT                      12
 
-#define REG_LBMODE                              (REG_CR + 3)
+#define REG_LBMODE                                      (REG_CR + 3)
 
 #define HCI_TXDMA_EN                            BIT(0)
 #define HCI_RXDMA_EN                            BIT(1)
-#define TXDMA_EN                                BIT(2)
-#define RXDMA_EN                                BIT(3)
-#define PROTOCOL_EN                             BIT(4)
-#define SCHEDULE_EN                             BIT(5)
-#define MACTXEN                                 BIT(6)
-#define MACRXEN                                 BIT(7)
-#define ENSWBCN                                 BIT(8)
-#define ENSEC                                   BIT(9)
-
-#define _NETTYPE(x)                             (((x) & 0x3) << 16)
+#define TXDMA_EN                                        BIT(2)
+#define RXDMA_EN                                        BIT(3)
+#define PROTOCOL_EN                                     BIT(4)
+#define SCHEDULE_EN                                     BIT(5)
+#define MACTXEN                                         BIT(6)
+#define MACRXEN                                         BIT(7)
+#define ENSWBCN                                         BIT(8)
+#define ENSEC                                           BIT(9)
+
+#define _NETTYPE(x)                                     (((x) & 0x3) << 16)
 #define MASK_NETTYPE                            0x30000
-#define NT_NO_LINK                              0x0
+#define NT_NO_LINK                                      0x0
 #define NT_LINK_AD_HOC                          0x1
-#define NT_LINK_AP                              0x2
-#define NT_AS_AP                                0x3
+#define NT_LINK_AP                                      0x2
+#define NT_AS_AP                                        0x3
 
-#define _LBMODE(x)                              (((x) & 0xF) << 24)
-#define MASK_LBMODE                             0xF000000
+#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
 
 #define GET_RX_PAGE_SIZE(value)         ((value) & 0xF)
 #define GET_TX_PAGE_SIZE(value)         (((value) & 0xF0) >> 4)
-#define _PSRX_MASK                              0xF
-#define _PSTX_MASK                              0xF0
-#define _PSRX(x)                                (x)
-#define _PSTX(x)                                ((x) << 4)
+#define _PSRX_MASK                                      0xF
+#define _PSTX_MASK                                      0xF0
+#define _PSRX(x)                                        (x)
+#define _PSTX(x)                                        ((x) << 4)
 
-#define PBP_64                                  0x0
-#define PBP_128                                 0x1
-#define PBP_256                                 0x2
-#define PBP_512                                 0x3
-#define PBP_1024                                0x4
+#define PBP_64                                          0x0
+#define PBP_128                                         0x1
+#define PBP_256                                         0x2
+#define PBP_512                                         0x3
+#define PBP_1024                                        0x4
 
 #define RXDMA_ARBBW_EN                          BIT(0)
-#define RXSHFT_EN                               BIT(1)
+#define RXSHFT_EN                                       BIT(1)
 #define RXDMA_AGG_EN                            BIT(2)
-#define QS_VO_QUEUE                             BIT(8)
-#define QS_VI_QUEUE                             BIT(9)
-#define QS_BE_QUEUE                             BIT(10)
-#define QS_BK_QUEUE                             BIT(11)
+#define QS_VO_QUEUE                                     BIT(8)
+#define QS_VI_QUEUE                                     BIT(9)
+#define QS_BE_QUEUE                                     BIT(10)
+#define QS_BK_QUEUE                                     BIT(11)
 #define QS_MANAGER_QUEUE                        BIT(12)
 #define QS_HIGH_QUEUE                           BIT(13)
 
-#define HQSEL_VOQ                               BIT(0)
-#define HQSEL_VIQ                               BIT(1)
-#define HQSEL_BEQ                               BIT(2)
-#define HQSEL_BKQ                               BIT(3)
-#define HQSEL_MGTQ                              BIT(4)
-#define HQSEL_HIQ                               BIT(5)
+#define HQSEL_VOQ                                       BIT(0)
+#define HQSEL_VIQ                                       BIT(1)
+#define HQSEL_BEQ                                       BIT(2)
+#define HQSEL_BKQ                                       BIT(3)
+#define HQSEL_MGTQ                                      BIT(4)
+#define HQSEL_HIQ                                       BIT(5)
 
 #define _TXDMA_HIQ_MAP(x)                       (((x)&0x3) << 14)
 #define _TXDMA_MGQ_MAP(x)                       (((x)&0x3) << 12)
@@ -1018,9 +1033,9 @@
 #define _TXDMA_VIQ_MAP(x)                       (((x)&0x3) << 6)
 #define _TXDMA_VOQ_MAP(x)                       (((x)&0x3) << 4)
 
-#define QUEUE_LOW                               1
+#define QUEUE_LOW                                       1
 #define QUEUE_NORMAL                            2
-#define QUEUE_HIGH                              3
+#define QUEUE_HIGH                                      3
 
 #define _LLT_NO_ACTIVE                          0x0
 #define _LLT_WRITE_ACCESS                       0x1
@@ -1028,25 +1043,25 @@
 
 #define _LLT_INIT_DATA(x)                       ((x) & 0xFF)
 #define _LLT_INIT_ADDR(x)                       (((x) & 0xFF) << 8)
-#define _LLT_OP(x)                              (((x) & 0x3) << 30)
+#define _LLT_OP(x)                                      (((x) & 0x3) << 30)
 #define _LLT_OP_VALUE(x)                        (((x) >> 30) & 0x3)
 
 #define BB_WRITE_READ_MASK                      (BIT(31) | BIT(30))
-#define BB_WRITE_EN                             BIT(30)
-#define BB_READ_EN                              BIT(31)
+#define BB_WRITE_EN                                     BIT(30)
+#define BB_READ_EN                                      BIT(31)
 
-#define _HPQ(x)                                 ((x) & 0xFF)
-#define _LPQ(x)                                 (((x) & 0xFF) << 8)
-#define _PUBQ(x)                                (((x) & 0xFF) << 16)
-#define _NPQ(x)                                 ((x) & 0xFF)
+#define _HPQ(x)                 ((x) & 0xFF)
+#define _LPQ(x)                 (((x) & 0xFF) << 8)
+#define _PUBQ(x)                (((x) & 0xFF) << 16)
+#define _NPQ(x)                 ((x) & 0xFF)
 
-#define HPQ_PUBLIC_DIS                          BIT(24)
-#define LPQ_PUBLIC_DIS                          BIT(25)
-#define LD_RQPN                                 BIT(31)
+#define HPQ_PUBLIC_DIS          BIT(24)
+#define LPQ_PUBLIC_DIS          BIT(25)
+#define LD_RQPN                 BIT(31)
 
-#define BCN_VALID                               BIT(16)
-#define BCN_HEAD(x)                             (((x) & 0xFF) << 8)
-#define BCN_HEAD_MASK                           0xFF00
+#define BCN_VALID               BIT(16)
+#define BCN_HEAD(x)             (((x) & 0xFF) << 8)
+#define BCN_HEAD_MASK           0xFF00
 
 #define BLK_DESC_NUM_SHIFT                      4
 #define BLK_DESC_NUM_MASK                       0xF
@@ -1066,9 +1081,9 @@
 
 #define _RRSR_RSC(x)                            (((x) & 0x3) << 21)
 #define RRSR_RSC_RESERVED                       0x0
-#define RRSR_RSC_UPPER_SUBCHANNEL               0x1
-#define RRSR_RSC_LOWER_SUBCHANNEL               0x2
-#define RRSR_RSC_DUPLICATE_MODE                 0x3
+#define RRSR_RSC_UPPER_SUBCHANNEL       0x1
+#define RRSR_RSC_LOWER_SUBCHANNEL       0x2
+#define RRSR_RSC_DUPLICATE_MODE         0x3
 
 #define USE_SHORT_G1                            BIT(20)
 
@@ -1081,8 +1096,8 @@
 #define _AGGLMT_MCS6(x)                         (((x) & 0xF) << 24)
 #define _AGGLMT_MCS7(x)                         (((x) & 0xF) << 28)
 
-#define RETRY_LIMIT_SHORT_SHIFT                 8
-#define RETRY_LIMIT_LONG_SHIFT                  0
+#define RETRY_LIMIT_SHORT_SHIFT         8
+#define RETRY_LIMIT_LONG_SHIFT          0
 
 #define _DARF_RC1(x)                            ((x) & 0x1F)
 #define _DARF_RC2(x)                            (((x) & 0x1F) << 8)
@@ -1102,20 +1117,20 @@
 #define _RARF_RC7(x)                            (((x) & 0x1F) << 16)
 #define _RARF_RC8(x)                            (((x) & 0x1F) << 24)
 
-#define AC_PARAM_TXOP_LIMIT_OFFSET              16
-#define AC_PARAM_ECW_MAX_OFFSET                 12
-#define AC_PARAM_ECW_MIN_OFFSET                 8
-#define AC_PARAM_AIFS_OFFSET                    0
+#define AC_PARAM_TXOP_LIMIT_OFFSET      16
+#define AC_PARAM_ECW_MAX_OFFSET         12
+#define AC_PARAM_ECW_MIN_OFFSET         8
+#define AC_PARAM_AIFS_OFFSET            0
 
-#define _AIFS(x)                                (x)
+#define _AIFS(x)                                        (x)
 #define _ECW_MAX_MIN(x)                         ((x) << 8)
 #define _TXOP_LIMIT(x)                          ((x) << 16)
 
-#define _BCNIFS(x)                              ((x) & 0xFF)
-#define _BCNECW(x)                              ((((x) & 0xF)) << 8)
+#define _BCNIFS(x)                                      ((x) & 0xFF)
+#define _BCNECW(x)                                      ((((x) & 0xF)) << 8)
 
-#define _LRL(x)                                 ((x) & 0x3F)
-#define _SRL(x)                                 (((x) & 0x3F) << 8)
+#define _LRL(x)                                         ((x) & 0x3F)
+#define _SRL(x)                                         (((x) & 0x3F) << 8)
 
 #define _SIFS_CCK_CTX(x)                        ((x) & 0xFF)
 #define _SIFS_CCK_TRX(x)                        (((x) & 0xFF) << 8);
@@ -1123,102 +1138,102 @@
 #define _SIFS_OFDM_CTX(x)                       ((x) & 0xFF)
 #define _SIFS_OFDM_TRX(x)                       (((x) & 0xFF) << 8);
 
-#define _TBTT_PROHIBIT_HOLD(x)                  (((x) & 0xFF) << 8)
+#define _TBTT_PROHIBIT_HOLD(x)          (((x) & 0xFF) << 8)
 
 #define DIS_EDCA_CNT_DWN                        BIT(11)
 
-#define EN_MBSSID                               BIT(1)
+#define EN_MBSSID                                       BIT(1)
 #define EN_TXBCN_RPT                            BIT(2)
 #define EN_BCN_FUNCTION                         BIT(3)
 
-#define TSFTR_RST                               BIT(0)
-#define TSFTR1_RST                              BIT(1)
+#define TSFTR_RST                                       BIT(0)
+#define TSFTR1_RST                                      BIT(1)
 
-#define STOP_BCNQ                               BIT(6)
+#define STOP_BCNQ                                       BIT(6)
 
-#define DIS_TSF_UDT0_NORMAL_CHIP                BIT(4)
-#define DIS_TSF_UDT0_TEST_CHIP                  BIT(5)
+#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_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                                         BIT(6)
 #define APSDOFF_STATUS                          BIT(7)
 
-#define BW_20MHZ                                BIT(2)
+#define BW_20MHZ                                        BIT(2)
 
 #define RATE_BITMAP_ALL                         0xFFFFF
 
-#define RATE_RRSR_CCK_ONLY_1M                   0xFFFF1
+#define RATE_RRSR_CCK_ONLY_1M           0xFFFF1
 
-#define TSFRST                                  BIT(0)
-#define DIS_GCLK                                BIT(1)
-#define PAD_SEL                                 BIT(2)
-#define PWR_ST                                  BIT(6)
+#define TSFRST                                          BIT(0)
+#define DIS_GCLK                                        BIT(1)
+#define PAD_SEL                                         BIT(2)
+#define PWR_ST                                          BIT(6)
 #define PWRBIT_OW_EN                            BIT(7)
-#define ACRC                                    BIT(8)
-#define CFENDFORM                               BIT(9)
-#define ICV                                     BIT(10)
-
-#define AAP                                     BIT(0)
-#define APM                                     BIT(1)
-#define AM                                      BIT(2)
-#define AB                                      BIT(3)
-#define ADD3                                    BIT(4)
-#define APWRMGT                                 BIT(5)
-#define CBSSID                                  BIT(6)
-#define CBSSID_DATA                             BIT(6)
-#define CBSSID_BCN                              BIT(7)
-#define ACRC32                                  BIT(8)
-#define AICV                                    BIT(9)
-#define ADF                                     BIT(11)
-#define ACF                                     BIT(12)
-#define AMF                                     BIT(13)
+#define ACRC                                            BIT(8)
+#define CFENDFORM                                       BIT(9)
+#define ICV                                                     BIT(10)
+
+#define AAP                                                     BIT(0)
+#define APM                                                     BIT(1)
+#define AM                                                      BIT(2)
+#define AB                                                      BIT(3)
+#define ADD3                                            BIT(4)
+#define APWRMGT                                         BIT(5)
+#define CBSSID                                          BIT(6)
+#define CBSSID_DATA                                     BIT(6)
+#define CBSSID_BCN                                      BIT(7)
+#define ACRC32                                          BIT(8)
+#define AICV                                            BIT(9)
+#define ADF                                                     BIT(11)
+#define ACF                                                     BIT(12)
+#define AMF                                                     BIT(13)
 #define HTC_LOC_CTRL                            BIT(14)
-#define UC_DATA_EN                              BIT(16)
-#define BM_DATA_EN                              BIT(17)
-#define MFBEN                                   BIT(22)
-#define LSIGEN                                  BIT(23)
-#define ENMBID                                  BIT(24)
-#define APP_BASSN                               BIT(27)
-#define APP_PHYSTS                              BIT(28)
-#define APP_ICV                                 BIT(29)
-#define APP_MIC                                 BIT(30)
-#define APP_FCS                                 BIT(31)
+#define UC_DATA_EN                                      BIT(16)
+#define BM_DATA_EN                                      BIT(17)
+#define MFBEN                                           BIT(22)
+#define LSIGEN                                          BIT(23)
+#define ENMBID                                          BIT(24)
+#define APP_BASSN                                       BIT(27)
+#define APP_PHYSTS                                      BIT(28)
+#define APP_ICV                                         BIT(29)
+#define APP_MIC                                         BIT(30)
+#define APP_FCS                                         BIT(31)
 
 #define _MIN_SPACE(x)                           ((x) & 0x7)
-#define _SHORT_GI_PADDING(x)                    (((x) & 0x1F) << 3)
+#define _SHORT_GI_PADDING(x)            (((x) & 0x1F) << 3)
 
-#define RXERR_TYPE_OFDM_PPDU                    0
-#define RXERR_TYPE_OFDM_FALSE_ALARM             1
-#define RXERR_TYPE_OFDM_MPDU_OK                 2
-#define RXERR_TYPE_OFDM_MPDU_FAIL               3
+#define RXERR_TYPE_OFDM_PPDU            0
+#define RXERR_TYPE_OFDM_FALSE_ALARM     1
+#define RXERR_TYPE_OFDM_MPDU_OK         2
+#define RXERR_TYPE_OFDM_MPDU_FAIL       3
 #define RXERR_TYPE_CCK_PPDU                     4
-#define RXERR_TYPE_CCK_FALSE_ALARM              5
-#define RXERR_TYPE_CCK_MPDU_OK                  6
-#define RXERR_TYPE_CCK_MPDU_FAIL                7
+#define RXERR_TYPE_CCK_FALSE_ALARM      5
+#define RXERR_TYPE_CCK_MPDU_OK          6
+#define RXERR_TYPE_CCK_MPDU_FAIL        7
 #define RXERR_TYPE_HT_PPDU                      8
-#define RXERR_TYPE_HT_FALSE_ALARM               9
-#define RXERR_TYPE_HT_MPDU_TOTAL                10
-#define RXERR_TYPE_HT_MPDU_OK                   11
-#define RXERR_TYPE_HT_MPDU_FAIL                 12
-#define RXERR_TYPE_RX_FULL_DROP                 15
+#define RXERR_TYPE_HT_FALSE_ALARM       9
+#define RXERR_TYPE_HT_MPDU_TOTAL        10
+#define RXERR_TYPE_HT_MPDU_OK           11
+#define RXERR_TYPE_HT_MPDU_FAIL         12
+#define RXERR_TYPE_RX_FULL_DROP         15
 
 #define RXERR_COUNTER_MASK                      0xFFFFF
 #define RXERR_RPT_RST                           BIT(27)
-#define _RXERR_RPT_SEL(type)                    ((type) << 28)
+#define _RXERR_RPT_SEL(type)            ((type) << 28)
 
-#define SCR_TXUSEDK                             BIT(0)
-#define SCR_RXUSEDK                             BIT(1)
+#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_SKBYA2                                      BIT(4)
+#define SCR_NOSKMC                                      BIT(5)
 #define SCR_TXBCUSEDK                           BIT(6)
 #define SCR_RXBCUSEDK                           BIT(7)
 
@@ -1226,32 +1241,32 @@
 #define USB_IS_FULL_SPEED                       1
 #define USB_SPEED_MASK                          BIT(5)
 
-#define USB_NORMAL_SIE_EP_MASK                  0xF
-#define USB_NORMAL_SIE_EP_SHIFT                 4
+#define USB_NORMAL_SIE_EP_MASK          0xF
+#define USB_NORMAL_SIE_EP_SHIFT         4
 
 #define USB_TEST_EP_MASK                        0x30
 #define USB_TEST_EP_SHIFT                       4
 
-#define USB_AGG_EN                              BIT(3)
+#define USB_AGG_EN                                      BIT(3)
 
 #define MAC_ADDR_LEN                            6
-#define LAST_ENTRY_OF_TX_PKT_BUFFER             175/*255    88e*/
+#define LAST_ENTRY_OF_TX_PKT_BUFFER     175/*255    88e*/
 
-#define POLLING_LLT_THRESHOLD                   20
+#define POLLING_LLT_THRESHOLD           20
 #define POLLING_READY_TIMEOUT_COUNT             3000
 
 #define MAX_MSS_DENSITY_2T                      0x13
 #define MAX_MSS_DENSITY_1T                      0x0A
 
-#define EPROM_CMD_OPERATING_MODE_MASK           ((1<<7)|(1<<6))
+#define EPROM_CMD_OPERATING_MODE_MASK   ((1<<7)|(1<<6))
 #define EPROM_CMD_CONFIG                        0x3
 #define EPROM_CMD_LOAD                          1
 
 #define HWSET_MAX_SIZE_92S                      HWSET_MAX_SIZE
 
-#define HAL_8192C_HW_GPIO_WPS_BIT               BIT(2)
+#define HAL_8192C_HW_GPIO_WPS_BIT       BIT(2)
 
-#define RPMAC_RESET                             0x100
+#define RPMAC_RESET                                     0x100
 #define RPMAC_TXSTART                           0x104
 #define RPMAC_TXLEGACYSIG                       0x108
 #define RPMAC_TXHTSIG1                          0x10c
@@ -1267,12 +1282,12 @@
 #define RPMAC_TXMACHEADER5                      0x134
 #define RPMAC_TXDADATYPE                        0x138
 #define RPMAC_TXRANDOMSEED                      0x13c
-#define RPMAC_CCKPLCPPREAMBLE                   0x140
+#define RPMAC_CCKPLCPPREAMBLE           0x140
 #define RPMAC_CCKPLCPHEADER                     0x144
 #define RPMAC_CCKCRC16                          0x148
 #define RPMAC_OFDMRXCRC32OK                     0x170
-#define RPMAC_OFDMRXCRC32Er                     0x174
-#define RPMAC_OFDMRXPARITYER                    0x178
+#define RPMAC_OFDMRXCRC32ER                     0x174
+#define RPMAC_OFDMRXPARITYER            0x178
 #define RPMAC_OFDMRXCRC8ER                      0x17c
 #define RPMAC_CCKCRXRC16ER                      0x180
 #define RPMAC_CCKCRXRC32ER                      0x184
@@ -1289,45 +1304,45 @@
 #define RFPGA0_RFTIMING1                        0x810
 #define RFPGA0_RFTIMING2                        0x814
 
-#define RFPGA0_XA_HSSIPARAMETER1                0x820
-#define RFPGA0_XA_HSSIPARAMETER2                0x824
-#define RFPGA0_XB_HSSIPARAMETER1                0x828
-#define RFPGA0_XB_HSSIPARAMETER2                0x82c
+#define RFPGA0_XA_HSSIPARAMETER1        0x820
+#define RFPGA0_XA_HSSIPARAMETER2        0x824
+#define RFPGA0_XB_HSSIPARAMETER1        0x828
+#define RFPGA0_XB_HSSIPARAMETER2        0x82c
 
-#define RFPGA0_XA_LSSIPARAMETER                 0x840
-#define RFPGA0_XB_LSSIPARAMETER                 0x844
+#define RFPGA0_XA_LSSIPARAMETER         0x840
+#define RFPGA0_XB_LSSIPARAMETER         0x844
 
-#define RFPGA0_RFWAKEUPPARAMETER                0x850
-#define RFPGA0_RFSLEEPUPPARAMETER               0x854
+#define RFPGA0_RFWAKEUPPARAMETER        0x850
+#define RFPGA0_RFSLEEPUPPARAMETER       0x854
 
-#define RFPGA0_XAB_SWITCHCONTROL                0x858
-#define RFPGA0_XCD_SWITCHCONTROL                0x85c
+#define RFPGA0_XAB_SWITCHCONTROL        0x858
+#define RFPGA0_XCD_SWITCHCONTROL        0x85c
 
-#define RFPGA0_XA_RFINTERFACEOE                 0x860
-#define RFPGA0_XB_RFINTERFACEOE                 0x864
+#define RFPGA0_XA_RFINTERFACEOE         0x860
+#define RFPGA0_XB_RFINTERFACEOE         0x864
 
-#define RFPGA0_XAB_RFINTERFACESW                0x870
-#define RFPGA0_XCD_RFINTERFACESW                0x874
+#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
-#define RFPGA0_ANALOGPARAMETER3                 0x888
-#define RFPGA0_ANALOGPARAMETER4                 0x88c
+#define RFPGA0_ANALOGPARAMETER1         0x880
+#define RFPGA0_ANALOGPARAMETER2         0x884
+#define RFPGA0_ANALOGPARAMETER3         0x888
+#define RFPGA0_ANALOGPARAMETER4         0x88c
 
-#define RFPGA0_XA_LSSIREADBACK                  0x8a0
-#define RFPGA0_XB_LSSIREADBACK                  0x8a4
-#define RFPGA0_XC_LSSIREADBACK                  0x8a8
-#define RFPGA0_XD_LSSIREADBACK                  0x8ac
+#define RFPGA0_XA_LSSIREADBACK          0x8a0
+#define RFPGA0_XB_LSSIREADBACK          0x8a4
+#define RFPGA0_XC_LSSIREADBACK          0x8a8
+#define RFPGA0_XD_LSSIREADBACK          0x8ac
 
 #define RFPGA0_PSDREPORT                        0x8b4
-#define TRANSCEIVEA_HSPI_READBACK               0x8b8
-#define TRANSCEIVEB_HSPI_READBACK               0x8bc
-#define REG_SC_CNT                              0x8c4
-#define RFPGA0_XAB_RFINTERFACERB                0x8e0
-#define RFPGA0_XCD_RFINTERFACERB                0x8e4
+#define TRANSCEIVEA_HSPI_READBACK       0x8b8
+#define TRANSCEIVEB_HSPI_READBACK       0x8bc
+#define REG_SC_CNT                                              0x8c4
+#define RFPGA0_XAB_RFINTERFACERB        0x8e0
+#define RFPGA0_XCD_RFINTERFACERB        0x8e4
 
 #define RFPGA1_RFMOD                            0x900
 
@@ -1338,12 +1353,12 @@
 #define RCCK0_SYSTEM                            0xa00
 
 #define RCCK0_AFESETTING                        0xa04
-#define RCCK0_CCA                               0xa08
+#define RCCK0_CCA                                       0xa08
 
 #define RCCK0_RXAGC1                            0xa0c
 #define RCCK0_RXAGC2                            0xa10
 
-#define RCCK0_RXHP                              0xa14
+#define RCCK0_RXHP                                      0xa14
 
 #define RCCK0_DSPPARAMETER1                     0xa18
 #define RCCK0_DSPPARAMETER2                     0xa1c
@@ -1351,75 +1366,74 @@
 #define RCCK0_TXFILTER1                         0xa20
 #define RCCK0_TXFILTER2                         0xa24
 #define RCCK0_DEBUGPORT                         0xa28
-#define RCCK0_FALSEALARMREPORT                  0xa2c
-#define RCCK0_TRSSIREPORT                       0xa50
-#define RCCK0_RXREPORT                          0xa54
-#define RCCK0_FACOUNTERLOWER                    0xa5c
-#define RCCK0_FACOUNTERUPPER                    0xa58
-#define RCCK0_CCA_CNT                           0xa60
-
+#define RCCK0_FALSEALARMREPORT          0xa2c
+#define RCCK0_TRSSIREPORT               0xa50
+#define RCCK0_RXREPORT                  0xa54
+#define RCCK0_FACOUNTERLOWER            0xa5c
+#define RCCK0_FACOUNTERUPPER            0xa58
+#define RCCK0_CCA_CNT                   0xa60
 
 /* PageB(0xB00) */
-#define RPDP_ANTA                               0xb00
+#define RPDP_ANTA                                       0xb00
 #define RPDP_ANTA_4                             0xb04
 #define RPDP_ANTA_8                             0xb08
 #define RPDP_ANTA_C                             0xb0c
-#define RPDP_ANTA_10                            0xb10
-#define RPDP_ANTA_14                            0xb14
-#define RPDP_ANTA_18                            0xb18
-#define RPDP_ANTA_1C                            0xb1c
-#define RPDP_ANTA_20                            0xb20
-#define RPDP_ANTA_24                            0xb24
+#define RPDP_ANTA_10                                    0xb10
+#define RPDP_ANTA_14                                    0xb14
+#define RPDP_ANTA_18                                    0xb18
+#define RPDP_ANTA_1C                                    0xb1c
+#define RPDP_ANTA_20                                    0xb20
+#define RPDP_ANTA_24                                    0xb24
 
 #define RCONFIG_PMPD_ANTA                       0xb28
-#define RCONFIG_RAM64X16                        0xb2c
+#define RCONFIG_RAM64x16                                0xb2c
 
-#define RBNDA                                   0xb30
-#define RHSSIPAR                                0xb34
+#define RBNDA                                           0xb30
+#define RHSSIPAR                                                0xb34
 
-#define RCONFIG_ANTA                            0xb68
-#define RCONFIG_ANTB                            0xb6c
+#define RCONFIG_ANTA                                    0xb68
+#define RCONFIG_ANTB                                    0xb6c
 
-#define RPDP_ANTB                               0xb70
-#define RPDP_ANTB_4                             0xb74
-#define RPDP_ANTB_8                             0xb78
-#define RPDP_ANTB_C                             0xb7c
-#define RPDP_ANTB_10                            0xb80
-#define RPDP_ANTB_14                            0xb84
-#define RPDP_ANTB_18                            0xb88
-#define RPDP_ANTB_1C                            0xb8c
-#define RPDP_ANTB_20                            0xb90
-#define RPDP_ANTB_24                            0xb94
+#define RPDP_ANTB                                       0xb70
+#define RPDP_ANTB_4                                     0xb74
+#define RPDP_ANTB_8                                     0xb78
+#define RPDP_ANTB_C                                     0xb7c
+#define RPDP_ANTB_10                                    0xb80
+#define RPDP_ANTB_14                                    0xb84
+#define RPDP_ANTB_18                                    0xb88
+#define RPDP_ANTB_1C                                    0xb8c
+#define RPDP_ANTB_20                                    0xb90
+#define RPDP_ANTB_24                                    0xb94
 
 #define RCONFIG_PMPD_ANTB                       0xb98
 
-#define RBNDB                                   0xba0
+#define RBNDB                                           0xba0
 
-#define RAPK                                    0xbd8
-#define rPm_Rx0_AntA                            0xbdc
-#define rPm_Rx1_AntA                            0xbe0
-#define rPm_Rx2_AntA                            0xbe4
-#define rPm_Rx3_AntA                            0xbe8
-#define rPm_Rx0_AntB                            0xbec
-#define rPm_Rx1_AntB                            0xbf0
-#define rPm_Rx2_AntB                            0xbf4
-#define rPm_Rx3_AntB                            0xbf8
+#define RAPK                                                    0xbd8
+#define RPM_RX0_ANTA                            0xbdc
+#define RPM_RX1_ANTA                            0xbe0
+#define RPM_RX2_ANTA                            0xbe4
+#define RPM_RX3_ANTA                            0xbe8
+#define RPM_RX0_ANTB                            0xbec
+#define RPM_RX1_ANTB                            0xbf0
+#define RPM_RX2_ANTB                            0xbf4
+#define RPM_RX3_ANTB                            0xbf8
 
 /*Page C*/
-#define ROFDM0_LSTF                             0xc00
+#define ROFDM0_LSTF                                     0xc00
 
-#define ROFDM0_TRXPATHENABLE                    0xc04
+#define ROFDM0_TRXPATHENABLE            0xc04
 #define ROFDM0_TRMUXPAR                         0xc08
-#define ROFDM0_TRSWISOLATION                    0xc0c
+#define ROFDM0_TRSWISOLATION            0xc0c
 
 #define ROFDM0_XARXAFE                          0xc10
-#define ROFDM0_XARXIQIMBAL                      0xc14
-#define ROFDM0_XBRXAFE                          0xc18
-#define ROFDM0_XBRXIQIMBAL                      0xc1c
-#define ROFDM0_XCRXAFE                          0xc20
-#define ROFDM0_XCRXIQIMBAL                      0xc24
-#define ROFDM0_XDRXAFE                          0xc28
-#define ROFDM0_XDRXIQIMBAL                      0xc2c
+#define ROFDM0_XARXIQIMBALANCE          0xc14
+#define ROFDM0_XBRXAFE                  0xc18
+#define ROFDM0_XBRXIQIMBALANCE          0xc1c
+#define ROFDM0_XCRXAFE                  0xc20
+#define ROFDM0_XCRXIQIMBANLANCE         0xc24
+#define ROFDM0_XDRXAFE                  0xc28
+#define ROFDM0_XDRXIQIMBALANCE          0xc2c
 
 #define ROFDM0_RXDETECTOR1                      0xc30
 #define ROFDM0_RXDETECTOR2                      0xc34
@@ -1428,8 +1442,8 @@
 
 #define ROFDM0_RXDSP                            0xc40
 #define ROFDM0_CFOANDDAGC                       0xc44
-#define ROFDM0_CCADROPTHRES                     0xc48
-#define ROFDM0_ECCATHRES                        0xc4c
+#define ROFDM0_CCADROPTHRESHOLD         0xc48
+#define ROFDM0_ECCATHRESHOLD            0xc4c
 
 #define ROFDM0_XAAGCCORE1                       0xc50
 #define ROFDM0_XAAGCCORE2                       0xc54
@@ -1440,18 +1454,18 @@
 #define ROFDM0_XDAGCCORE1                       0xc68
 #define ROFDM0_XDAGCCORE2                       0xc6c
 
-#define ROFDM0_AGCPARAMETER1                    0xc70
-#define ROFDM0_AGCPARAMETER2                    0xc74
+#define ROFDM0_AGCPARAMETER1            0xc70
+#define ROFDM0_AGCPARAMETER2            0xc74
 #define ROFDM0_AGCRSSITABLE                     0xc78
 #define ROFDM0_HTSTFAGC                         0xc7c
 
-#define ROFDM0_XATXIQIMBAL                      0xc80
+#define ROFDM0_XATXIQIMBALANCE          0xc80
 #define ROFDM0_XATXAFE                          0xc84
-#define ROFDM0_XBTXIQIMBAL                      0xc88
+#define ROFDM0_XBTXIQIMBALANCE          0xc88
 #define ROFDM0_XBTXAFE                          0xc8c
-#define ROFDM0_XCTXIQIMBAL                      0xc90
-#define ROFDM0_XCTXAFE                          0xc94
-#define ROFDM0_XDTXIQIMBAL                      0xc98
+#define ROFDM0_XCTXIQIMBALANCE          0xc90
+#define ROFDM0_XCTXAFE                  0xc94
+#define ROFDM0_XDTXIQIMBALANCE          0xc98
 #define ROFDM0_XDTXAFE                          0xc9c
 
 #define ROFDM0_RXIQEXTANTA                      0xca0
@@ -1462,25 +1476,24 @@
 #define ROFDM0_TXCOEFF5                         0xcb4
 #define ROFDM0_TXCOEFF6                         0xcb8
 
-#define ROFDM0_RXHPPARAMETER                    0xce0
-#define ROFDM0_TXPSEUDONOISEWGT                 0xce4
+#define ROFDM0_RXHPPARAMETER            0xce0
+#define ROFDM0_TXPSEUDONOISEWGT         0xce4
 #define ROFDM0_FRAMESYNC                        0xcf0
 #define ROFDM0_DFSREPORT                        0xcf4
 
+#define ROFDM1_LSTF                                     0xd00
+#define ROFDM1_TRXPATHENABLE            0xd04
 
-#define ROFDM1_LSTF                             0xd00
-#define ROFDM1_TRXPATHENABLE                    0xd04
-
-#define ROFDM1_CF0                              0xd08
-#define ROFDM1_CSI1                             0xd10
-#define ROFDM1_SBD                              0xd14
-#define ROFDM1_CSI2                             0xd18
+#define ROFDM1_CF0                                      0xd08
+#define ROFDM1_CSI1                                     0xd10
+#define ROFDM1_SBD                                      0xd14
+#define ROFDM1_CSI2                                     0xd18
 #define ROFDM1_CFOTRACKING                      0xd2c
 #define ROFDM1_TRXMESAURE1                      0xd34
 #define ROFDM1_INTFDET                          0xd3c
-#define ROFDM1_PSEUDONOISESTATEAB               0xd50
-#define ROFDM1_PSEUDONOISESTATECD               0xd54
-#define ROFDM1_RXPSEUDONOISEWGT                 0xd58
+#define ROFDM1_PSEUDONOISESTATEAB       0xd50
+#define ROFDM1_PSEUDONOISESTATECD       0xd54
+#define ROFDM1_RXPSEUDONOISEWGT         0xd58
 
 #define ROFDM_PHYCOUNTER1                       0xda0
 #define ROFDM_PHYCOUNTER2                       0xda4
@@ -1492,84 +1505,84 @@
 #define ROFDM_LONGCFOCD                         0xdb8
 #define ROFDM_TAILCF0AB                         0xdbc
 #define ROFDM_TAILCF0CD                         0xdc0
-#define ROFDM_PWMEASURE1                        0xdc4
-#define ROFDM_PWMEASURE2                        0xdc8
+#define ROFDM_PWMEASURE1                0xdc4
+#define ROFDM_PWMEASURE2                0xdc8
 #define ROFDM_BWREPORT                          0xdcc
 #define ROFDM_AGCREPORT                         0xdd0
-#define ROFDM_RXSNR                             0xdd4
+#define ROFDM_RXSNR                                     0xdd4
 #define ROFDM_RXEVMCSI                          0xdd8
 #define ROFDM_SIGREPORT                         0xddc
 
 #define RTXAGC_A_RATE18_06                      0xe00
 #define RTXAGC_A_RATE54_24                      0xe04
 #define RTXAGC_A_CCK1_MCS32                     0xe08
-#define RTXAGC_A_MCS03_MCS00                    0xe10
-#define RTXAGC_A_MCS07_MCS04                    0xe14
-#define RTXAGC_A_MCS11_MCS08                    0xe18
-#define RTXAGC_A_MCS15_MCS12                    0xe1c
+#define RTXAGC_A_MCS03_MCS00            0xe10
+#define RTXAGC_A_MCS07_MCS04            0xe14
+#define RTXAGC_A_MCS11_MCS08            0xe18
+#define RTXAGC_A_MCS15_MCS12            0xe1c
 
 #define RTXAGC_B_RATE18_06                      0x830
 #define RTXAGC_B_RATE54_24                      0x834
-#define RTXAGC_B_CCK1_55_MCS32                  0x838
-#define RTXAGC_B_MCS03_MCS00                    0x83c
-#define RTXAGC_B_MCS07_MCS04                    0x848
-#define RTXAGC_B_MCS11_MCS08                    0x84c
-#define RTXAGC_B_MCS15_MCS12                    0x868
-#define RTXAGC_B_CCK11_A_CCK2_11                0x86c
-
-#define RFPGA0_IQK                              0xe28
+#define RTXAGC_B_CCK1_55_MCS32          0x838
+#define RTXAGC_B_MCS03_MCS00            0x83c
+#define RTXAGC_B_MCS07_MCS04            0x848
+#define RTXAGC_B_MCS11_MCS08            0x84c
+#define RTXAGC_B_MCS15_MCS12            0x868
+#define RTXAGC_B_CCK11_A_CCK2_11        0x86c
+
+#define RFPGA0_IQK                                      0xe28
 #define RTX_IQK_TONE_A                          0xe30
 #define RRX_IQK_TONE_A                          0xe34
-#define RTX_IQK_PI_A                            0xe38
-#define RRX_IQK_PI_A                            0xe3c
+#define RTX_IQK_PI_A                                    0xe38
+#define RRX_IQK_PI_A                                    0xe3c
 
-#define RTX_IQK                                 0xe40
-#define RRX_IQK                                 0xe44
-#define RIQK_AGC_PTS                            0xe48
-#define RIQK_AGC_RSP                            0xe4c
+#define RTX_IQK                                                 0xe40
+#define RRX_IQK                                         0xe44
+#define RIQK_AGC_PTS                                    0xe48
+#define RIQK_AGC_RSP                                    0xe4c
 #define RTX_IQK_TONE_B                          0xe50
 #define RRX_IQK_TONE_B                          0xe54
-#define RTX_IQK_PI_B                            0xe58
-#define RRX_IQK_PI_B                            0xe5c
+#define RTX_IQK_PI_B                                    0xe58
+#define RRX_IQK_PI_B                                    0xe5c
 #define RIQK_AGC_CONT                           0xe60
 
-#define RBLUE_TOOTH                             0xe6c
-#define RRX_WAIT_CCA                            0xe70
-#define RTX_CCK_RFON                            0xe74
+#define RBLUE_TOOTH                                     0xe6c
+#define RRX_WAIT_CCA                                    0xe70
+#define RTX_CCK_RFON                                    0xe74
 #define RTX_CCK_BBON                            0xe78
 #define RTX_OFDM_RFON                           0xe7c
 #define RTX_OFDM_BBON                           0xe80
-#define RTX_TO_RX                               0xe84
-#define RTX_TO_TX                               0xe88
-#define RRX_CCK                                 0xe8c
+#define RTX_TO_RX                                       0xe84
+#define RTX_TO_TX                                       0xe88
+#define RRX_CCK                                         0xe8c
 
-#define RTX_POWER_BEFORE_IQK_A                  0xe94
+#define RTX_POWER_BEFORE_IQK_A          0xe94
 #define RTX_POWER_AFTER_IQK_A                   0xe9c
 
-#define RRX_POWER_BEFORE_IQK_A                  0xea0
+#define RRX_POWER_BEFORE_IQK_A          0xea0
 #define RRX_POWER_BEFORE_IQK_A_2                0xea4
 #define RRX_POWER_AFTER_IQK_A                   0xea8
-#define RRX_POWER_AFTER_IQK_A_2                 0xeac
+#define RRX_POWER_AFTER_IQK_A_2         0xeac
 
-#define RTX_POWER_BEFORE_IQK_B                  0xeb4
+#define RTX_POWER_BEFORE_IQK_B          0xeb4
 #define RTX_POWER_AFTER_IQK_B                   0xebc
 
-#define RRX_POWER_BEFORE_IQK_B                  0xec0
+#define RRX_POWER_BEFORE_IQK_B          0xec0
 #define RRX_POWER_BEFORE_IQK_B_2                0xec4
 #define RRX_POWER_AFTER_IQK_B                   0xec8
-#define RRX_POWER_AFTER_IQK_B_2                 0xecc
+#define RRX_POWER_AFTER_IQK_B_2         0xecc
 
-#define RRX_OFDM                                0xed0
+#define RRX_OFDM                                        0xed0
 #define RRX_WAIT_RIFS                           0xed4
-#define RRX_TO_RX                               0xed8
-#define RSTANDBY                                0xedc
-#define RSLEEP                                  0xee0
+#define RRX_TO_RX                                       0xed8
+#define RSTANDBY                                                0xedc
+#define RSLEEP                                          0xee0
 #define RPMPD_ANAEN                             0xeec
 
 #define RZEBRA1_HSSIENABLE                      0x0
 #define RZEBRA1_TRXENABLE1                      0x1
 #define RZEBRA1_TRXENABLE2                      0x2
-#define RZEBRA1_AGC                             0x4
+#define RZEBRA1_AGC                                     0x4
 #define RZEBRA1_CHARGEPUMP                      0x5
 #define RZEBRA1_CHANNEL                         0x7
 
@@ -1578,666 +1591,681 @@
 #define RZEBRA1_RXLPF                           0xb
 #define RZEBRA1_RXHPFCORNER                     0xc
 
-#define RGLOBALCTRL                             0
+#define RGLOBALCTRL                                     0
 #define RRTL8256_TXLPF                          19
 #define RRTL8256_RXLPF                          11
 #define RRTL8258_TXLPF                          0x11
 #define RRTL8258_RXLPF                          0x13
 #define RRTL8258_RSSILPF                        0xa
 
-#define RF_AC                                   0x00
+#define RF_AC                                           0x00
 
-#define RF_IQADJ_G1                             0x01
-#define RF_IQADJ_G2                             0x02
-#define RF_POW_TRSW                             0x05
+#define RF_IQADJ_G1                                     0x01
+#define RF_IQADJ_G2                                     0x02
+#define RF_POW_TRSW                                     0x05
 
-#define RF_GAIN_RX                              0x06
-#define RF_GAIN_TX                              0x07
+#define RF_GAIN_RX                                      0x06
+#define RF_GAIN_TX                                      0x07
 
-#define RF_TXM_IDAC                             0x08
-#define RF_BS_IQGEN                             0x0F
+#define RF_TXM_IDAC                                     0x08
+#define RF_BS_IQGEN                                     0x0F
 
-#define RF_MODE1                                0x10
-#define RF_MODE2                                0x11
+#define RF_MODE1                                        0x10
+#define RF_MODE2                                        0x11
 
 #define RF_RX_AGC_HP                            0x12
-#define RF_TX_AGC                               0x13
-#define RF_BIAS                                 0x14
-#define RF_IPA                                  0x15
+#define RF_TX_AGC                                       0x13
+#define RF_BIAS                                         0x14
+#define RF_IPA                                          0x15
 #define RF_POW_ABILITY                          0x17
-#define RF_MODE_AG                              0x18
-#define RRFCHANNEL                              0x18
-#define RF_CHNLBW                               0x18
-#define RF_TOP                                  0x19
-
-#define RF_RX_G1                                0x1A
-#define RF_RX_G2                                0x1B
-
-#define RF_RX_BB2                               0x1C
-#define RF_RX_BB1                               0x1D
-
-#define RF_RCK1                                 0x1E
-#define RF_RCK2                                 0x1F
-
-#define RF_TX_G1                                0x20
-#define RF_TX_G2                                0x21
-#define RF_TX_G3                                0x22
-
-#define RF_TX_BB1                               0x23
-#define RF_T_METER                              0x42
-
-#define RF_SYN_G1                               0x25
-#define RF_SYN_G2                               0x26
-#define RF_SYN_G3                               0x27
-#define RF_SYN_G4                               0x28
-#define RF_SYN_G5                               0x29
-#define RF_SYN_G6                               0x2A
-#define RF_SYN_G7                               0x2B
-#define RF_SYN_G8                               0x2C
-
-#define RF_RCK_OS                               0x30
-#define RF_TXPA_G1                              0x31
-#define RF_TXPA_G2                              0x32
-#define RF_TXPA_G3                              0x33
-
-#define RF_TX_BIAS_A                            0x35
-#define RF_TX_BIAS_D                            0x36
-#define RF_LOBF_9                               0x38
-#define RF_RXRF_A3                              0x3C
-#define RF_TRSW                                 0x3F
-
-#define RF_TXRF_A2                              0x41
-#define RF_TXPA_G4                              0x46
-#define RF_TXPA_A4                              0x4B
-
-#define RF_WE_LUT                               0xEF
-
-#define BBBRESETB                               0x100
+#define RF_MODE_AG                                      0x18
+#define RRFCHANNEL                                      0x18
+#define RF_CHNLBW                                       0x18
+#define RF_TOP                                          0x19
+
+#define RF_RX_G1                                        0x1A
+#define RF_RX_G2                                        0x1B
+
+#define RF_RX_BB2                                       0x1C
+#define RF_RX_BB1                                       0x1D
+
+#define RF_RCK1                                         0x1E
+#define RF_RCK2                                         0x1F
+
+#define RF_TX_G1                                        0x20
+#define RF_TX_G2                                        0x21
+#define RF_TX_G3                                        0x22
+
+#define RF_TX_BB1                                       0x23
+#define RF_T_METER                                      0x42
+
+#define RF_SYN_G1                                       0x25
+#define RF_SYN_G2                                       0x26
+#define RF_SYN_G3                                       0x27
+#define RF_SYN_G4                                       0x28
+#define RF_SYN_G5                                       0x29
+#define RF_SYN_G6                                       0x2A
+#define RF_SYN_G7                                       0x2B
+#define RF_SYN_G8                                       0x2C
+
+#define RF_RCK_OS                                       0x30
+#define RF_TXPA_G1                                      0x31
+#define RF_TXPA_G2                                      0x32
+#define RF_TXPA_G3                                      0x33
+
+#define RF_TX_BIAS_A                                    0x35
+#define RF_TX_BIAS_D                                    0x36
+#define RF_LOBF_9                                       0x38
+#define RF_RXRF_A3                                      0x3C
+#define RF_TRSW                                         0x3F
+
+#define RF_TXRF_A2                                      0x41
+#define RF_TXPA_G4                                      0x46
+#define RF_TXPA_A4                                      0x4B
+
+#define RF_WE_LUT                                       0xEF
+
+#define BBBRESETB                                       0x100
 #define BGLOBALRESETB                           0x200
 #define BOFDMTXSTART                            0x4
-#define BCCKTXSTART                             0x8
-#define BCRC32DEBUG                             0x100
+#define BCCKTXSTART                                     0x8
+#define BCRC32DEBUG                                     0x100
 #define BPMACLOOPBACK                           0x10
-#define BTXLSIG                                 0xffffff
-#define BOFDMTXRATE                             0xf
+#define BTXLSIG                                         0xffffff
+#define BOFDMTXRATE                                     0xf
 #define BOFDMTXRESERVED                         0x10
 #define BOFDMTXLENGTH                           0x1ffe0
 #define BOFDMTXPARITY                           0x20000
-#define BTXHTSIG1                               0xffffff
+#define BTXHTSIG1                                       0xffffff
 #define BTXHTMCSRATE                            0x7f
-#define BTXHTBW                                 0x80
-#define BTXHTLENGTH                             0xffff00
-#define BTXHTSIG2                               0xffffff
+#define BTXHTBW                                         0x80
+#define BTXHTLENGTH                                     0xffff00
+#define BTXHTSIG2                                       0xffffff
 #define BTXHTSMOOTHING                          0x1
 #define BTXHTSOUNDING                           0x2
 #define BTXHTRESERVED                           0x4
 #define BTXHTAGGREATION                         0x8
-#define BTXHTSTBC                               0x30
+#define BTXHTSTBC                                       0x30
 #define BTXHTADVANCECODING                      0x40
 #define BTXHTSHORTGI                            0x80
 #define BTXHTNUMBERHT_LTF                       0x300
-#define BTXHTCRC8                               0x3fc00
+#define BTXHTCRC8                                       0x3fc00
 #define BCOUNTERRESET                           0x10000
 #define BNUMOFOFDMTX                            0xffff
-#define BNUMOFCCKTX                             0xffff0000
+#define BNUMOFCCKTX                                     0xffff0000
 #define BTXIDLEINTERVAL                         0xffff
 #define BOFDMSERVICE                            0xffff0000
 #define BTXMACHEADER                            0xffffffff
-#define BTXDATAINIT                             0xff
-#define BTXHTMODE                               0x100
-#define BTXDATATYPE                             0x30000
+#define BTXDATAINIT                                     0xff
+#define BTXHTMODE                                       0x100
+#define BTXDATATYPE                                     0x30000
 #define BTXRANDOMSEED                           0xffffffff
 #define BCCKTXPREAMBLE                          0x1
-#define BCCKTXSFD                               0xffff0000
-#define BCCKTXSIG                               0xff
+#define BCCKTXSFD                                       0xffff0000
+#define BCCKTXSIG                                       0xff
 #define BCCKTXSERVICE                           0xff00
 #define BCCKLENGTHEXT                           0x8000
 #define BCCKTXLENGHT                            0xffff0000
-#define BCCKTXCRC16                             0xffff
+#define BCCKTXCRC16                                     0xffff
 #define BCCKTXSTATUS                            0x1
 #define BOFDMTXSTATUS                           0x2
 #define IS_BB_REG_OFFSET_92S(_offset)   \
         ((_offset >= 0x800) && (_offset <= 0xfff))
 
-#define BRFMOD                                  0x1
-#define BJAPANMODE                              0x2
-#define BCCKTXSC                                0x30
-#define BCCKEN                                  0x1000000
-#define BOFDMEN                                 0x2000000
-
-#define BOFDMRXADCPHASE                         0x10000
-#define BOFDMTXDACPHASE                         0x40000
-#define BXATXAGC                                0x3f
-
-#define BXBTXAGC                                0xf00
-#define BXCTXAGC                                0xf000
-#define BXDTXAGC                                0xf0000
-
-#define BPASTART                                0xf0000000
-#define BTRSTART                                0x00f00000
-#define BRFSTART                                0x0000f000
-#define BBBSTART                                0x000000f0
-#define BBBCCKSTART                             0x0000000f
-#define BPAEND                                  0xf
-#define BTREND                                  0x0f000000
-#define BRFEND                                  0x000f0000
-#define BCCAMASK                                0x000000f0
-#define BR2RCCAMASK                             0x00000f00
-#define BHSSI_R2TDELAY                          0xf8000000
-#define BHSSI_T2RDELAY                          0xf80000
-#define BCONTXHSSI                              0x400
-#define BIGFROMCCK                              0x200
-#define BAGCADDRESS                             0x3f
-#define BRXHPTX                                 0x7000
-#define BRXHP2RX                                0x38000
-#define BRXHPCCKINI                             0xc0000
-#define BAGCTXCODE                              0xc00000
-#define BAGCRXCODE                              0x300000
-
-#define B3WIREDATALENGTH                        0x800
-#define B3WIREADDREAALENGTH                     0x400
-
-#define B3WIRERFPOWERDOWN                       0x1
-#define B5GPAPEPOLARITY                         0x40000000
-#define B2GPAPEPOLARITY                         0x80000000
-#define BRFSW_TXDEFAULTANT                      0x3
-#define BRFSW_TXOPTIONANT                       0x30
-#define BRFSW_RXDEFAULTANT                      0x300
-#define BRFSW_RXOPTIONANT                       0x3000
-#define BRFSI_3WIREDATA                         0x1
-#define BRFSI_3WIRECLOCK                        0x2
-#define BRFSI_3WIRELOAD                         0x4
-#define BRFSI_3WIRERW                           0x8
-#define BRFSI_3WIRE                             0xf
-
-#define BRFSI_RFENV                             0x10
-
-#define BRFSI_TRSW                              0x20
-#define BRFSI_TRSWB                             0x40
-#define BRFSI_ANTSW                             0x100
-#define BRFSI_ANTSWB                            0x200
-#define BRFSI_PAPE                              0x400
-#define BRFSI_PAPE5G                            0x800
-#define BBANDSELECT                             0x1
-#define BHTSIG2_GI                              0x80
-#define BHTSIG2_SMOOTHING                       0x01
-#define BHTSIG2_SOUNDING                        0x02
-#define BHTSIG2_AGGREATON                       0x08
-#define BHTSIG2_STBC                            0x30
-#define BHTSIG2_ADVCODING                       0x40
-#define BHTSIG2_NUMOFHTLTF                      0x300
-#define BHTSIG2_CRC8                            0x3fc
-#define BHTSIG1_MCS                             0x7f
-#define BHTSIG1_BANDWIDTH                       0x80
-#define BHTSIG1_HTLENGTH                        0xffff
-#define BLSIG_RATE                              0xf
-#define BLSIG_RESERVED                          0x10
-#define BLSIG_LENGTH                            0x1fffe
-#define BLSIG_PARITY                            0x20
-#define BCCKRXPHASE                             0x4
-
-#define BLSSIREADADDRESS                        0x7f800000
-#define BLSSIREADEDGE                           0x80000000
-
-#define BLSSIREADBACKDATA                       0xfffff
-
-#define BLSSIREADOKFLAG                         0x1000
-#define BCCKSAMPLERATE                          0x8
-#define BREGULATOR0STANDBY                      0x1
-#define BREGULATORPLLSTANDBY                    0x2
-#define BREGULATOR1STANDBY                      0x4
-#define BPLLPOWERUP                             0x8
-#define BDPLLPOWERUP                            0x10
-#define BDA10POWERUP                            0x20
-#define BAD7POWERUP                             0x200
-#define BDA6POWERUP                             0x2000
-#define BXTALPOWERUP                            0x4000
-#define B40MDCLKPOWERUP                         0x8000
-#define BDA6DEBUGMODE                           0x20000
-#define BDA6SWING                               0x380000
-
-#define BADCLKPHASE                             0x4000000
-#define B80MCLKDELAY                            0x18000000
-#define BAFEWATCHDOGENABLE                      0x20000000
-
-#define BXTALCAP01                              0xc0000000
-#define BXTALCAP23                              0x3
-#define BXTALCAP92X                             0x0f000000
-#define BXTALCAP                                0x0f000000
-
-#define BINTDIFCLKENABLE                        0x400
-#define BEXTSIGCLKENABLE                        0x800
-#define BBANDGAP_MBIAS_POWERUP                  0x10000
-#define BAD11SH_GAIN                            0xc0000
-#define BAD11NPUT_RANGE                         0x700000
-#define BAD110P_CURRENT                         0x3800000
-#define BLPATH_LOOPBACK                         0x4000000
-#define BQPATH_LOOPBACK                         0x8000000
-#define BAFE_LOOPBACK                           0x10000000
-#define BDA10_SWING                             0x7e0
-#define BDA10_REVERSE                           0x800
-#define BDA_CLK_SOURCE                          0x1000
-#define BDA7INPUT_RANGE                         0x6000
-#define BDA7_GAIN                               0x38000
-#define BDA7OUTPUT_CM_MODE                      0x40000
-#define BDA7INPUT_CM_MODE                       0x380000
-#define BDA7CURRENT                             0xc00000
-#define BREGULATOR_ADJUST                       0x7000000
-#define BAD11POWERUP_ATTX                       0x1
-#define BDA10PS_ATTX                            0x10
-#define BAD11POWERUP_ATRX                       0x100
-#define BDA10PS_ATRX                            0x1000
-#define BCCKRX_AGC_FORMAT                       0x200
-#define BPSDFFT_SAMPLE_POINT                    0xc000
-#define BPSD_AVERAGE_NUM                        0x3000
-#define BIQPATH_CONTROL                         0xc00
-#define BPSD_FREQ                               0x3ff
-#define BPSD_ANTENNA_PATH                       0x30
-#define BPSD_IQ_SWITCH                          0x40
-#define BPSD_RX_TRIGGER                         0x400000
-#define BPSD_TX_TRIGGERCW                       0x80000000
-#define BPSD_SINE_TONE_SCALE                    0x7f000000
-#define BPSD_REPORT                             0xffff
-
-#define BOFDM_TXSC                              0x30000000
-#define BCCK_TXON                               0x1
-#define BOFDM_TXON                              0x2
-#define BDEBUG_PAGE                             0xfff
-#define BDEBUG_ITEM                             0xff
-#define BANTL                                   0x10
-#define BANT_NONHT                              0x100
-#define BANT_HT1                                0x1000
-#define BANT_HT2                                0x10000
-#define BANT_HT1S1                              0x100000
-#define BANT_NONHTS1                            0x1000000
-
-#define BCCK_BBMODE                             0x3
-#define BCCK_TXPOWERSAVING                      0x80
-#define BCCK_RXPOWERSAVING                      0x40
-
-#define BCCK_SIDEBAND                           0x10
-
-#define BCCK_SCRAMBLE                           0x8
-#define BCCK_ANTDIVERSITY                       0x8000
-#define BCCK_CARRIER_RECOVERY                   0x4000
-#define BCCK_TXRATE                             0x3000
-#define BCCK_DCCANCEL                           0x0800
-#define BCCK_ISICANCEL                          0x0400
-#define BCCK_MATCH_FILTER                       0x0200
-#define BCCK_EQUALIZER                          0x0100
-#define BCCK_PREAMBLE_DETECT                    0x800000
-#define BCCK_FAST_FALSECCA                      0x400000
-#define BCCK_CH_ESTSTART                        0x300000
-#define BCCK_CCA_COUNT                          0x080000
-#define BCCK_CS_LIM                             0x070000
-#define BCCK_BIST_MODE                          0x80000000
-#define BCCK_CCAMASK                            0x40000000
-#define BCCK_TX_DAC_PHASE                       0x4
-#define BCCK_RX_ADC_PHASE                       0x20000000
-#define BCCKR_CP_MODE                           0x0100
-#define BCCK_TXDC_OFFSET                        0xf0
-#define BCCK_RXDC_OFFSET                        0xf
-#define BCCK_CCA_MODE                           0xc000
-#define BCCK_FALSECS_LIM                        0x3f00
-#define BCCK_CS_RATIO                           0xc00000
-#define BCCK_CORGBIT_SEL                        0x300000
-#define BCCK_PD_LIM                             0x0f0000
-#define BCCK_NEWCCA                             0x80000000
-#define BCCK_RXHP_OF_IG                         0x8000
-#define BCCK_RXIG                               0x7f00
-#define BCCK_LNA_POLARITY                       0x800000
-#define BCCK_RX1ST_BAIN                         0x7f0000
-#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
-#define BCCK_RXAGC_REPORTTYPE                   0x0300
-#define BCCK_RXDAGC_EN                          0x80000000
-#define BCCK_RXDAGC_PERIOD                      0x20000000
-#define BCCK_RXDAGC_SATLEVEL                    0x1f000000
-#define BCCK_TIMING_RECOVERY                    0x800000
-#define BCCK_TXC0                               0x3f0000
-#define BCCK_TXC1                               0x3f000000
-#define BCCK_TXC2                               0x3f
-#define BCCK_TXC3                               0x3f00
-#define BCCK_TXC4                               0x3f0000
-#define BCCK_TXC5                               0x3f000000
-#define BCCK_TXC6                               0x3f
-#define BCCK_TXC7                               0x3f00
-#define BCCK_DEBUGPORT                          0xff0000
-#define BCCK_DAC_DEBUG                          0x0f000000
-#define BCCK_FALSEALARM_ENABLE                  0x8000
-#define BCCK_FALSEALARM_READ                    0x4000
-#define BCCK_TRSSI                              0x7f
-#define BCCK_RXAGC_REPORT                       0xfe
-#define BCCK_RXREPORT_ANTSEL                    0x80000000
-#define BCCK_RXREPORT_MFOFF                     0x40000000
-#define BCCK_RXREPORT_SQLOSS                    0x20000000
-#define BCCK_RXREPORT_PKTLOSS                   0x10000000
-#define BCCK_RXREPORT_LOCKEDBIT                 0x08000000
-#define BCCK_RXREPORT_RATEERROR                 0x04000000
-#define BCCK_RXREPORT_RXRATE                    0x03000000
-#define BCCK_RXFA_COUNTER_LOWER                 0xff
-#define BCCK_RXFA_COUNTER_UPPER                 0xff000000
-#define BCCK_RXHPAGC_START                      0xe000
-#define BCCK_RXHPAGC_FINAL                      0x1c00
-#define BCCK_RXFALSEALARM_ENABLE                0x8000
-#define BCCK_FACOUNTER_FREEZE                   0x4000
-#define BCCK_TXPATH_SEL                         0x10000000
-#define BCCK_DEFAULT_RXPATH                     0xc000000
-#define BCCK_OPTION_RXPATH                      0x3000000
-
-#define BNUM_OFSTF                              0x3
-#define BSHIFT_L                                0xc0
-#define BGI_TH                                  0xc
-#define BRXPATH_A                               0x1
-#define BRXPATH_B                               0x2
-#define BRXPATH_C                               0x4
-#define BRXPATH_D                               0x8
-#define BTXPATH_A                               0x1
-#define BTXPATH_B                               0x2
-#define BTXPATH_C                               0x4
-#define BTXPATH_D                               0x8
-#define BTRSSI_FREQ                             0x200
-#define BADC_BACKOFF                            0x3000
-#define BDFIR_BACKOFF                           0xc000
-#define BTRSSI_LATCH_PHASE                      0x10000
-#define BRX_LDC_OFFSET                          0xff
-#define BRX_QDC_OFFSET                          0xff00
-#define BRX_DFIR_MODE                           0x1800000
-#define BRX_DCNF_TYPE                           0xe000000
-#define BRXIQIMB_A                              0x3ff
-#define BRXIQIMB_B                              0xfc00
-#define BRXIQIMB_C                              0x3f0000
-#define BRXIQIMB_D                              0xffc00000
-#define BDC_DC_NOTCH                            0x60000
-#define BRXNB_NOTCH                             0x1f000000
-#define BPD_TH                                  0xf
-#define BPD_TH_OPT2                             0xc000
-#define BPWED_TH                                0x700
-#define BIFMF_WIN_L                             0x800
-#define BPD_OPTION                              0x1000
-#define BMF_WIN_L                               0xe000
-#define BBW_SEARCH_L                            0x30000
-#define BWIN_ENH_L                              0xc0000
-#define BBW_TH                                  0x700000
-#define BED_TH2                                 0x3800000
-#define BBW_OPTION                              0x4000000
-#define BRADIO_TH                               0x18000000
-#define BWINDOW_L                               0xe0000000
-#define BSBD_OPTION                             0x1
-#define BFRAME_TH                               0x1c
-#define BFS_OPTION                              0x60
-#define BDC_SLOPE_CHECK                         0x80
-#define BFGUARD_COUNTER_DC_L                    0xe00
-#define BFRAME_WEIGHT_SHORT                     0x7000
-#define BSUB_TUNE                               0xe00000
-#define BFRAME_DC_LENGTH                        0xe000000
-#define BSBD_START_OFFSET                       0x30000000
-#define BFRAME_TH_2                             0x7
-#define BFRAME_GI2_TH                           0x38
-#define BGI2_SYNC_EN                            0x40
-#define BSARCH_SHORT_EARLY                      0x300
-#define BSARCH_SHORT_LATE                       0xc00
-#define BSARCH_GI2_LATE                         0x70000
-#define BCFOANTSUM                              0x1
-#define BCFOACC                                 0x2
-#define BCFOSTARTOFFSET                         0xc
-#define BCFOLOOPBACK                            0x70
-#define BCFOSUMWEIGHT                           0x80
-#define BDAGCENABLE                             0x10000
-#define BTXIQIMB_A                              0x3ff
-#define BTXIQIMB_B                              0xfc00
-#define BTXIQIMB_C                              0x3f0000
-#define BTXIQIMB_D                              0xffc00000
-#define BTXIDCOFFSET                            0xff
-#define BTXIQDCOFFSET                           0xff00
-#define BTXDFIRMODE                             0x10000
-#define BTXPESUDO_NOISEON                       0x4000000
-#define BTXPESUDO_NOISE_A                       0xff
-#define BTXPESUDO_NOISE_B                       0xff00
-#define BTXPESUDO_NOISE_C                       0xff0000
-#define BTXPESUDO_NOISE_D                       0xff000000
-#define BCCA_DROPOPTION                         0x20000
-#define BCCA_DROPTHRES                          0xfff00000
-#define BEDCCA_H                                0xf
-#define BEDCCA_L                                0xf0
-#define BLAMBDA_ED                              0x300
-#define BRX_INITIALGAIN                         0x7f
-#define BRX_ANTDIV_EN                           0x80
-#define BRX_AGC_ADDRESS_FOR_LNA                 0x7f00
-#define BRX_HIGHPOWER_FLOW                      0x8000
-#define BRX_AGC_FREEZE_THRES                    0xc0000
-#define BRX_FREEZESTEP_AGC1                     0x300000
-#define BRX_FREEZESTEP_AGC2                     0xc00000
-#define BRX_FREEZESTEP_AGC3                     0x3000000
-#define BRX_FREEZESTEP_AGC0                     0xc000000
-#define BRXRSSI_CMP_EN                          0x10000000
-#define BRXQUICK_AGCEN                          0x20000000
-#define BRXAGC_FREEZE_THRES_MODE                0x40000000
-#define BRX_OVERFLOW_CHECKTYPE                  0x80000000
-#define BRX_AGCSHIFT                            0x7f
-#define BTRSW_TRI_ONLY                          0x80
-#define BPOWER_THRES                            0x300
-#define BRXAGC_EN                               0x1
-#define BRXAGC_TOGETHER_EN                      0x2
-#define BRXAGC_MIN                              0x4
-#define BRXHP_INI                               0x7
-#define BRXHP_TRLNA                             0x70
-#define BRXHP_RSSI                              0x700
-#define BRXHP_BBP1                              0x7000
-#define BRXHP_BBP2                              0x70000
-#define BRXHP_BBP3                              0x700000
-#define BRSSI_H                                 0x7f0000
-#define BRSSI_GEN                               0x7f000000
-#define BRXSETTLE_TRSW                          0x7
-#define BRXSETTLE_LNA                           0x38
-#define BRXSETTLE_RSSI                          0x1c0
-#define BRXSETTLE_BBP                           0xe00
-#define BRXSETTLE_RXHP                          0x7000
-#define BRXSETTLE_ANTSW_RSSI                    0x38000
-#define BRXSETTLE_ANTSW                         0xc0000
-#define BRXPROCESS_TIME_DAGC                    0x300000
-#define BRXSETTLE_HSSI                          0x400000
-#define BRXPROCESS_TIME_BBPPW                   0x800000
-#define BRXANTENNA_POWER_SHIFT                  0x3000000
-#define BRSSI_TABLE_SELECT                      0xc000000
-#define BRXHP_FINAL                             0x7000000
-#define BRXHPSETTLE_BBP                         0x7
-#define BRXHTSETTLE_HSSI                        0x8
-#define BRXHTSETTLE_RXHP                        0x70
-#define BRXHTSETTLE_BBPPW                       0x80
-#define BRXHTSETTLE_IDLE                        0x300
-#define BRXHTSETTLE_RESERVED                    0x1c00
-#define BRXHT_RXHP_EN                           0x8000
-#define BRXAGC_FREEZE_THRES                     0x30000
-#define BRXAGC_TOGETHEREN                       0x40000
-#define BRXHTAGC_MIN                            0x80000
-#define BRXHTAGC_EN                             0x100000
-#define BRXHTDAGC_EN                            0x200000
-#define BRXHT_RXHP_BBP                          0x1c00000
-#define BRXHT_RXHP_FINAL                        0xe0000000
-#define BRXPW_RADIO_TH                          0x3
-#define BRXPW_RADIO_EN                          0x4
-#define BRXMF_HOLD                              0x3800
-#define BRXPD_DELAY_TH1                         0x38
-#define BRXPD_DELAY_TH2                         0x1c0
-#define BRXPD_DC_COUNT_MAX                      0x600
-#define BRXPD_DELAY_TH                          0x8000
-#define BRXPROCESS_DELAY                        0xf0000
-#define BRXSEARCHRANGE_GI2_EARLY                0x700000
-#define BRXFRAME_FUARD_COUNTER_L                0x3800000
-#define BRXSGI_GUARD_L                          0xc000000
-#define BRXSGI_SEARCH_L                         0x30000000
-#define BRXSGI_TH                               0xc0000000
-#define BDFSCNT0                                0xff
-#define BDFSCNT1                                0xff00
-#define BDFSFLAG                                0xf0000
-#define BMF_WEIGHT_SUM                          0x300000
-#define BMINIDX_TH                              0x7f000000
-#define BDAFORMAT                               0x40000
-#define BTXCH_EMU_ENABLE                        0x01000000
-#define BTRSW_ISOLATION_A                       0x7f
-#define BTRSW_ISOLATION_B                       0x7f00
-#define BTRSW_ISOLATION_C                       0x7f0000
-#define BTRSW_ISOLATION_D                       0x7f000000
-#define BEXT_LNA_GAIN                           0x7c00
-
-#define BSTBC_EN                                0x4
-#define BANTENNA_MAPPING                        0x10
-#define BNSS                                    0x20
-#define BCFO_ANTSUM_ID                          0x200
-#define BPHY_COUNTER_RESET                      0x8000000
-#define BCFO_REPORT_GET                         0x4000000
-#define BOFDM_CONTINUE_TX                       0x10000000
-#define BOFDM_SINGLE_CARRIER                    0x20000000
-#define BOFDM_SINGLE_TONE                       0x40000000
-#define BHT_DETECT                              0x100
-#define BCFOEN                                  0x10000
-#define BCFOVALUE                               0xfff00000
-#define BSIGTONE_RE                             0x3f
-#define BSIGTONE_IM                             0x7f00
-#define BCOUNTER_CCA                            0xffff
-#define BCOUNTER_PARITYFAIL                     0xffff0000
-#define BCOUNTER_RATEILLEGAL                    0xffff
-#define BCOUNTER_CRC8FAIL                       0xffff0000
-#define BCOUNTER_MCSNOSUPPORT                   0xffff
-#define BCOUNTER_FASTSYNC                       0xffff
-#define BSHORTCFO                               0xfff
-#define BSHORTCFOT_LENGTH                       12
-#define BSHORTCFOF_LENGTH                       11
-#define BLONGCFO                                0x7ff
-#define BLONGCFOT_LENGTH                        11
-#define BLONGCFOF_LENGTH                        11
-#define BTAILCFO                                0x1fff
-#define BTAILCFOT_LENGTH                        13
-#define BTAILCFOF_LENGTH                        12
-#define BNOISE_EN_PWDB                          0xffff
-#define BCC_POWER_DB                            0xffff0000
-#define BMOISE_PWDB                             0xffff
-#define BPOWERMEAST_LENGTH                      10
-#define BPOWERMEASF_LENGTH                      3
-#define BRX_HT_BW                               0x1
-#define BRXSC                                   0x6
-#define BRX_HT                                  0x8
-#define BNB_INTF_DET_ON                         0x1
-#define BINTF_WIN_LEN_CFG                       0x30
-#define BNB_INTF_TH_CFG                         0x1c0
-#define BRFGAIN                                 0x3f
-#define BTABLESEL                               0x40
-#define BTRSW                                   0x80
-#define BRXSNR_A                                0xff
-#define BRXSNR_B                                0xff00
-#define BRXSNR_C                                0xff0000
-#define BRXSNR_D                                0xff000000
-#define BSNR_EVMT_LENGTH                        8
-#define BSNR_EVMF_LENGTH                        1
-#define BCSI1ST                                 0xff
-#define BCSI2ND                                 0xff00
-#define BRXEVM1ST                               0xff0000
-#define BRXEVM2ND                               0xff000000
-#define BSIGEVM                                 0xff
-#define BPWDB                                   0xff00
-#define BSGIEN                                  0x10000
-
-#define BSFACTOR_QMA1                           0xf
-#define BSFACTOR_QMA2                           0xf0
-#define BSFACTOR_QMA3                           0xf00
-#define BSFACTOR_QMA4                           0xf000
-#define BSFACTOR_QMA5                           0xf0000
-#define BSFACTOR_QMA6                           0xf0000
-#define BSFACTOR_QMA7                           0xf00000
-#define BSFACTOR_QMA8                           0xf000000
-#define BSFACTOR_QMA9                           0xf0000000
-#define BCSI_SCHEME                             0x100000
-
-#define BNOISE_LVL_TOP_SET                      0x3
-#define BCHSMOOTH                               0x4
-#define BCHSMOOTH_CFG1                          0x38
-#define BCHSMOOTH_CFG2                          0x1c0
-#define BCHSMOOTH_CFG3                          0xe00
-#define BCHSMOOTH_CFG4                          0x7000
-#define BMRCMODE                                0x800000
-#define BTHEVMCFG                               0x7000000
-
-#define BLOOP_FIT_TYPE                          0x1
-#define BUPD_CFO                                0x40
-#define BUPD_CFO_OFFDATA                        0x80
-#define BADV_UPD_CFO                            0x100
-#define BADV_TIME_CTRL                          0x800
-#define BUPD_CLKO                               0x1000
-#define BFC                                     0x6000
-#define BTRACKING_MODE                          0x8000
-#define BPHCMP_ENABLE                           0x10000
-#define BUPD_CLKO_LTF                           0x20000
-#define BCOM_CH_CFO                             0x40000
-#define BCSI_ESTI_MODE                          0x80000
-#define BADV_UPD_EQZ                            0x100000
-#define BUCHCFG                                 0x7000000
-#define BUPDEQZ                                 0x8000000
-
-#define BRX_PESUDO_NOISE_ON                     0x20000000
-#define BRX_PESUDO_NOISE_A                      0xff
-#define BRX_PESUDO_NOISE_B                      0xff00
-#define BRX_PESUDO_NOISE_C                      0xff0000
-#define BRX_PESUDO_NOISE_D                      0xff000000
-#define BRX_PESUDO_NOISESTATE_A                 0xffff
-#define BRX_PESUDO_NOISESTATE_B                 0xffff0000
-#define BRX_PESUDO_NOISESTATE_C                 0xffff
-#define BRX_PESUDO_NOISESTATE_D                 0xffff0000
-
-#define BZEBRA1_HSSIENABLE                      0x8
-#define BZEBRA1_TRXCONTROL                      0xc00
-#define BZEBRA1_TRXGAINSETTING                  0x07f
-#define BZEBRA1_RXCOUNTER                       0xc00
-#define BZEBRA1_TXCHANGEPUMP                    0x38
-#define BZEBRA1_RXCHANGEPUMP                    0x7
-#define BZEBRA1_CHANNEL_NUM                     0xf80
-#define BZEBRA1_TXLPFBW                         0x400
-#define BZEBRA1_RXLPFBW                         0x600
-
-#define BRTL8256REG_MODE_CTRL1                  0x100
-#define BRTL8256REG_MODE_CTRL0                  0x40
-#define BRTL8256REG_TXLPFBW                     0x18
-#define BRTL8256REG_RXLPFBW                     0x600
-
-#define BRTL8258_TXLPFBW                        0xc
-#define BRTL8258_RXLPFBW                        0xc00
-#define BRTL8258_RSSILPFBW                      0xc0
-
-#define BBYTE0                                  0x1
-#define BBYTE1                                  0x2
-#define BBYTE2                                  0x4
-#define BBYTE3                                  0x8
-#define BWORD0                                  0x3
-#define BWORD1                                  0xc
-#define BWORD                                   0xf
-
-#define BENABLE                                 0x1
-#define BDISABLE                                0x0
-
-#define LEFT_ANTENNA                            0x0
-#define RIGHT_ANTENNA                           0x1
-
-#define TCHECK_TXSTATUS                         500
-#define TUPDATE_RXCOUNTER                       100
-
-#define REG_UN_USED_REGISTER                    0x01bf
+#define BRFMOD                                          0x1
+#define BJAPANMODE                                      0x2
+#define BCCKTXSC                                        0x30
+#define BCCKEN                                          0x1000000
+#define BOFDMEN                                         0x2000000
+
+#define BOFDMRXADCPHASE                 0x10000
+#define BOFDMTXDACPHASE                 0x40000
+#define BXATXAGC                        0x3f
+
+#define BXBTXAGC                        0xf00
+#define BXCTXAGC                        0xf000
+#define BXDTXAGC                        0xf0000
+
+#define BPASTART                        0xf0000000
+#define BTRSTART                        0x00f00000
+#define BRFSTART                        0x0000f000
+#define BBBSTART                        0x000000f0
+#define BBBCCKSTART                     0x0000000f
+#define BPAEND                          0xf
+#define BTREND                          0x0f000000
+#define BRFEND                          0x000f0000
+#define BCCAMASK                        0x000000f0
+#define BR2RCCAMASK                     0x00000f00
+#define BHSSI_R2TDELAY                  0xf8000000
+#define BHSSI_T2RDELAY                  0xf80000
+#define BCONTXHSSI                      0x400
+#define BIGFROMCCK                      0x200
+#define BAGCADDRESS                     0x3f
+#define BRXHPTX                         0x7000
+#define BRXHP2RX                        0x38000
+#define BRXHPCCKINI                     0xc0000
+#define BAGCTXCODE                      0xc00000
+#define BAGCRXCODE                      0x300000
+
+#define B3WIREDATALENGTH                0x800
+#define B3WIREADDREAALENGTH             0x400
+
+#define B3WIRERFPOWERDOWN               0x1
+#define B5GPAPEPOLARITY                 0x40000000
+#define B2GPAPEPOLARITY                 0x80000000
+#define BRFSW_TXDEFAULTANT              0x3
+#define BRFSW_TXOPTIONANT               0x30
+#define BRFSW_RXDEFAULTANT              0x300
+#define BRFSW_RXOPTIONANT               0x3000
+#define BRFSI_3WIREDATA                 0x1
+#define BRFSI_3WIRECLOCK                0x2
+#define BRFSI_3WIRELOAD                 0x4
+#define BRFSI_3WIRERW                   0x8
+#define BRFSI_3WIRE                     0xf
+
+#define BRFSI_RFENV                     0x10
+
+#define BRFSI_TRSW                      0x20
+#define BRFSI_TRSWB                     0x40
+#define BRFSI_ANTSW                     0x100
+#define BRFSI_ANTSWB                    0x200
+#define BRFSI_PAPE                      0x400
+#define BRFSI_PAPE5G                    0x800
+#define BBANDSELECT                     0x1
+#define BHTSIG2_GI                      0x80
+#define BHTSIG2_SMOOTHING               0x01
+#define BHTSIG2_SOUNDING                0x02
+#define BHTSIG2_AGGREATON               0x08
+#define BHTSIG2_STBC                    0x30
+#define BHTSIG2_ADVCODING               0x40
+#define BHTSIG2_NUMOFHTLTF              0x300
+#define BHTSIG2_CRC8                    0x3fc
+#define BHTSIG1_MCS                     0x7f
+#define BHTSIG1_BANDWIDTH               0x80
+#define BHTSIG1_HTLENGTH                0xffff
+#define BLSIG_RATE                      0xf
+#define BLSIG_RESERVED                  0x10
+#define BLSIG_LENGTH                    0x1fffe
+#define BLSIG_PARITY                    0x20
+#define BCCKRXPHASE                     0x4
+
+#define BLSSIREADADDRESS                0x7f800000
+#define BLSSIREADEDGE                   0x80000000
+
+#define BLSSIREADBACKDATA               0xfffff
+
+#define BLSSIREADOKFLAG                 0x1000
+#define BCCKSAMPLERATE                  0x8
+#define BREGULATOR0STANDBY              0x1
+#define BREGULATORPLLSTANDBY            0x2
+#define BREGULATOR1STANDBY              0x4
+#define BPLLPOWERUP                     0x8
+#define BDPLLPOWERUP                    0x10
+#define BDA10POWERUP                    0x20
+#define BAD7POWERUP                     0x200
+#define BDA6POWERUP                     0x2000
+#define BXTALPOWERUP                    0x4000
+#define B40MDCLKPOWERUP                 0x8000
+#define BDA6DEBUGMODE                   0x20000
+#define BDA6SWING                       0x380000
+
+#define BADCLKPHASE                     0x4000000
+#define B80MCLKDELAY                    0x18000000
+#define BAFEWATCHDOGENABLE              0x20000000
+
+#define BXTALCAP01                      0xc0000000
+#define BXTALCAP23                      0x3
+#define BXTALCAP92X                                     0x0f000000
+#define BXTALCAP                        0x0f000000
+
+#define BINTDIFCLKENABLE                0x400
+#define BEXTSIGCLKENABLE                0x800
+#define BBANDGAP_MBIAS_POWERUP      0x10000
+#define BAD11SH_GAIN                    0xc0000
+#define BAD11NPUT_RANGE                 0x700000
+#define BAD110P_CURRENT                 0x3800000
+#define BLPATH_LOOPBACK                 0x4000000
+#define BQPATH_LOOPBACK                 0x8000000
+#define BAFE_LOOPBACK                   0x10000000
+#define BDA10_SWING                     0x7e0
+#define BDA10_REVERSE                   0x800
+#define BDA_CLK_SOURCE              0x1000
+#define BDA7INPUT_RANGE                 0x6000
+#define BDA7_GAIN                       0x38000
+#define BDA7OUTPUT_CM_MODE          0x40000
+#define BDA7INPUT_CM_MODE           0x380000
+#define BDA7CURRENT                     0xc00000
+#define BREGULATOR_ADJUST               0x7000000
+#define BAD11POWERUP_ATTX               0x1
+#define BDA10PS_ATTX                    0x10
+#define BAD11POWERUP_ATRX               0x100
+#define BDA10PS_ATRX                    0x1000
+#define BCCKRX_AGC_FORMAT           0x200
+#define BPSDFFT_SAMPLE_POINT            0xc000
+#define BPSD_AVERAGE_NUM            0x3000
+#define BIQPATH_CONTROL                 0xc00
+#define BPSD_FREQ                       0x3ff
+#define BPSD_ANTENNA_PATH           0x30
+#define BPSD_IQ_SWITCH              0x40
+#define BPSD_RX_TRIGGER             0x400000
+#define BPSD_TX_TRIGGER             0x80000000
+#define BPSD_SINE_TONE_SCALE        0x7f000000
+#define BPSD_REPORT                     0xffff
+
+#define BOFDM_TXSC                      0x30000000
+#define BCCK_TXON                       0x1
+#define BOFDM_TXON                      0x2
+#define BDEBUG_PAGE                     0xfff
+#define BDEBUG_ITEM                     0xff
+#define BANTL                           0x10
+#define BANT_NONHT                  0x100
+#define BANT_HT1                        0x1000
+#define BANT_HT2                        0x10000
+#define BANT_HT1S1                      0x100000
+#define BANT_NONHTS1                    0x1000000
+
+#define BCCK_BBMODE                     0x3
+#define BCCK_TXPOWERSAVING              0x80
+#define BCCK_RXPOWERSAVING              0x40
+
+#define BCCK_SIDEBAND                   0x10
+
+#define BCCK_SCRAMBLE                   0x8
+#define BCCK_ANTDIVERSITY               0x8000
+#define BCCK_CARRIER_RECOVERY           0x4000
+#define BCCK_TXRATE                     0x3000
+#define BCCK_DCCANCEL                   0x0800
+#define BCCK_ISICANCEL                  0x0400
+#define BCCK_MATCH_FILTER           0x0200
+#define BCCK_EQUALIZER                  0x0100
+#define BCCK_PREAMBLE_DETECT            0x800000
+#define BCCK_FAST_FALSECCA          0x400000
+#define BCCK_CH_ESTSTART            0x300000
+#define BCCK_CCA_COUNT              0x080000
+#define BCCK_CS_LIM                     0x070000
+#define BCCK_BIST_MODE              0x80000000
+#define BCCK_CCAMASK                    0x40000000
+#define BCCK_TX_DAC_PHASE               0x4
+#define BCCK_RX_ADC_PHASE               0x20000000
+#define BCCKR_CP_MODE                   0x0100
+#define BCCK_TXDC_OFFSET                0xf0
+#define BCCK_RXDC_OFFSET                0xf
+#define BCCK_CCA_MODE                   0xc000
+#define BCCK_FALSECS_LIM                0x3f00
+#define BCCK_CS_RATIO                   0xc00000
+#define BCCK_CORGBIT_SEL                0x300000
+#define BCCK_PD_LIM                     0x0f0000
+#define BCCK_NEWCCA                     0x80000000
+#define BCCK_RXHP_OF_IG             0x8000
+#define BCCK_RXIG                       0x7f00
+#define BCCK_LNA_POLARITY           0x800000
+#define BCCK_RX1ST_BAIN             0x7f0000
+#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
+#define BCCK_RXAGC_REPORTTYPE           0x0300
+#define BCCK_RXDAGC_EN              0x80000000
+#define BCCK_RXDAGC_PERIOD              0x20000000
+#define BCCK_RXDAGC_SATLEVEL            0x1f000000
+#define BCCK_TIMING_RECOVERY            0x800000
+#define BCCK_TXC0                       0x3f0000
+#define BCCK_TXC1                       0x3f000000
+#define BCCK_TXC2                       0x3f
+#define BCCK_TXC3                       0x3f00
+#define BCCK_TXC4                       0x3f0000
+#define BCCK_TXC5                       0x3f000000
+#define BCCK_TXC6                       0x3f
+#define BCCK_TXC7                       0x3f00
+#define BCCK_DEBUGPORT                  0xff0000
+#define BCCK_DAC_DEBUG              0x0f000000
+#define BCCK_FALSEALARM_ENABLE      0x8000
+#define BCCK_FALSEALARM_READ        0x4000
+#define BCCK_TRSSI                      0x7f
+#define BCCK_RXAGC_REPORT           0xfe
+#define BCCK_RXREPORT_ANTSEL            0x80000000
+#define BCCK_RXREPORT_MFOFF             0x40000000
+#define BCCK_RXREPORT_SQLOSS            0x20000000
+#define BCCK_RXREPORT_PKTLOSS           0x10000000
+#define BCCK_RXREPORT_LOCKEDBIT         0x08000000
+#define BCCK_RXREPORT_RATEERROR         0x04000000
+#define BCCK_RXREPORT_RXRATE            0x03000000
+#define BCCK_RXFA_COUNTER_LOWER     0xff
+#define BCCK_RXFA_COUNTER_UPPER     0xff000000
+#define BCCK_RXHPAGC_START          0xe000
+#define BCCK_RXHPAGC_FINAL          0x1c00
+#define BCCK_RXFALSEALARM_ENABLE    0x8000
+#define BCCK_FACOUNTER_FREEZE       0x4000
+#define BCCK_TXPATH_SEL             0x10000000
+#define BCCK_DEFAULT_RXPATH         0xc000000
+#define BCCK_OPTION_RXPATH          0x3000000
+
+#define BNUM_OFSTF                      0x3
+#define BSHIFT_L                        0xc0
+#define BGI_TH                          0xc
+#define BRXPATH_A                       0x1
+#define BRXPATH_B                       0x2
+#define BRXPATH_C                       0x4
+#define BRXPATH_D                       0x8
+#define BTXPATH_A                       0x1
+#define BTXPATH_B                       0x2
+#define BTXPATH_C                       0x4
+#define BTXPATH_D                       0x8
+#define BTRSSI_FREQ                     0x200
+#define BADC_BACKOFF                    0x3000
+#define BDFIR_BACKOFF                   0xc000
+#define BTRSSI_LATCH_PHASE              0x10000
+#define BRX_LDC_OFFSET                  0xff
+#define BRX_QDC_OFFSET                  0xff00
+#define BRX_DFIR_MODE                   0x1800000
+#define BRX_DCNF_TYPE                   0xe000000
+#define BRXIQIMB_A                      0x3ff
+#define BRXIQIMB_B                      0xfc00
+#define BRXIQIMB_C                      0x3f0000
+#define BRXIQIMB_D                      0xffc00000
+#define BDC_DC_NOTCH                    0x60000
+#define BRXNB_NOTCH                     0x1f000000
+#define BPD_TH                          0xf
+#define BPD_TH_OPT2                     0xc000
+#define BPWED_TH                        0x700
+#define BIFMF_WIN_L                     0x800
+#define BPD_OPTION                      0x1000
+#define BMF_WIN_L                       0xe000
+#define BBW_SEARCH_L                    0x30000
+#define BWIN_ENH_L                      0xc0000
+#define BBW_TH                          0x700000
+#define BED_TH2                         0x3800000
+#define BBW_OPTION                      0x4000000
+#define BRADIO_TH                       0x18000000
+#define BWINDOW_L                       0xe0000000
+#define BSBD_OPTION                     0x1
+#define BFRAME_TH                       0x1c
+#define BFS_OPTION                      0x60
+#define BDC_SLOPE_CHECK                 0x80
+#define BFGUARD_COUNTER_DC_L            0xe00
+#define BFRAME_WEIGHT_SHORT             0x7000
+#define BSUB_TUNE                       0xe00000
+#define BFRAME_DC_LENGTH                0xe000000
+#define BSBD_START_OFFSET               0x30000000
+#define BFRAME_TH_2                     0x7
+#define BFRAME_GI2_TH                   0x38
+#define BGI2_SYNC_EN                    0x40
+#define BSARCH_SHORT_EARLY              0x300
+#define BSARCH_SHORT_LATE               0xc00
+#define BSARCH_GI2_LATE                 0x70000
+#define BCFOANTSUM                      0x1
+#define BCFOACC                         0x2
+#define BCFOSTARTOFFSET                 0xc
+#define BCFOLOOPBACK                    0x70
+#define BCFOSUMWEIGHT                   0x80
+#define BDAGCENABLE                     0x10000
+#define BTXIQIMB_A                      0x3ff
+#define BTXIQIMB_b                      0xfc00
+#define BTXIQIMB_C                      0x3f0000
+#define BTXIQIMB_D                      0xffc00000
+#define BTXIDCOFFSET                    0xff
+#define BTXIQDCOFFSET                   0xff00
+#define BTXDFIRMODE                     0x10000
+#define BTXPESUDO_NOISEON               0x4000000
+#define BTXPESUDO_NOISE_A               0xff
+#define BTXPESUDO_NOISE_B               0xff00
+#define BTXPESUDO_NOISE_C               0xff0000
+#define BTXPESUDO_NOISE_D               0xff000000
+#define BCCA_DROPOPTION                 0x20000
+#define BCCA_DROPTHRES                  0xfff00000
+#define BEDCCA_H                        0xf
+#define BEDCCA_L                        0xf0
+#define BLAMBDA_ED                      0x300
+#define BRX_INITIALGAIN                 0x7f
+#define BRX_ANTDIV_EN                   0x80
+#define BRX_AGC_ADDRESS_FOR_LNA     0x7f00
+#define BRX_HIGHPOWER_FLOW              0x8000
+#define BRX_AGC_FREEZE_THRES        0xc0000
+#define BRX_FREEZESTEP_AGC1             0x300000
+#define BRX_FREEZESTEP_AGC2             0xc00000
+#define BRX_FREEZESTEP_AGC3             0x3000000
+#define BRX_FREEZESTEP_AGC0             0xc000000
+#define BRXRSSI_CMP_EN                  0x10000000
+#define BRXQUICK_AGCEN                  0x20000000
+#define BRXAGC_FREEZE_THRES_MODE    0x40000000
+#define BRX_OVERFLOW_CHECKTYPE          0x80000000
+#define BRX_AGCSHIFT                    0x7f
+#define BTRSW_TRI_ONLY                  0x80
+#define BPOWER_THRES                    0x300
+#define BRXAGC_EN                       0x1
+#define BRXAGC_TOGETHER_EN              0x2
+#define BRXAGC_MIN                      0x4
+#define BRXHP_INI                       0x7
+#define BRXHP_TRLNA                     0x70
+#define BRXHP_RSSI                      0x700
+#define BRXHP_BBP1                      0x7000
+#define BRXHP_BBP2                      0x70000
+#define BRXHP_BBP3                      0x700000
+#define BRSSI_H                         0x7f0000
+#define BRSSI_GEN                       0x7f000000
+#define BRXSETTLE_TRSW                  0x7
+#define BRXSETTLE_LNA                   0x38
+#define BRXSETTLE_RSSI                  0x1c0
+#define BRXSETTLE_BBP                   0xe00
+#define BRXSETTLE_RXHP                  0x7000
+#define BRXSETTLE_ANTSW_RSSI            0x38000
+#define BRXSETTLE_ANTSW                 0xc0000
+#define BRXPROCESS_TIME_DAGC            0x300000
+#define BRXSETTLE_HSSI                  0x400000
+#define BRXPROCESS_TIME_BBPPW           0x800000
+#define BRXANTENNA_POWER_SHIFT          0x3000000
+#define BRSSI_TABLE_SELECT              0xc000000
+#define BRXHP_FINAL                     0x7000000
+#define BRXHPSETTLE_BBP                 0x7
+#define BRXHTSETTLE_HSSI                0x8
+#define BRXHTSETTLE_RXHP                0x70
+#define BRXHTSETTLE_BBPPW               0x80
+#define BRXHTSETTLE_IDLE                0x300
+#define BRXHTSETTLE_RESERVED            0x1c00
+#define BRXHT_RXHP_EN                   0x8000
+#define BRXAGC_FREEZE_THRES             0x30000
+#define BRXAGC_TOGETHEREN               0x40000
+#define BRXHTAGC_MIN                    0x80000
+#define BRXHTAGC_EN                     0x100000
+#define BRXHTDAGC_EN                    0x200000
+#define BRXHT_RXHP_BBP                  0x1c00000
+#define BRXHT_RXHP_FINAL                0xe0000000
+#define BRXPW_RADIO_TH                  0x3
+#define BRXPW_RADIO_EN                  0x4
+#define BRXMF_HOLD                      0x3800
+#define BRXPD_DELAY_TH1                 0x38
+#define BRXPD_DELAY_TH2                 0x1c0
+#define BRXPD_DC_COUNT_MAX              0x600
+#define BRXPD_DELAY_TH                  0x8000
+#define BRXPROCESS_DELAY                0xf0000
+#define BRXSEARCHRANGE_GI2_EARLY        0x700000
+#define BRXFRAME_FUARD_COUNTER_L        0x3800000
+#define BRXSGI_GUARD_L                  0xc000000
+#define BRXSGI_SEARCH_L                 0x30000000
+#define BRXSGI_TH                       0xc0000000
+#define BDFSCNT0                        0xff
+#define BDFSCNT1                        0xff00
+#define BDFSFLAG                        0xf0000
+#define BMF_WEIGHT_SUM                  0x300000
+#define BMINIDX_TH                      0x7f000000
+#define BDAFORMAT                       0x40000
+#define BTXCH_EMU_ENABLE                0x01000000
+#define BTRSW_ISOLATION_A               0x7f
+#define BTRSW_ISOLATION_B               0x7f00
+#define BTRSW_ISOLATION_C               0x7f0000
+#define BTRSW_ISOLATION_D               0x7f000000
+#define BEXT_LNA_GAIN                   0x7c00
+
+#define BSTBC_EN                        0x4
+#define BANTENNA_MAPPING                0x10
+#define BNSS                            0x20
+#define BCFO_ANTSUM_ID              0x200
+#define BPHY_COUNTER_RESET              0x8000000
+#define BCFO_REPORT_GET                 0x4000000
+#define BOFDM_CONTINUE_TX               0x10000000
+#define BOFDM_SINGLE_CARRIER            0x20000000
+#define BOFDM_SINGLE_TONE               0x40000000
+#define BHT_DETECT                      0x100
+#define BCFOEN                          0x10000
+#define BCFOVALUE                       0xfff00000
+#define BSIGTONE_RE                     0x3f
+#define BSIGTONE_IM                     0x7f00
+#define BCOUNTER_CCA                    0xffff
+#define BCOUNTER_PARITYFAIL             0xffff0000
+#define BCOUNTER_RATEILLEGAL            0xffff
+#define BCOUNTER_CRC8FAIL               0xffff0000
+#define BCOUNTER_MCSNOSUPPORT           0xffff
+#define BCOUNTER_FASTSYNC               0xffff
+#define BSHORTCFO                       0xfff
+#define BSHORTCFOT_LENGTH               12
+#define BSHORTCFOF_LENGTH               11
+#define BLONGCFO                        0x7ff
+#define BLONGCFOT_LENGTH                11
+#define BLONGCFOF_LENGTH                11
+#define BTAILCFO                        0x1fff
+#define BTAILCFOT_LENGTH                13
+#define BTAILCFOF_LENGTH                12
+#define BNOISE_EN_PWDB                  0xffff
+#define BCC_POWER_DB                    0xffff0000
+#define BMOISE_PWDB                     0xffff
+#define BPOWERMEAST_LENGTH              10
+#define BPOWERMEASF_LENGTH              3
+#define BRX_HT_BW                       0x1
+#define BRXSC                           0x6
+#define BRX_HT                          0x8
+#define BNB_INTF_DET_ON                 0x1
+#define BINTF_WIN_LEN_CFG               0x30
+#define BNB_INTF_TH_CFG                 0x1c0
+#define BRFGAIN                         0x3f
+#define BTABLESEL                       0x40
+#define BTRSW                           0x80
+#define BRXSNR_A                        0xff
+#define BRXSNR_B                        0xff00
+#define BRXSNR_C                        0xff0000
+#define BRXSNR_D                        0xff000000
+#define BSNR_EVMT_LENGTH                8
+#define BSNR_EVMF_LENGTH                1
+#define BCSI1ST                         0xff
+#define BCSI2ND                         0xff00
+#define BRXEVM1ST                       0xff0000
+#define BRXEVM2ND                       0xff000000
+#define BSIGEVM                         0xff
+#define BPWDB                           0xff00
+#define BSGIEN                          0x10000
+
+#define BSFACTOR_QMA1                   0xf
+#define BSFACTOR_QMA2                   0xf0
+#define BSFACTOR_QMA3                   0xf00
+#define BSFACTOR_QMA4                   0xf000
+#define BSFACTOR_QMA5                   0xf0000
+#define BSFACTOR_QMA6                   0xf0000
+#define BSFACTOR_QMA7                   0xf00000
+#define BSFACTOR_QMA8                   0xf000000
+#define BSFACTOR_QMA9                   0xf0000000
+#define BCSI_SCHEME                     0x100000
+
+#define BNOISE_LVL_TOP_SET          0x3
+#define BCHSMOOTH                       0x4
+#define BCHSMOOTH_CFG1                  0x38
+#define BCHSMOOTH_CFG2                  0x1c0
+#define BCHSMOOTH_CFG3                  0xe00
+#define BCHSMOOTH_CFG4                  0x7000
+#define BMRCMODE                        0x800000
+#define BTHEVMCFG                       0x7000000
+
+#define BLOOP_FIT_TYPE                  0x1
+#define BUPD_CFO                        0x40
+#define BUPD_CFO_OFFDATA                0x80
+#define BADV_UPD_CFO                    0x100
+#define BADV_TIME_CTRL                  0x800
+#define BUPD_CLKO                       0x1000
+#define BFC                             0x6000
+#define BTRACKING_MODE                  0x8000
+#define BPHCMP_ENABLE                   0x10000
+#define BUPD_CLKO_LTF                   0x20000
+#define BCOM_CH_CFO                     0x40000
+#define BCSI_ESTI_MODE                  0x80000
+#define BADV_UPD_EQZ                    0x100000
+#define BUCHCFG                         0x7000000
+#define BUPDEQZ                         0x8000000
+
+#define BRX_PESUDO_NOISE_ON         0x20000000
+#define BRX_PESUDO_NOISE_A              0xff
+#define BRX_PESUDO_NOISE_B              0xff00
+#define BRX_PESUDO_NOISE_C              0xff0000
+#define BRX_PESUDO_NOISE_D              0xff000000
+#define BRX_PESUDO_NOISESTATE_A     0xffff
+#define BRX_PESUDO_NOISESTATE_B     0xffff0000
+#define BRX_PESUDO_NOISESTATE_C     0xffff
+#define BRX_PESUDO_NOISESTATE_D     0xffff0000
+
+#define BZEBRA1_HSSIENABLE              0x8
+#define BZEBRA1_TRXCONTROL              0xc00
+#define BZEBRA1_TRXGAINSETTING          0x07f
+#define BZEBRA1_RXCOUNTER               0xc00
+#define BZEBRA1_TXCHANGEPUMP            0x38
+#define BZEBRA1_RXCHANGEPUMP            0x7
+#define BZEBRA1_CHANNEL_NUM             0xf80
+#define BZEBRA1_TXLPFBW                 0x400
+#define BZEBRA1_RXLPFBW                 0x600
+
+#define BRTL8256REG_MODE_CTRL1      0x100
+#define BRTL8256REG_MODE_CTRL0      0x40
+#define BRTL8256REG_TXLPFBW         0x18
+#define BRTL8256REG_RXLPFBW         0x600
+
+#define BRTL8258_TXLPFBW                0xc
+#define BRTL8258_RXLPFBW                0xc00
+#define BRTL8258_RSSILPFBW              0xc0
+
+#define BBYTE0                          0x1
+#define BBYTE1                          0x2
+#define BBYTE2                          0x4
+#define BBYTE3                          0x8
+#define BWORD0                          0x3
+#define BWORD1                          0xc
+#define BWORD                           0xf
+
+#define MASKBYTE0                       0xff
+#define MASKBYTE1                       0xff00
+#define MASKBYTE2                       0xff0000
+#define MASKBYTE3                       0xff000000
+#define MASKHWORD                       0xffff0000
+#define MASKLWORD                       0x0000ffff
+#define MASKDWORD                                       0xffffffff
+#define MASK12BITS                                      0xfff
+#define MASKH4BITS                                      0xf0000000
+#define MASKOFDM_D                                      0xffc00000
+#define MASKCCK                                         0x3f3f3f3f
+
+#define MASK4BITS                       0x0f
+#define MASK20BITS                      0xfffff
+#define RFREG_OFFSET_MASK                       0xfffff
+
+#define BENABLE                         0x1
+#define BDISABLE                        0x0
+
+#define LEFT_ANTENNA                    0x0
+#define RIGHT_ANTENNA                   0x1
+
+#define TCHECK_TXSTATUS                 500
+#define TUPDATE_RXCOUNTER               100
+
+#define REG_UN_used_register            0x01bf
 
 /* WOL bit information */
 #define HAL92C_WOL_PTK_UPDATE_EVENT             BIT(0)
 #define HAL92C_WOL_GTK_UPDATE_EVENT             BIT(1)
 #define HAL92C_WOL_DISASSOC_EVENT               BIT(2)
 #define HAL92C_WOL_DEAUTH_EVENT                 BIT(3)
-#define HAL92C_WOL_FW_DISCONNECT_EVENT          BIT(4)
+#define HAL92C_WOL_FW_DISCONNECT_EVENT  BIT(4)
 
 #define         WOL_REASON_PTK_UPDATE           BIT(0)
 #define         WOL_REASON_GTK_UPDATE           BIT(1)
-#define         WOL_REASON_DISASSOC             BIT(2)
-#define         WOL_REASON_DEAUTH               BIT(3)
+#define         WOL_REASON_DISASSOC                     BIT(2)
+#define         WOL_REASON_DEAUTH                       BIT(3)
 #define         WOL_REASON_FW_DISCONNECT        BIT(4)
-
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/rf.c b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.c
index 4faafdbab9c6..40893cef7dfe 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -34,6 +30,8 @@
 #include "rf.h"
 #include "dm.h"
 
+static bool _rtl88e_phy_rf6052_config_parafile(struct ieee80211_hw *hw);
+
 void rtl88e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -60,7 +58,7 @@ void rtl88e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
 }
 
 void rtl88e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
-                                       u8 *plevel)
+                                       u8 *ppowerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -82,32 +80,36 @@ void rtl88e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
 
                 if (turbo_scanoff) {
                         for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
-                                tx_agc[idx1] = plevel[idx1] |
-                                               (plevel[idx1] << 8) |
-                                               (plevel[idx1] << 16) |
-                                               (plevel[idx1] << 24);
+                                tx_agc[idx1] = ppowerlevel[idx1] |
+                                    (ppowerlevel[idx1] << 8) |
+                                    (ppowerlevel[idx1] << 16) |
+                                    (ppowerlevel[idx1] << 24);
                         }
                 }
         } else {
                 for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
-                        tx_agc[idx1] = plevel[idx1] | (plevel[idx1] << 8) |
-                                       (plevel[idx1] << 16) |
-                                       (plevel[idx1] << 24);
+                        tx_agc[idx1] = ppowerlevel[idx1] |
+                            (ppowerlevel[idx1] << 8) |
+                            (ppowerlevel[idx1] << 16) |
+                            (ppowerlevel[idx1] << 24);
                 }
 
                 if (rtlefuse->eeprom_regulatory == 0) {
-                        tmpval = (rtlphy->mcs_offset[0][6]) +
-                                 (rtlphy->mcs_offset[0][7] << 8);
+                        tmpval =
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][6]) +
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][7] <<
+                             8);
                         tx_agc[RF90_PATH_A] += tmpval;
 
-                        tmpval = (rtlphy->mcs_offset[0][14]) +
-                                 (rtlphy->mcs_offset[0][15] << 24);
+                        tmpval = (rtlphy->mcs_txpwrlevel_origoffset[0][14]) +
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][15] <<
+                             24);
                         tx_agc[RF90_PATH_B] += tmpval;
                 }
         }
 
         for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
-                ptr = (u8 *)(&(tx_agc[idx1]));
+                ptr = (u8 *)(&tx_agc[idx1]);
                 for (idx2 = 0; idx2 < 4; idx2++) {
                         if (*ptr > RF6052_MAX_TX_PWR)
                                 *ptr = RF6052_MAX_TX_PWR;
@@ -127,10 +129,12 @@ void rtl88e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                 "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_A_CCK1_MCS32);
+                 RTXAGC_A_CCK1_MCS32);
 
         tmpval = tx_agc[RF90_PATH_A] >> 8;
 
+        /*tmpval = tmpval & 0xff00ffff;*/
+
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
@@ -153,148 +157,180 @@ void rtl88e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
 }
 
 static void rtl88e_phy_get_power_base(struct ieee80211_hw *hw,
-                                      u8 *pwrlvlofdm, u8 *pwrlvlbw20,
-                                      u8 *pwrlvlbw40, u8 channel,
+                                      u8 *ppowerlevel_ofdm,
+                                      u8 *ppowerlevel_bw20,
+                                      u8 *ppowerlevel_bw40, u8 channel,
                                       u32 *ofdmbase, u32 *mcsbase)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        u32 base0, base1;
+        u32 powerbase0, powerbase1;
         u8 i, powerlevel[2];
 
         for (i = 0; i < 2; i++) {
-                base0 = pwrlvlofdm[i];
+                powerbase0 = ppowerlevel_ofdm[i];
 
-                base0 = (base0 << 24) | (base0 << 16) |
-                             (base0 << 8) | base0;
-                *(ofdmbase + i) = base0;
+                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));
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
+                         ((i == 0) ? 'A' : 'B'), *(ofdmbase + i));
         }
 
         for (i = 0; i < 2; i++) {
                 if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20)
-                        powerlevel[i] = pwrlvlbw20[i];
+                        powerlevel[i] = ppowerlevel_bw20[i];
                 else
-                        powerlevel[i] = pwrlvlbw40[i];
-                base1 = powerlevel[i];
-                base1 = (base1 << 24) |
-                    (base1 << 16) | (base1 << 8) | base1;
+                        powerlevel[i] = ppowerlevel_bw40[i];
 
-                *(mcsbase + i) = base1;
+                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));
+                        " [MCS power base index rf(%c) = 0x%x]\n",
+                         ((i == 0) ? 'A' : 'B'), *(mcsbase + i));
         }
 }
 
-static void get_txpwr_by_reg(struct ieee80211_hw *hw, u8 chan, u8 index,
-                             u32 *base0, u32 *base1, u32 *outval)
+static void _rtl88e_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
+                                                       u8 channel, u8 index,
+                                                       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, chg = 0, pwr_lim[4], pwr_diff = 0, cust_pwr_dif;
-        u32 writeval, cust_lim, rf, tmp;
-        u8 ch = chan - 1;
-        u8 j;
+        u8 i, chnlgroup = 0, pwr_diff_limit[4], pwr_diff = 0, customer_pwr_diff;
+        u32 writeval, customer_limit, rf;
 
         for (rf = 0; rf < 2; rf++) {
-                j = index + (rf ? 8 : 0);
-                tmp = ((index < 2) ? base0[rf] : base1[rf]);
                 switch (rtlefuse->eeprom_regulatory) {
                 case 0:
-                        chg = 0;
+                        chnlgroup = 0;
 
-                        writeval = rtlphy->mcs_offset[chg][j] + tmp;
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset
+                                [chnlgroup][index + (rf ? 8 : 0)]
+                            + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                "RTK better performance, "
-                                "writeval(%c) = 0x%x\n",
+                                "RTK better performance, writeval(%c) = 0x%x\n",
                                 ((rf == 0) ? 'A' : 'B'), writeval);
                         break;
                 case 1:
                         if (rtlphy->pwrgroup_cnt == 1) {
-                                chg = 0;
+                                chnlgroup = 0;
                         } else {
-                                chg = chan / 3;
-                                if (chan == 14)
-                                        chg = 5;
+                                if (channel < 3)
+                                        chnlgroup = 0;
+                                else if (channel < 6)
+                                        chnlgroup = 1;
+                                else if (channel < 9)
+                                        chnlgroup = 2;
+                                else if (channel < 12)
+                                        chnlgroup = 3;
+                                else if (channel < 14)
+                                        chnlgroup = 4;
+                                else if (channel == 14)
+                                        chnlgroup = 5;
                         }
-                        writeval = rtlphy->mcs_offset[chg][j] + tmp;
+
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
+                            [index + (rf ? 8 : 0)] + ((index < 2) ?
+                                                      powerbase0[rf] :
+                                                      powerbase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                 "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
                                  ((rf == 0) ? 'A' : 'B'), writeval);
+
                         break;
                 case 2:
-                        writeval = ((index < 2) ? base0[rf] : base1[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);
+                                ((rf == 0) ? 'A' : 'B'), writeval);
                         break;
                 case 3:
-                        chg = 0;
+                        chnlgroup = 0;
 
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                         "customer's limit, 40MHz rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht40[rf][ch]);
+                                        ((rf == 0) ? 'A' : 'B'),
+                                        rtlefuse->pwrgroup_ht40[rf][channel -
+                                                                    1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                         "customer's limit, 20MHz rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht20[rf][ch]);
+                                        ((rf == 0) ? 'A' : 'B'),
+                                        rtlefuse->pwrgroup_ht20[rf][channel -
+                                                                    1]);
                         }
 
                         if (index < 2)
-                                pwr_diff = rtlefuse->txpwr_legacyhtdiff[rf][ch];
+                                pwr_diff =
+                                   rtlefuse->txpwr_legacyhtdiff[rf][channel-1];
                         else if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20)
-                                pwr_diff = rtlefuse->txpwr_ht20diff[rf][ch];
+                                pwr_diff =
+                                        rtlefuse->txpwr_ht20diff[rf][channel-1];
 
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40)
-                                cust_pwr_dif = rtlefuse->pwrgroup_ht40[rf][ch];
+                                customer_pwr_diff =
+                                        rtlefuse->pwrgroup_ht40[rf][channel-1];
                         else
-                                cust_pwr_dif = rtlefuse->pwrgroup_ht20[rf][ch];
+                                customer_pwr_diff =
+                                        rtlefuse->pwrgroup_ht20[rf][channel-1];
 
-                        if (pwr_diff > cust_pwr_dif)
+                        if (pwr_diff > customer_pwr_diff)
                                 pwr_diff = 0;
                         else
-                                pwr_diff = cust_pwr_dif - pwr_diff;
+                                pwr_diff = customer_pwr_diff - pwr_diff;
 
                         for (i = 0; i < 4; i++) {
-                                pwr_lim[i] = (u8)((rtlphy->mcs_offset[chg][j] &
-                                             (0x7f << (i * 8))) >> (i * 8));
-
-                                if (pwr_lim[i] > pwr_diff)
-                                        pwr_lim[i] = pwr_diff;
+                                pwr_diff_limit[i] =
+                                    (u8)((rtlphy->mcs_txpwrlevel_origoffset
+                                          [chnlgroup][index +
+                                          (rf ? 8 : 0)] & (0x7f <<
+                                          (i * 8))) >> (i * 8));
+
+                                if (pwr_diff_limit[i] > pwr_diff)
+                                        pwr_diff_limit[i] = pwr_diff;
                         }
 
-                        cust_lim = (pwr_lim[3] << 24) | (pwr_lim[2] << 16) |
-                                   (pwr_lim[1] << 8) | (pwr_lim[0]);
+                        customer_limit = (pwr_diff_limit[3] << 24) |
+                            (pwr_diff_limit[2] << 16) |
+                            (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                 "Customer's limit rf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), cust_lim);
+                                 ((rf == 0) ? 'A' : 'B'), customer_limit);
 
-                        writeval = cust_lim + tmp;
+                        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:
-                        chg = 0;
-                        writeval = rtlphy->mcs_offset[chg][j] + tmp;
+                        chnlgroup = 0;
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
+                            [index + (rf ? 8 : 0)]
+                            + ((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;
                 }
 
@@ -302,12 +338,13 @@ static void get_txpwr_by_reg(struct ieee80211_hw *hw, u8 chan, u8 index,
                         writeval = writeval - 0x06060606;
                 else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
                          TXHIGHPWRLEVEL_BT2)
-                        writeval -= 0x0c0c0c0c;
-                *(outval + rf) = writeval;
+                        writeval = writeval - 0x0c0c0c0c;
+                *(p_outwriteval + rf) = writeval;
         }
 }
 
-static void write_ofdm_pwr(struct ieee80211_hw *hw, u8 index, u32 *pvalue)
+static void _rtl88e_write_ofdm_power_reg(struct ieee80211_hw *hw,
+                                         u8 index, u32 *value)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u16 regoffset_a[6] = {
@@ -325,16 +362,16 @@ static void write_ofdm_pwr(struct ieee80211_hw *hw, u8 index, u32 *pvalue)
         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))) >> (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) |
-                           (pwr_val[1] << 8) | pwr_val[0];
+                    (pwr_val[1] << 8) | pwr_val[0];
 
                 if (rf == 0)
                         regoffset = regoffset_a[index];
@@ -348,24 +385,27 @@ static void write_ofdm_pwr(struct ieee80211_hw *hw, u8 index, u32 *pvalue)
 }
 
 void rtl88e_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
-                                        u8 *pwrlvlofdm,
-                                        u8 *pwrlvlbw20,
-                                        u8 *pwrlvlbw40, u8 chan)
+                                        u8 *ppowerlevel_ofdm,
+                                        u8 *ppowerlevel_bw20,
+                                        u8 *ppowerlevel_bw40, u8 channel)
 {
-        u32 writeval[2], base0[2], base1[2];
+        u32 writeval[2], powerbase0[2], powerbase1[2];
         u8 index;
         u8 direction;
         u32 pwrtrac_value;
 
-        rtl88e_phy_get_power_base(hw, pwrlvlofdm, pwrlvlbw20,
-                                  pwrlvlbw40, chan, &base0[0],
-                                  &base1[0]);
+        rtl88e_phy_get_power_base(hw, ppowerlevel_ofdm,
+                                  ppowerlevel_bw20, ppowerlevel_bw40,
+                                  channel, &powerbase0[0], &powerbase1[0]);
 
         rtl88e_dm_txpower_track_adjust(hw, 1, &direction, &pwrtrac_value);
 
         for (index = 0; index < 6; index++) {
-                get_txpwr_by_reg(hw, chan, index, &base0[0], &base1[0],
-                                 &writeval[0]);
+                _rtl88e_get_txpower_writeval_by_regulatory(hw,
+                                                           channel, index,
+                                                           &powerbase0[0],
+                                                           &powerbase1[0],
+                                                           &writeval[0]);
                 if (direction == 1) {
                         writeval[0] += pwrtrac_value;
                         writeval[1] += pwrtrac_value;
@@ -373,15 +413,28 @@ void rtl88e_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
                         writeval[0] -= pwrtrac_value;
                         writeval[1] -= pwrtrac_value;
                 }
-                write_ofdm_pwr(hw, index, &writeval[0]);
+                _rtl88e_write_ofdm_power_reg(hw, index, &writeval[0]);
         }
 }
 
-static bool rf6052_conf_para(struct ieee80211_hw *hw)
+bool rtl88e_phy_rf6052_config(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        u32 u4val = 0;
+
+        if (rtlphy->rf_type == RF_1T1R)
+                rtlphy->num_total_rfpath = 1;
+        else
+                rtlphy->num_total_rfpath = 2;
+
+        return _rtl88e_phy_rf6052_config_parafile(hw);
+}
+
+static bool _rtl88e_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 u4_regvalue = 0;
         u8 rfpath;
         bool rtstatus = true;
         struct bb_reg_def *pphyreg;
@@ -392,12 +445,12 @@ static bool rf6052_conf_para(struct ieee80211_hw *hw)
                 switch (rfpath) {
                 case RF90_PATH_A:
                 case RF90_PATH_C:
-                        u4val = rtl_get_bbreg(hw, pphyreg->rfintfs,
+                        u4_regvalue = rtl_get_bbreg(hw, pphyreg->rfintfs,
                                                     BRFSI_RFENV);
                         break;
                 case RF90_PATH_B:
                 case RF90_PATH_D:
-                        u4val = rtl_get_bbreg(hw, pphyreg->rfintfs,
+                        u4_regvalue = rtl_get_bbreg(hw, pphyreg->rfintfs,
                                                     BRFSI_RFENV << 16);
                         break;
                 }
@@ -418,11 +471,11 @@ static bool rf6052_conf_para(struct ieee80211_hw *hw)
                 switch (rfpath) {
                 case RF90_PATH_A:
                         rtstatus = rtl88e_phy_config_rf_with_headerfile(hw,
-                                        (enum radio_path)rfpath);
+                                                (enum radio_path)rfpath);
                         break;
                 case RF90_PATH_B:
                         rtstatus = rtl88e_phy_config_rf_with_headerfile(hw,
-                                        (enum radio_path)rfpath);
+                                                (enum radio_path)rfpath);
                         break;
                 case RF90_PATH_C:
                         break;
@@ -433,12 +486,13 @@ static bool rf6052_conf_para(struct ieee80211_hw *hw)
                 switch (rfpath) {
                 case RF90_PATH_A:
                 case RF90_PATH_C:
-                        rtl_set_bbreg(hw, pphyreg->rfintfs, BRFSI_RFENV, u4val);
+                        rtl_set_bbreg(hw, pphyreg->rfintfs,
+                                      BRFSI_RFENV, u4_regvalue);
                         break;
                 case RF90_PATH_B:
                 case RF90_PATH_D:
-                        rtl_set_bbreg(hw, pphyreg->rfintfs, BRFSI_RFENV << 16,
-                                      u4val);
+                        rtl_set_bbreg(hw, pphyreg->rfintfs,
+                                      BRFSI_RFENV << 16, u4_regvalue);
                         break;
                 }
 
@@ -447,21 +501,9 @@ static bool rf6052_conf_para(struct ieee80211_hw *hw)
                                  "Radio[%d] Fail!!", rfpath);
                         return false;
                 }
+
         }
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "\n");
         return rtstatus;
 }
-
-bool rtl88e_phy_rf6052_config(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-
-        if (rtlphy->rf_type == RF_1T1R)
-                rtlphy->num_total_rfpath = 1;
-        else
-                rtlphy->num_total_rfpath = 2;
-
-        return rf6052_conf_para(hw);
-}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h
index a39a2a3dbcc9..5c1472d88fd4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/rf.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -40,7 +36,8 @@ void rtl88e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
 void rtl88e_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
                                         u8 *ppowerlevel_ofdm,
                                         u8 *ppowerlevel_bw20,
-                                        u8 *ppowerlevel_bw40, u8 channel);
+                                        u8 *ppowerlevel_bw40,
+                                        u8 channel);
 bool rtl88e_phy_rf6052_config(struct ieee80211_hw *hw);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c
index 631b6907c17d..11344121c55e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,7 +26,6 @@
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
-#include "../base.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -122,7 +117,7 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
                                   0);
 
         rtlpci->irq_mask[0] =
-                                (u32) (IMR_PSTIMEOUT    |
+                                (u32)(IMR_PSTIMEOUT     |
                                 IMR_HSISR_IND_ON_INT    |
                                 IMR_C2HCMD              |
                                 IMR_HIGHDOK             |
@@ -143,6 +138,8 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
+        if (rtlpriv->cfg->mod_params->disable_watchdog)
+                pr_info("watchdog disabled\n");
         if (!rtlpriv->psc.inactiveps)
                 pr_info("rtl8188ee: Power Save off (module option)\n");
         if (!rtlpriv->psc.fwctrl_lps)
@@ -162,7 +159,7 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
         /* for firmware buf */
-        rtlpriv->rtlhal.pfirmware = vmalloc(0x8000);
+        rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Can't alloc buffer for fw.\n");
@@ -199,7 +196,7 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
         init_timer(&rtlpriv->works.fast_antenna_training_timer);
         setup_timer(&rtlpriv->works.fast_antenna_training_timer,
                     rtl88e_dm_fast_antenna_training_callback,
-                    (unsigned long)hw);
+                        (unsigned long)hw);
         return err;
 }
 
@@ -218,6 +215,12 @@ void rtl88e_deinit_sw_vars(struct ieee80211_hw *hw)
         del_timer_sync(&rtlpriv->works.fast_antenna_training_timer);
 }
 
+/* get bt coexist status */
+bool rtl88e_get_btc_status(void)
+{
+        return false;
+}
+
 static struct rtl_hal_ops rtl8188ee_hal_ops = {
         .init_sw_vars = rtl88e_init_sw_vars,
         .deinit_sw_vars = rtl88e_deinit_sw_vars,
@@ -246,11 +249,12 @@ static struct rtl_hal_ops rtl8188ee_hal_ops = {
         .set_bw_mode = rtl88e_phy_set_bw_mode,
         .switch_channel = rtl88e_phy_sw_chnl,
         .dm_watchdog = rtl88e_dm_watchdog,
-        .scan_operation_backup = rtl_phy_scan_operation_backup,
+        .scan_operation_backup = rtl88e_phy_scan_operation_backup,
         .set_rf_power_state = rtl88e_phy_set_rf_power_state,
         .led_control = rtl88ee_led_control,
         .set_desc = rtl88ee_set_desc,
         .get_desc = rtl88ee_get_desc,
+        .is_tx_desc_closed = rtl88ee_is_tx_desc_closed,
         .tx_polling = rtl88ee_tx_polling,
         .enable_hw_sec = rtl88ee_enable_hw_security_config,
         .set_key = rtl88ee_set_key,
@@ -259,14 +263,17 @@ static struct rtl_hal_ops rtl8188ee_hal_ops = {
         .set_bbreg = rtl88e_phy_set_bb_reg,
         .get_rfreg = rtl88e_phy_query_rf_reg,
         .set_rfreg = rtl88e_phy_set_rf_reg,
+        .get_btc_status = rtl88e_get_btc_status,
+        .rx_command_packet = rtl88ee_rx_command_packet,
+
 };
 
 static struct rtl_mod_params rtl88ee_mod_params = {
         .sw_crypto = false,
-        .inactiveps = true,
+        .inactiveps = false,
         .swctrl_lps = false,
-        .fwctrl_lps = true,
-        .msi_support = false,
+        .fwctrl_lps = false,
+        .msi_support = true,
         .debug = DBG_EMERG,
 };
 
@@ -274,6 +281,7 @@ static struct rtl_hal_cfg rtl88ee_hal_cfg = {
         .bar_id = 2,
         .write_readback = true,
         .name = "rtl88e_pci",
+        .fw_name = "rtlwifi/rtl8188efw.bin",
         .ops = &rtl8188ee_hal_ops,
         .mod_params = &rtl88ee_mod_params,
 
@@ -285,6 +293,9 @@ static struct rtl_hal_cfg rtl88ee_hal_cfg = {
         .maps[MAC_RCR_ACRC32] = ACRC32,
         .maps[MAC_RCR_ACF] = ACF,
         .maps[MAC_RCR_AAP] = AAP,
+        .maps[MAC_HIMR] = REG_HIMR,
+        .maps[MAC_HIMRE] = REG_HIMRE,
+        .maps[MAC_HSISR] = REG_HSISR,
 
         .maps[EFUSE_ACCESS] = REG_EFUSE_ACCESS,
 
@@ -345,6 +356,7 @@ static struct rtl_hal_cfg rtl88ee_hal_cfg = {
         .maps[RTL_IMR_VIDOK] = IMR_VIDOK,
         .maps[RTL_IMR_VODOK] = IMR_VODOK,
         .maps[RTL_IMR_ROK] = IMR_ROK,
+        .maps[RTL_IMR_HSISR_IND] = IMR_HSISR_IND_ON_INT,
         .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNDMAINT0 | IMR_TBDOK | IMR_TBDER),
 
         .maps[RTL_RC_CCK_RATE1M] = DESC92C_RATE1M,
@@ -364,7 +376,7 @@ static struct rtl_hal_cfg rtl88ee_hal_cfg = {
         .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15,
 };
 
-static const struct pci_device_id rtl88ee_pci_ids[] = {
+static struct pci_device_id rtl88ee_pci_ids[] = {
         {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8179, rtl88ee_hal_cfg)},
         {},
 };
@@ -384,12 +396,15 @@ module_param_named(ips, rtl88ee_mod_params.inactiveps, bool, 0444);
 module_param_named(swlps, rtl88ee_mod_params.swctrl_lps, bool, 0444);
 module_param_named(fwlps, rtl88ee_mod_params.fwctrl_lps, bool, 0444);
 module_param_named(msi, rtl88ee_mod_params.msi_support, bool, 0444);
+module_param_named(disable_watchdog, rtl88ee_mod_params.disable_watchdog,
+                   bool, 0444);
 MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
 MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
 MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
-MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 0)\n");
+MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 1)\n");
 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");
 
 static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.h b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.h
index 85e02b3bdff8..22398c3753a6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -32,5 +28,7 @@
 
 int rtl88e_init_sw_vars(struct ieee80211_hw *hw);
 void rtl88e_deinit_sw_vars(struct ieee80211_hw *hw);
+bool rtl88e_get_btc_status(void);
+
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/table.c b/drivers/net/wireless/rtlwifi/rtl8188ee/table.c
index fad373f97b2c..68bcb7fe6a65 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/table.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,7 +26,6 @@
  *****************************************************************************/
 
 #include "table.h"
-
 u32 RTL8188EEPHY_REG_1TARRAY[] = {
                 0x800, 0x80040000,
                 0x804, 0x00000003,
@@ -640,4 +635,5 @@ u32 RTL8188EEAGCTAB_1TARRAY[] = {
                 0xC78, 0x407D0001,
                 0xC78, 0x407E0001,
                 0xC78, 0x407F0001,
+
 };
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/table.h b/drivers/net/wireless/rtlwifi/rtl8188ee/table.h
index c1218e835129..403c4ddd236f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/table.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -35,13 +31,13 @@
 #include <linux/types.h>
 #define  RTL8188EEPHY_REG_1TARRAYLEN    382
 extern u32 RTL8188EEPHY_REG_1TARRAY[];
-#define RTL8188EEPHY_REG_ARRAY_PGLEN    264
+#define RTL8188EEPHY_REG_ARRAY_PGLEN 264
 extern u32 RTL8188EEPHY_REG_ARRAY_PG[];
-#define RTL8188EE_RADIOA_1TARRAYLEN     190
+#define RTL8188EE_RADIOA_1TARRAYLEN 190
 extern u32 RTL8188EE_RADIOA_1TARRAY[];
-#define RTL8188EEMAC_1T_ARRAYLEN        180
+#define RTL8188EEMAC_1T_ARRAYLEN  180
 extern u32 RTL8188EEMAC_1T_ARRAY[];
-#define RTL8188EEAGCTAB_1TARRAYLEN      256
+#define RTL8188EEAGCTAB_1TARRAYLEN 256
 extern u32 RTL8188EEAGCTAB_1TARRAY[];
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
index 5b4c225396f2..df549c96adef 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -37,6 +33,7 @@
 #include "trx.h"
 #include "led.h"
 #include "dm.h"
+#include "phy.h"
 
 static u8 _rtl88ee_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
 {
@@ -50,6 +47,164 @@ static u8 _rtl88ee_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
         return skb->priority;
 }
 
+/* mac80211's rate_idx is like this:
+ *
+ * 2.4G band:rx_status->band == IEEE80211_BAND_2GHZ
+ *
+ * B/G rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC92C_RATE1M-->DESC92C_RATE54M ==> idx is 0-->11,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC92C_RATEMCS0-->DESC92C_RATEMCS15 ==> idx is 0-->15
+ *
+ * 5G band:rx_status->band == IEEE80211_BAND_5GHZ
+ * A rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC92C_RATE6M-->DESC92C_RATE54M ==> idx is 0-->7,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC92C_RATEMCS0-->DESC92C_RATEMCS15 ==> idx is 0-->15
+ */
+static int _rtl88ee_rate_mapping(struct ieee80211_hw *hw,
+                                 bool isht, u8 desc_rate)
+{
+        int rate_idx;
+
+        if (!isht) {
+                if (IEEE80211_BAND_2GHZ == hw->conf.chandef.chan->band) {
+                        switch (desc_rate) {
+                        case DESC92C_RATE1M:
+                                rate_idx = 0;
+                                break;
+                        case DESC92C_RATE2M:
+                                rate_idx = 1;
+                                break;
+                        case DESC92C_RATE5_5M:
+                                rate_idx = 2;
+                                break;
+                        case DESC92C_RATE11M:
+                                rate_idx = 3;
+                                break;
+                        case DESC92C_RATE6M:
+                                rate_idx = 4;
+                                break;
+                        case DESC92C_RATE9M:
+                                rate_idx = 5;
+                                break;
+                        case DESC92C_RATE12M:
+                                rate_idx = 6;
+                                break;
+                        case DESC92C_RATE18M:
+                                rate_idx = 7;
+                                break;
+                        case DESC92C_RATE24M:
+                                rate_idx = 8;
+                                break;
+                        case DESC92C_RATE36M:
+                                rate_idx = 9;
+                                break;
+                        case DESC92C_RATE48M:
+                                rate_idx = 10;
+                                break;
+                        case DESC92C_RATE54M:
+                                rate_idx = 11;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                } else {
+                        switch (desc_rate) {
+                        case DESC92C_RATE6M:
+                                rate_idx = 0;
+                                break;
+                        case DESC92C_RATE9M:
+                                rate_idx = 1;
+                                break;
+                        case DESC92C_RATE12M:
+                                rate_idx = 2;
+                                break;
+                        case DESC92C_RATE18M:
+                                rate_idx = 3;
+                                break;
+                        case DESC92C_RATE24M:
+                                rate_idx = 4;
+                                break;
+                        case DESC92C_RATE36M:
+                                rate_idx = 5;
+                                break;
+                        case DESC92C_RATE48M:
+                                rate_idx = 6;
+                                break;
+                        case DESC92C_RATE54M:
+                                rate_idx = 7;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                }
+        } else {
+                switch (desc_rate) {
+                case DESC92C_RATEMCS0:
+                        rate_idx = 0;
+                        break;
+                case DESC92C_RATEMCS1:
+                        rate_idx = 1;
+                        break;
+                case DESC92C_RATEMCS2:
+                        rate_idx = 2;
+                        break;
+                case DESC92C_RATEMCS3:
+                        rate_idx = 3;
+                        break;
+                case DESC92C_RATEMCS4:
+                        rate_idx = 4;
+                        break;
+                case DESC92C_RATEMCS5:
+                        rate_idx = 5;
+                        break;
+                case DESC92C_RATEMCS6:
+                        rate_idx = 6;
+                        break;
+                case DESC92C_RATEMCS7:
+                        rate_idx = 7;
+                        break;
+                case DESC92C_RATEMCS8:
+                        rate_idx = 8;
+                        break;
+                case DESC92C_RATEMCS9:
+                        rate_idx = 9;
+                        break;
+                case DESC92C_RATEMCS10:
+                        rate_idx = 10;
+                        break;
+                case DESC92C_RATEMCS11:
+                        rate_idx = 11;
+                        break;
+                case DESC92C_RATEMCS12:
+                        rate_idx = 12;
+                        break;
+                case DESC92C_RATEMCS13:
+                        rate_idx = 13;
+                        break;
+                case DESC92C_RATEMCS14:
+                        rate_idx = 14;
+                        break;
+                case DESC92C_RATEMCS15:
+                        rate_idx = 15;
+                        break;
+                default:
+                        rate_idx = 0;
+                        break;
+                }
+        }
+        return rate_idx;
+}
+
 static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
                         struct rtl_stats *pstatus, u8 *pdesc,
                         struct rx_fwinfo_88e *p_drvinfo,
@@ -59,7 +214,8 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
         struct phy_sts_cck_8192s_t *cck_buf;
-        struct phy_status_rpt *phystrpt = (struct phy_status_rpt *)p_drvinfo;
+        struct phy_status_rpt *phystrpt =
+                (struct phy_status_rpt *)p_drvinfo;
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
         char rx_pwr_all = 0, rx_pwr[4];
         u8 rf_rx_num = 0, evm, pwdb_all;
@@ -72,11 +228,11 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
         pstatus->packet_matchbssid = bpacket_match_bssid;
         pstatus->packet_toself = bpacket_toself;
         pstatus->packet_beacon = packet_beacon;
-        pstatus->rx_mimo_sig_qual[0] = -1;
-        pstatus->rx_mimo_sig_qual[1] = -1;
+        pstatus->rx_mimo_signalquality[0] = -1;
+        pstatus->rx_mimo_signalquality[1] = -1;
 
         if (is_cck) {
-                u8 cck_hipwr;
+                u8 cck_highpwr;
                 u8 cck_agc_rpt;
                 /* CCK Driver info Structure is not the same as OFDM packet. */
                 cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo;
@@ -87,53 +243,58 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
                  * hardware (for rate adaptive)
                  */
                 if (ppsc->rfpwr_state == ERFON)
-                        cck_hipwr = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2,
+                        cck_highpwr =
+                                (u8)rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2,
                                                   BIT(9));
                 else
-                        cck_hipwr = false;
+                        cck_highpwr = false;
 
                 lan_idx = ((cck_agc_rpt & 0xE0) >> 5);
                 vga_idx = (cck_agc_rpt & 0x1f);
                 switch (lan_idx) {
                 case 7:
                         if (vga_idx <= 27)
-                                rx_pwr_all = -100 + 2 * (27 - vga_idx);
+                                /*VGA_idx = 27~2*/
+                                rx_pwr_all = -100 + 2*(27-vga_idx);
                         else
                                 rx_pwr_all = -100;
                         break;
                 case 6:
-                        rx_pwr_all = -48 + 2 * (2 - vga_idx); /*VGA_idx = 2~0*/
+                        /*VGA_idx = 2~0*/
+                        rx_pwr_all = -48 + 2*(2-vga_idx);
                         break;
                 case 5:
-                        rx_pwr_all = -42 + 2 * (7 - vga_idx); /*VGA_idx = 7~5*/
+                        /*VGA_idx = 7~5*/
+                        rx_pwr_all = -42 + 2*(7-vga_idx);
                         break;
                 case 4:
-                        rx_pwr_all = -36 + 2 * (7 - vga_idx); /*VGA_idx = 7~4*/
+                        /*VGA_idx = 7~4*/
+                        rx_pwr_all = -36 + 2*(7-vga_idx);
                         break;
                 case 3:
-                        rx_pwr_all = -24 + 2 * (7 - vga_idx); /*VGA_idx = 7~0*/
+                        /*VGA_idx = 7~0*/
+                        rx_pwr_all = -24 + 2*(7-vga_idx);
                         break;
                 case 2:
-                        if (cck_hipwr)
-                                rx_pwr_all = -12 + 2 * (5 - vga_idx);
+                        if (cck_highpwr)
+                                /*VGA_idx = 5~0*/
+                                rx_pwr_all = -12 + 2*(5-vga_idx);
                         else
-                                rx_pwr_all = -6 + 2 * (5 - vga_idx);
+                                rx_pwr_all = -6 + 2*(5-vga_idx);
                         break;
                 case 1:
-                        rx_pwr_all = 8 - 2 * vga_idx;
+                        rx_pwr_all = 8-2*vga_idx;
                         break;
                 case 0:
-                        rx_pwr_all = 14 - 2 * vga_idx;
+                        rx_pwr_all = 14-2*vga_idx;
                         break;
                 default:
                         break;
                 }
                 rx_pwr_all += 6;
                 pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
-                /* CCK gain is smaller than OFDM/MCS gain,
-                 * so we add gain diff by experiences,
-                 * the val is 6
-                 */
+                /* CCK gain is smaller than OFDM/MCS gain,  */
+                /* so we add gain diff by experiences, the val is 6 */
                 pwdb_all += 6;
                 if (pwdb_all > 100)
                         pwdb_all = 100;
@@ -148,10 +309,10 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
                         pwdb_all -= 8;
                 else if (pwdb_all > 4 && pwdb_all <= 14)
                         pwdb_all -= 4;
-                if (cck_hipwr == false) {
+                if (!cck_highpwr) {
                         if (pwdb_all >= 80)
-                                pwdb_all = ((pwdb_all - 80)<<1) +
-                                           ((pwdb_all - 80)>>1) + 80;
+                                pwdb_all = ((pwdb_all-80)<<1) +
+                                           ((pwdb_all-80)>>1) + 80;
                         else if ((pwdb_all <= 78) && (pwdb_all >= 20))
                                 pwdb_all += 3;
                         if (pwdb_all > 100)
@@ -165,9 +326,9 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
                 if (bpacket_match_bssid) {
                         u8 sq;
 
-                        if (pstatus->rx_pwdb_all > 40) {
+                        if (pstatus->rx_pwdb_all > 40)
                                 sq = 100;
-                        } else {
+                        else {
                                 sq = cck_buf->sq_rpt;
                                 if (sq > 64)
                                         sq = 0;
@@ -178,8 +339,8 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
                         }
 
                         pstatus->signalquality = sq;
-                        pstatus->rx_mimo_sig_qual[0] = sq;
-                        pstatus->rx_mimo_sig_qual[1] = -1;
+                        pstatus->rx_mimo_signalquality[0] = sq;
+                        pstatus->rx_mimo_signalquality[1] = -1;
                 }
         } else {
                 rtlpriv->dm.rfpath_rxenable[0] =
@@ -191,18 +352,20 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
                         if (rtlpriv->dm.rfpath_rxenable[i])
                                 rf_rx_num++;
 
-                        rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f) * 2)-110;
+                        rx_pwr[i] = ((p_drvinfo->gain_trsw[i] &
+                                      0x3f) * 2) - 110;
 
                         /* Translate DBM to percentage. */
                         rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
                         total_rssi += rssi;
 
                         /* Get Rx snr value in DB */
-                        rtlpriv->stats.rx_snr_db[i] = p_drvinfo->rxsnr[i] / 2;
+                        rtlpriv->stats.rx_snr_db[i] =
+                                (long)(p_drvinfo->rxsnr[i] / 2);
 
                         /* Record Signal Strength for next packet */
                         if (bpacket_match_bssid)
-                                pstatus->rx_mimo_signalstrength[i] = (u8) rssi;
+                                pstatus->rx_mimo_signalstrength[i] = (u8)rssi;
                 }
 
                 /* (2)PWDB, Average PWDB cacluated by
@@ -227,11 +390,13 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
 
                         if (bpacket_match_bssid) {
                                 /* Fill value in RFD, Get the first
-                                 * spatial stream only
+                                 * spatial stream onlyi
                                  */
                                 if (i == 0)
-                                        pstatus->signalquality = evm & 0xff;
-                                pstatus->rx_mimo_sig_qual[i] = evm & 0xff;
+                                        pstatus->signalquality =
+                                                (u8)(evm & 0xff);
+                                pstatus->rx_mimo_signalquality[i] =
+                                        (u8)(evm & 0xff);
                         }
                 }
         }
@@ -241,10 +406,10 @@ static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
          */
         if (is_cck)
                 pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
-                                          pwdb_all));
+                        pwdb_all));
         else if (rf_rx_num != 0)
                 pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
-                                          total_rssi /= rf_rx_num));
+                        total_rssi /= rf_rx_num));
         /*HW antenna diversity*/
         rtldm->fat_table.antsel_rx_keep_0 = phystrpt->ant_sel;
         rtldm->fat_table.antsel_rx_keep_1 = phystrpt->ant_sel_b;
@@ -256,34 +421,39 @@ static void _rtl88ee_smart_antenna(struct ieee80211_hw *hw,
 {
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-        u8 ant_mux;
-        struct fast_ant_training *pfat = &(rtldm->fat_table);
+        u8 antsel_tr_mux;
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
 
         if (rtlefuse->antenna_div_type == CG_TRX_SMART_ANTDIV) {
-                if (pfat->fat_state == FAT_TRAINING_STATE) {
+                if (pfat_table->fat_state == FAT_TRAINING_STATE) {
                         if (pstatus->packet_toself) {
-                                ant_mux = (pfat->antsel_rx_keep_2 << 2) |
-                                                (pfat->antsel_rx_keep_1 << 1) |
-                                                 pfat->antsel_rx_keep_0;
-                                pfat->ant_sum[ant_mux] += pstatus->rx_pwdb_all;
-                                pfat->ant_cnt[ant_mux]++;
+                                antsel_tr_mux =
+                                        (pfat_table->antsel_rx_keep_2 << 2) |
+                                        (pfat_table->antsel_rx_keep_1 << 1) |
+                                        pfat_table->antsel_rx_keep_0;
+                                pfat_table->ant_sum[antsel_tr_mux] +=
+                                        pstatus->rx_pwdb_all;
+                                pfat_table->ant_cnt[antsel_tr_mux]++;
                         }
                 }
         } else if ((rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) ||
-                   (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)) {
+        (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)) {
                 if (pstatus->packet_toself || pstatus->packet_matchbssid) {
-                        ant_mux = (pfat->antsel_rx_keep_2 << 2) |
-                                  (pfat->antsel_rx_keep_1 << 1) |
-                                   pfat->antsel_rx_keep_0;
-                        rtl88e_dm_ant_sel_statistics(hw, ant_mux, 0,
+                        antsel_tr_mux = (pfat_table->antsel_rx_keep_2 << 2) |
+                                        (pfat_table->antsel_rx_keep_1 << 1) |
+                                        pfat_table->antsel_rx_keep_0;
+                        rtl88e_dm_ant_sel_statistics(hw, antsel_tr_mux, 0,
                                                      pstatus->rx_pwdb_all);
                 }
+
         }
 }
 
 static void _rtl88ee_translate_rx_signal_stuff(struct ieee80211_hw *hw,
-                struct sk_buff *skb, struct rtl_stats *pstatus,
-                u8 *pdesc, struct rx_fwinfo_88e *p_drvinfo)
+                                               struct sk_buff *skb,
+                                               struct rtl_stats *pstatus,
+                                               u8 *pdesc,
+                                               struct rx_fwinfo_88e *p_drvinfo)
 {
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
@@ -292,42 +462,42 @@ static void _rtl88ee_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         u8 *praddr;
         u8 *psaddr;
         __le16 fc;
-        u16 type, ufc;
-        bool match_bssid, packet_toself, packet_beacon = false, addr;
+        bool packet_matchbssid, packet_toself, packet_beacon;
 
         tmp_buf = skb->data + pstatus->rx_drvinfo_size + pstatus->rx_bufshift;
 
         hdr = (struct ieee80211_hdr *)tmp_buf;
         fc = hdr->frame_control;
-        ufc = le16_to_cpu(fc);
-        type = WLAN_FC_GET_TYPE(fc);
         praddr = hdr->addr1;
         psaddr = ieee80211_get_SA(hdr);
         memcpy(pstatus->psaddr, psaddr, ETH_ALEN);
 
-        addr = ether_addr_equal(mac->bssid,
-                                (ufc & IEEE80211_FCTL_TODS) ? hdr->addr1 :
-                                (ufc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
-                                hdr->addr3);
-        match_bssid = ((IEEE80211_FTYPE_CTL != type) && (!pstatus->hwerror) &&
-                       (!pstatus->crc) && (!pstatus->icv)) && addr;
+        packet_matchbssid = ((!ieee80211_is_ctl(fc)) &&
+             (ether_addr_equal(mac->bssid, ieee80211_has_tods(fc) ?
+                               hdr->addr1 : ieee80211_has_fromds(fc) ?
+                               hdr->addr2 : hdr->addr3)) &&
+                               (!pstatus->hwerror) &&
+                               (!pstatus->crc) && (!pstatus->icv));
 
-        addr = ether_addr_equal(praddr, rtlefuse->dev_addr);
-        packet_toself = match_bssid && addr;
+        packet_toself = packet_matchbssid &&
+            (ether_addr_equal(praddr, rtlefuse->dev_addr));
 
-        if (ieee80211_is_beacon(fc))
+        if (ieee80211_is_beacon(hdr->frame_control))
                 packet_beacon = true;
+        else
+                packet_beacon = false;
 
         _rtl88ee_query_rxphystatus(hw, pstatus, pdesc, p_drvinfo,
-                                   match_bssid, packet_toself, packet_beacon);
+                                   packet_matchbssid, packet_toself,
+                                   packet_beacon);
         _rtl88ee_smart_antenna(hw, pstatus);
         rtl_process_phyinfo(hw, tmp_buf, pstatus);
 }
 
-static void insert_em(struct rtl_tcb_desc *ptcb_desc, u8 *virtualaddress)
+static void _rtl88ee_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
+                                      u8 *virtualaddress)
 {
         u32 dwtmp = 0;
-
         memset(virtualaddress, 0, 8);
 
         SET_EARLYMODE_PKTNUM(virtualaddress, ptcb_desc->empkt_num);
@@ -335,7 +505,7 @@ static void insert_em(struct rtl_tcb_desc *ptcb_desc, u8 *virtualaddress)
                 dwtmp = ptcb_desc->empkt_len[0];
         } else {
                 dwtmp = ptcb_desc->empkt_len[0];
-                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ((dwtmp%4) ? (4-dwtmp%4) : 0)+4;
                 dwtmp += ptcb_desc->empkt_len[1];
         }
         SET_EARLYMODE_LEN0(virtualaddress, dwtmp);
@@ -344,7 +514,7 @@ static void insert_em(struct rtl_tcb_desc *ptcb_desc, u8 *virtualaddress)
                 dwtmp = ptcb_desc->empkt_len[2];
         } else {
                 dwtmp = ptcb_desc->empkt_len[2];
-                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ((dwtmp%4) ? (4-dwtmp%4) : 0)+4;
                 dwtmp += ptcb_desc->empkt_len[3];
         }
         SET_EARLYMODE_LEN1(virtualaddress, dwtmp);
@@ -352,7 +522,7 @@ static void insert_em(struct rtl_tcb_desc *ptcb_desc, u8 *virtualaddress)
                 dwtmp = ptcb_desc->empkt_len[4];
         } else {
                 dwtmp = ptcb_desc->empkt_len[4];
-                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ((dwtmp%4) ? (4-dwtmp%4) : 0)+4;
                 dwtmp += ptcb_desc->empkt_len[5];
         }
         SET_EARLYMODE_LEN2_1(virtualaddress, dwtmp & 0xF);
@@ -361,7 +531,7 @@ static void insert_em(struct rtl_tcb_desc *ptcb_desc, u8 *virtualaddress)
                 dwtmp = ptcb_desc->empkt_len[6];
         } else {
                 dwtmp = ptcb_desc->empkt_len[6];
-                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ((dwtmp%4) ? (4-dwtmp%4) : 0)+4;
                 dwtmp += ptcb_desc->empkt_len[7];
         }
         SET_EARLYMODE_LEN3(virtualaddress, dwtmp);
@@ -369,7 +539,7 @@ static void insert_em(struct rtl_tcb_desc *ptcb_desc, u8 *virtualaddress)
                 dwtmp = ptcb_desc->empkt_len[8];
         } else {
                 dwtmp = ptcb_desc->empkt_len[8];
-                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ((dwtmp%4) ? (4-dwtmp%4) : 0)+4;
                 dwtmp += ptcb_desc->empkt_len[9];
         }
         SET_EARLYMODE_LEN4(virtualaddress, dwtmp);
@@ -387,21 +557,21 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
         u32 phystatus = GET_RX_DESC_PHYST(pdesc);
         status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);
         if (status->packet_report_type == TX_REPORT2)
-                status->length = (u16) GET_RX_RPT2_DESC_PKT_LEN(pdesc);
+                status->length = (u16)GET_RX_RPT2_DESC_PKT_LEN(pdesc);
         else
-                status->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
-        status->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
-                                       RX_DRV_INFO_SIZE_UNIT;
-        status->rx_bufshift = (u8) (GET_RX_DESC_SHIFT(pdesc) & 0x03);
-        status->icv = (u16) GET_RX_DESC_ICV(pdesc);
-        status->crc = (u16) GET_RX_DESC_CRC32(pdesc);
+                status->length = (u16)GET_RX_DESC_PKT_LEN(pdesc);
+        status->rx_drvinfo_size = (u8)GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
+            RX_DRV_INFO_SIZE_UNIT;
+        status->rx_bufshift = (u8)(GET_RX_DESC_SHIFT(pdesc) & 0x03);
+        status->icv = (u16)GET_RX_DESC_ICV(pdesc);
+        status->crc = (u16)GET_RX_DESC_CRC32(pdesc);
         status->hwerror = (status->crc | status->icv);
         status->decrypted = !GET_RX_DESC_SWDEC(pdesc);
-        status->rate = (u8) GET_RX_DESC_RXMCS(pdesc);
-        status->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);
+        status->rate = (u8)GET_RX_DESC_RXMCS(pdesc);
+        status->shortpreamble = (u16)GET_RX_DESC_SPLCP(pdesc);
         status->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);
-        status->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1) &&
-                                        (GET_RX_DESC_FAGGR(pdesc) == 1));
+        status->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1) &&
+                                (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);
@@ -420,11 +590,14 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
                 status->wake_match = 0;
         if (status->wake_match)
                 RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,
-                         "Get Wakeup Packet!! WakeMatch =%d\n",
-                         status->wake_match);
+                "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",
+                status->wake_match);
         rx_status->freq = hw->conf.chandef.chan->center_freq;
         rx_status->band = hw->conf.chandef.chan->band;
 
+        hdr = (struct ieee80211_hdr *)(skb->data + status->rx_drvinfo_size
+                        + status->rx_bufshift);
+
         if (status->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
@@ -445,18 +618,11 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (status->decrypted) {
-                hdr = (struct ieee80211_hdr *)(skb->data +
-                       status->rx_drvinfo_size + status->rx_bufshift);
-
-                if (!hdr) {
-                        /* During testing, hdr was NULL */
-                        return false;
-                }
-                if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
+                if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
-                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
-                else
                         rx_status->flag |= RX_FLAG_DECRYPTED;
+                else
+                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
         }
 
         /* rate_idx: index of data rate into band's
@@ -464,19 +630,18 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
          * are use (RX_FLAG_HT)
          * Notice: this is diff with windows define
          */
-        rx_status->rate_idx = rtlwifi_rate_mapping(hw, status->is_ht,
-                                                   status->rate, false);
+        rx_status->rate_idx = _rtl88ee_rate_mapping(hw,
+                                status->is_ht, status->rate);
 
         rx_status->mactime = status->timestamp_low;
         if (phystatus == true) {
                 p_drvinfo = (struct rx_fwinfo_88e *)(skb->data +
                                                      status->rx_bufshift);
 
-                _rtl88ee_translate_rx_signal_stuff(hw, skb, status, pdesc,
+                _rtl88ee_translate_rx_signal_stuff(hw,
+                                                   skb, status, pdesc,
                                                    p_drvinfo);
         }
-
-        /*rx_status->qual = status->signal; */
         rx_status->signal = status->recvsignalpower + 10;
         if (status->packet_report_type == TX_REPORT2) {
                 status->macid_valid_entry[0] =
@@ -489,15 +654,17 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
 
 void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                           struct ieee80211_hdr *hdr, u8 *pdesc_tx,
-                          u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
-                          struct ieee80211_sta *sta, struct sk_buff *skb,
+                          u8 *txbd, struct ieee80211_tx_info *info,
+                          struct ieee80211_sta *sta,
+                          struct sk_buff *skb,
                           u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)
+
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        u8 *pdesc = pdesc_tx;
+        u8 *pdesc = (u8 *)pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         unsigned int buf_len = 0;
@@ -547,8 +714,9 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                         if (ptcb_desc->empkt_num) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
                                          "Insert 8 byte.pTcb->EMPktNum:%d\n",
-                                         ptcb_desc->empkt_num);
-                                insert_em(ptcb_desc, (u8 *)(skb->data));
+                                          ptcb_desc->empkt_num);
+                                _rtl88ee_insert_emcontent(ptcb_desc,
+                                                          (u8 *)(skb->data));
                         }
                 } else {
                         SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
@@ -560,6 +728,7 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                         short_gi = (ptcb_desc->use_shortgi) ? 1 : 0;
                 else
                         short_gi = (ptcb_desc->use_shortpreamble) ? 1 : 0;
+
                 SET_TX_DESC_DATA_SHORTGI(pdesc, short_gi);
 
                 if (info->flags & IEEE80211_TX_CTL_AMPDU) {
@@ -568,7 +737,7 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                 }
                 SET_TX_DESC_SEQ(pdesc, seq_number);
                 SET_TX_DESC_RTS_ENABLE(pdesc, ((ptcb_desc->rts_enable &&
-                                              !ptcb_desc->cts_enable) ? 1 : 0));
+                                                !ptcb_desc->cts_enable) ? 1 : 0));
                 SET_TX_DESC_HW_RTS_ENABLE(pdesc, 0);
                 SET_TX_DESC_CTS2SELF(pdesc, ((ptcb_desc->cts_enable) ? 1 : 0));
                 SET_TX_DESC_RTS_STBC(pdesc, ((ptcb_desc->rts_stbc) ? 1 : 0));
@@ -581,17 +750,17 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                         (ptcb_desc->rts_use_shortpreamble ? 1 : 0) :
                         (ptcb_desc->rts_use_shortgi ? 1 : 0)));
 
-                if (ptcb_desc->btx_enable_sw_calc_duration)
+                if (ptcb_desc->tx_enable_sw_calc_duration)
                         SET_TX_DESC_NAV_USE_HDR(pdesc, 1);
 
                 if (bw_40) {
-                        if (ptcb_desc->packet_bw) {
+                        if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) {
                                 SET_TX_DESC_DATA_BW(pdesc, 1);
                                 SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);
                         } else {
                                 SET_TX_DESC_DATA_BW(pdesc, 0);
                                 SET_TX_DESC_TX_SUB_CARRIER(pdesc,
-                                                   mac->cur_40_prime_sc);
+                                                           mac->cur_40_prime_sc);
                         }
                 } else {
                         SET_TX_DESC_DATA_BW(pdesc, 0);
@@ -599,13 +768,14 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                 }
 
                 SET_TX_DESC_LINIP(pdesc, 0);
-                SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb_len);
+                SET_TX_DESC_PKT_SIZE(pdesc, (u16)skb_len);
                 if (sta) {
                         u8 ampdu_density = sta->ht_cap.ampdu_density;
                         SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);
                 }
                 if (info->control.hw_key) {
                         struct ieee80211_key_conf *keyconf;
+
                         keyconf = info->control.hw_key;
                         switch (keyconf->cipher) {
                         case WLAN_CIPHER_SUITE_WEP40:
@@ -619,6 +789,7 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                         default:
                                 SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
                                 break;
+
                         }
                 }
 
@@ -629,6 +800,7 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                                        1 : 0);
                 SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
 
+                /*SET_TX_DESC_PWR_STATUS(pdesc, pwr_status);*/
                 /* Set TxRate and RTSRate in TxDesc  */
                 /* This prevent Tx initial rate of new-coming packets */
                 /* from being overwritten by retried  packet rate.*/
@@ -639,7 +811,7 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                 if (ieee80211_is_data_qos(fc)) {
                         if (mac->rdg_en) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                                         "Enable RDG function.\n");
+                                        "Enable RDG function.\n");
                                 SET_TX_DESC_RDG_ENABLE(pdesc, 1);
                                 SET_TX_DESC_HTC(pdesc, 1);
                         }
@@ -648,7 +820,7 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
 
         SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
         SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
-        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) buf_len);
+        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)buf_len);
         SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
         if (rtlpriv->dm.useramask) {
                 SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
@@ -664,8 +836,9 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_HWSEQ_EN(pdesc, 1);
         SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
         if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||
-            is_broadcast_ether_addr(ieee80211_get_DA(hdr)))
+            is_broadcast_ether_addr(ieee80211_get_DA(hdr))) {
                 SET_TX_DESC_BMC(pdesc, 1);
+        }
 
         rtl88e_dm_set_tx_ant_by_tx_info(hw, pdesc, ptcb_desc->mac_id);
         RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
@@ -733,8 +906,8 @@ void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw,
                       pdesc, TX_DESC_SIZE);
 }
 
-void rtl88ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
-                      u8 desc_name, u8 *val)
+void rtl88ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
+                      bool istx, u8 desc_name, u8 *val)
 {
         if (istx == true) {
                 switch (desc_name) {
@@ -745,7 +918,7 @@ void rtl88ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
                         SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *)val);
                         break;
                 default:
-                        RT_ASSERT(false, "ERR txdesc :%d not processed\n",
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
                                   desc_name);
                         break;
                 }
@@ -764,7 +937,7 @@ void rtl88ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
                         SET_RX_DESC_EOR(pdesc, 1);
                         break;
                 default:
-                        RT_ASSERT(false, "ERR rxdesc :%d not processed\n",
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
                                   desc_name);
                         break;
                 }
@@ -784,7 +957,7 @@ u32 rtl88ee_get_desc(u8 *pdesc, bool istx, u8 desc_name)
                         ret = GET_TX_DESC_TX_BUFFER_ADDRESS(pdesc);
                         break;
                 default:
-                        RT_ASSERT(false, "ERR txdesc :%d not processed\n",
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
                                   desc_name);
                         break;
                 }
@@ -796,8 +969,11 @@ u32 rtl88ee_get_desc(u8 *pdesc, bool istx, u8 desc_name)
                 case HW_DESC_RXPKT_LEN:
                         ret = GET_RX_DESC_PKT_LEN(pdesc);
                         break;
+                case HW_DESC_RXBUFF_ADDR:
+                        ret = GET_RX_DESC_BUFF_ADDR(pdesc);
+                        break;
                 default:
-                        RT_ASSERT(false, "ERR rxdesc :%d not processed\n",
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
                                   desc_name);
                         break;
                 }
@@ -805,6 +981,22 @@ u32 rtl88ee_get_desc(u8 *pdesc, bool istx, u8 desc_name)
         return ret;
 }
 
+bool rtl88ee_is_tx_desc_closed(struct ieee80211_hw *hw, u8 hw_queue, u16 index)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue];
+        u8 *entry = (u8 *)(&ring->desc[ring->idx]);
+        u8 own = (u8)rtl88ee_get_desc(entry, true, HW_DESC_OWN);
+
+        /*beacon packet will only use the first
+         *descriptor defautly,and the own may not
+         *be cleared by the hardware
+         */
+        if (own)
+                return false;
+        return true;
+}
+
 void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -815,3 +1007,10 @@ void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
                                BIT(0) << (hw_queue));
         }
 }
+
+u32 rtl88ee_rx_command_packet(struct ieee80211_hw *hw,
+                              struct rtl_stats status,
+                              struct sk_buff *skb)
+{
+        return 0;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.h b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.h
index 8c2609412d2c..eab5ae0eb46c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,59 +26,59 @@
 #ifndef __RTL92CE_TRX_H__
 #define __RTL92CE_TRX_H__
 
-#define TX_DESC_SIZE                            64
+#define TX_DESC_SIZE                                    64
 #define TX_DESC_AGGR_SUBFRAME_SIZE              32
 
-#define RX_DESC_SIZE                            32
+#define RX_DESC_SIZE                                    32
 #define RX_DRV_INFO_SIZE_UNIT                   8
 
 #define TX_DESC_NEXT_DESC_OFFSET                40
 #define USB_HWDESC_HEADER_LEN                   32
-#define CRCLENGTH                               4
+#define CRCLENGTH                                               4
 
 #define SET_TX_DESC_PKT_SIZE(__pdesc, __val)            \
         SET_BITS_TO_LE_4BYTE(__pdesc, 0, 16, __val)
-#define SET_TX_DESC_OFFSET(__pdesc, __val)              \
+#define SET_TX_DESC_OFFSET(__pdesc, __val)                      \
         SET_BITS_TO_LE_4BYTE(__pdesc, 16, 8, __val)
-#define SET_TX_DESC_BMC(__pdesc, __val)                 \
+#define SET_TX_DESC_BMC(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc, 24, 1, __val)
-#define SET_TX_DESC_HTC(__pdesc, __val)                 \
+#define SET_TX_DESC_HTC(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc, 25, 1, __val)
 #define SET_TX_DESC_LAST_SEG(__pdesc, __val)            \
         SET_BITS_TO_LE_4BYTE(__pdesc, 26, 1, __val)
 #define SET_TX_DESC_FIRST_SEG(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val)
-#define SET_TX_DESC_LINIP(__pdesc, __val)               \
+#define SET_TX_DESC_LINIP(__pdesc, __val)                       \
         SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val)
-#define SET_TX_DESC_NO_ACM(__pdesc, __val)              \
+#define SET_TX_DESC_NO_ACM(__pdesc, __val)                      \
         SET_BITS_TO_LE_4BYTE(__pdesc, 29, 1, __val)
-#define SET_TX_DESC_GF(__pdesc, __val)                  \
+#define SET_TX_DESC_GF(__pdesc, __val)                          \
         SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
-#define SET_TX_DESC_OWN(__pdesc, __val)                 \
+#define SET_TX_DESC_OWN(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
 
-#define GET_TX_DESC_PKT_SIZE(__pdesc)                   \
+#define GET_TX_DESC_PKT_SIZE(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc, 0, 16)
-#define GET_TX_DESC_OFFSET(__pdesc)                     \
+#define GET_TX_DESC_OFFSET(__pdesc)                                     \
         LE_BITS_TO_4BYTE(__pdesc, 16, 8)
-#define GET_TX_DESC_BMC(__pdesc)                        \
+#define GET_TX_DESC_BMC(__pdesc)                                        \
         LE_BITS_TO_4BYTE(__pdesc, 24, 1)
-#define GET_TX_DESC_HTC(__pdesc)                        \
+#define GET_TX_DESC_HTC(__pdesc)                                        \
         LE_BITS_TO_4BYTE(__pdesc, 25, 1)
-#define GET_TX_DESC_LAST_SEG(__pdesc)                   \
+#define GET_TX_DESC_LAST_SEG(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc, 26, 1)
-#define GET_TX_DESC_FIRST_SEG(__pdesc)                  \
+#define GET_TX_DESC_FIRST_SEG(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc, 27, 1)
-#define GET_TX_DESC_LINIP(__pdesc)                      \
+#define GET_TX_DESC_LINIP(__pdesc)                                      \
         LE_BITS_TO_4BYTE(__pdesc, 28, 1)
-#define GET_TX_DESC_NO_ACM(__pdesc)                     \
+#define GET_TX_DESC_NO_ACM(__pdesc)                                     \
         LE_BITS_TO_4BYTE(__pdesc, 29, 1)
-#define GET_TX_DESC_GF(__pdesc)                         \
+#define GET_TX_DESC_GF(__pdesc)                                         \
         LE_BITS_TO_4BYTE(__pdesc, 30, 1)
-#define GET_TX_DESC_OWN(__pdesc)                        \
+#define GET_TX_DESC_OWN(__pdesc)                                        \
         LE_BITS_TO_4BYTE(__pdesc, 31, 1)
 
-#define SET_TX_DESC_MACID(__pdesc, __val)               \
+#define SET_TX_DESC_MACID(__pdesc, __val)                       \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 6, __val)
 #define SET_TX_DESC_QUEUE_SEL(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val)
@@ -90,11 +86,11 @@
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 13, 1, __val)
 #define SET_TX_DESC_LSIG_TXOP_EN(__pdesc, __val)        \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 14, 1, __val)
-#define SET_TX_DESC_PIFS(__pdesc, __val)                \
+#define SET_TX_DESC_PIFS(__pdesc, __val)                        \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 15, 1, __val)
 #define SET_TX_DESC_RATE_ID(__pdesc, __val)             \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 4, __val)
-#define SET_TX_DESC_NAV_USE_HDR(__pdesc, __val) \
+#define SET_TX_DESC_NAV_USE_HDR(__pdesc, __val)         \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 20, 1, __val)
 #define SET_TX_DESC_EN_DESC_ID(__pdesc, __val)          \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 21, 1, __val)
@@ -102,10 +98,10 @@
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 22, 2, __val)
 #define SET_TX_DESC_PKT_OFFSET(__pdesc, __val)          \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 26, 5, __val)
-#define SET_TX_DESC_PADDING_LEN(__pdesc, __val)         \
+#define SET_TX_DESC_PADDING_LEN(__pdesc, __val)                 \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 24, 8, __val)
 
-#define GET_TX_DESC_MACID(__pdesc)                              \
+#define GET_TX_DESC_MACID(__pdesc)                                      \
         LE_BITS_TO_4BYTE(__pdesc+4, 0, 5)
 #define GET_TX_DESC_AGG_ENABLE(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+4, 5, 1)
@@ -119,7 +115,7 @@
         LE_BITS_TO_4BYTE(__pdesc+4, 13, 1)
 #define GET_TX_DESC_LSIG_TXOP_EN(__pdesc)                       \
         LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
-#define GET_TX_DESC_PIFS(__pdesc)                               \
+#define GET_TX_DESC_PIFS(__pdesc)                                       \
         LE_BITS_TO_4BYTE(__pdesc+4, 15, 1)
 #define GET_TX_DESC_RATE_ID(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+4, 16, 4)
@@ -205,7 +201,6 @@
 #define SET_TX_DESC_HWSEQ_EN(__pdesc, __val)                    \
         SET_BITS_TO_LE_4BYTE(__pdesc+12, 31, 1, __val)
 
-
 #define GET_TX_DESC_NEXT_HEAP_PAGE(__pdesc)             \
         LE_BITS_TO_4BYTE(__pdesc+12, 0, 8)
 #define GET_TX_DESC_TAIL_PAGE(__pdesc)                          \
@@ -213,7 +208,6 @@
 #define GET_TX_DESC_SEQ(__pdesc)                                        \
         LE_BITS_TO_4BYTE(__pdesc+12, 16, 12)
 
-
 #define SET_TX_DESC_RTS_RATE(__pdesc, __val)            \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 5, __val)
 #define SET_TX_DESC_AP_DCFE(__pdesc, __val)             \
@@ -386,7 +380,6 @@
 #define GET_TX_DESC_TX_BUFFER_SIZE(__pdesc)             \
         LE_BITS_TO_4BYTE(__pdesc+28, 0, 16)
 
-
 #define SET_TX_DESC_TX_BUFFER_ADDRESS(__pdesc, __val)   \
         SET_BITS_TO_LE_4BYTE(__pdesc+32, 0, 32, __val)
 #define SET_TX_DESC_TX_BUFFER_ADDRESS64(__pdesc, __val) \
@@ -549,8 +542,10 @@ do {								\
          rxmcs == DESC92C_RATE5_5M ||\
          rxmcs == DESC92C_RATE11M)
 
+#define IS_LITTLE_ENDIAN        1
+
 struct phy_rx_agc_info_t {
-        #ifdef __LITTLE_ENDIAN
+        #if IS_LITTLE_ENDIAN
                 u8      gain:7, trsw:1;
         #else
                 u8      trsw:1, gain:7;
@@ -562,7 +557,7 @@ struct phy_status_rpt {
         u8      cck_sig_qual_ofdm_pwdb_all;
         u8      cck_agc_rpt_ofdm_cfosho_a;
         u8      cck_rpt_b_ofdm_cfosho_b;
-        u8      rsvd_1;
+        u8      rsvd_1;/* ch_corr_msb; */
         u8      noise_power_db_msb;
         u8      path_cfotail[2];
         u8      pcts_mask[2];
@@ -574,7 +569,7 @@ struct phy_status_rpt {
         u8      stream_target_csi[2];
         u8      sig_evm;
         u8      rsvd_3;
-#ifdef __LITTLE_ENDIAN
+#if IS_LITTLE_ENDIAN
         u8      antsel_rx_keep_2:1;     /*ex_intf_flg:1;*/
         u8      sgi_en:1;
         u8      rxsc:2;
@@ -777,19 +772,25 @@ struct rx_desc_88e {
 
 void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                           struct ieee80211_hdr *hdr, u8 *pdesc_tx,
-                          u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
-                          struct ieee80211_sta *sta, struct sk_buff *skb,
+                          u8 *txbd, struct ieee80211_tx_info *info,
+                          struct ieee80211_sta *sta,
+                          struct sk_buff *skb,
                           u8 hw_queue, struct rtl_tcb_desc *ptcb_desc);
 bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
                            struct rtl_stats *status,
                            struct ieee80211_rx_status *rx_status,
                            u8 *pdesc, struct sk_buff *skb);
-void rtl88ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
-                      u8 desc_name, u8 *val);
+void rtl88ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
+                      bool istx, u8 desc_name, u8 *val);
 u32 rtl88ee_get_desc(u8 *pdesc, bool istx, u8 desc_name);
+bool rtl88ee_is_tx_desc_closed(struct ieee80211_hw *hw,
+                               u8 hw_queue, u16 index);
 void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
 void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
-                             bool b_firstseg, bool b_lastseg,
+                             bool firstseg, bool lastseg,
                              struct sk_buff *skb);
+u32 rtl88ee_rx_command_packet(struct ieee80211_hw *hw,
+                              struct rtl_stats status,
+                              struct sk_buff *skb);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index eb78fd8607f7..f6cb5aedfdd1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -1771,7 +1771,7 @@ static void rtl92c_check_bt_change(struct ieee80211_hw *hw)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 tmp1byte = 0;
 
-        if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version) &&
+        if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version) &&
             rtlpcipriv->bt_coexist.bt_coexistence)
                 tmp1byte |= BIT(5);
         if (rtlpcipriv->bt_coexist.bt_cur_state) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 04a41628ceed..a00861b26ece 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,6 +26,7 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
+#include "../core.h"
 #include "../rtl8192ce/reg.h"
 #include "../rtl8192ce/def.h"
 #include "fw_common.h"
@@ -71,66 +68,31 @@ static void _rtl92c_enable_fw_download(struct ieee80211_hw *hw, bool enable)
         }
 }
 
-static void rtl_block_fw_writeN(struct ieee80211_hw *hw, const u8 *buffer,
-                                u32 size)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 blockSize = REALTEK_USB_VENQT_MAX_BUF_SIZE - 20;
-        u8 *bufferPtr = (u8 *) buffer;
-        u32 i, offset, blockCount, remainSize;
-
-        blockCount = size / blockSize;
-        remainSize = size % blockSize;
-
-        for (i = 0; i < blockCount; i++) {
-                offset = i * blockSize;
-                rtlpriv->io.writeN_sync(rtlpriv,
-                                        (FW_8192C_START_ADDRESS + offset),
-                                        (void *)(bufferPtr + offset),
-                                        blockSize);
-        }
-
-        if (remainSize) {
-                offset = blockCount * blockSize;
-                rtlpriv->io.writeN_sync(rtlpriv,
-                                        (FW_8192C_START_ADDRESS + offset),
-                                        (void *)(bufferPtr + offset),
-                                        remainSize);
-        }
-}
-
 static void _rtl92c_fw_block_write(struct ieee80211_hw *hw,
                                    const u8 *buffer, u32 size)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 blockSize = sizeof(u32);
-        u8 *bufferPtr = (u8 *) buffer;
-        u32 *pu4BytePtr = (u32 *) buffer;
-        u32 i, offset, blockCount, remainSize;
-        u32 data;
-
-        if (rtlpriv->io.writeN_sync) {
-                rtl_block_fw_writeN(hw, buffer, size);
-                return;
-        }
-        blockCount = size / blockSize;
-        remainSize = size % blockSize;
-        if (remainSize) {
-                /* the last word is < 4 bytes - pad it with zeros */
-                for (i = 0; i < 4 - remainSize; i++)
-                        *(bufferPtr + size + i) = 0;
-                blockCount++;
-        }
+        u32 blocksize = sizeof(u32);
+        u8 *bufferptr = (u8 *)buffer;
+        u32 *pu4byteptr = (u32 *)buffer;
+        u32 i, offset, blockcount, remainsize;
 
-        for (i = 0; i < blockCount; i++) {
-                offset = i * blockSize;
-                /* for big-endian platforms, the firmware data need to be byte
-                 * swapped as it was read as a byte string and will be written
-                 * as 32-bit dwords and byte swapped when written
-                 */
-                data = le32_to_cpu(*(__le32 *)(pu4BytePtr + i));
+        blockcount = size / blocksize;
+        remainsize = size % blocksize;
+
+        for (i = 0; i < blockcount; i++) {
+                offset = i * blocksize;
                 rtl_write_dword(rtlpriv, (FW_8192C_START_ADDRESS + offset),
-                                data);
+                                *(pu4byteptr + i));
+        }
+
+        if (remainsize) {
+                offset = blockcount * blocksize;
+                bufferptr += offset;
+                for (i = 0; i < remainsize; i++) {
+                        rtl_write_byte(rtlpriv, (FW_8192C_START_ADDRESS +
+                                                 offset + i), *(bufferptr + i));
+                }
         }
 }
 
@@ -168,19 +130,20 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 *bufferPtr = buffer;
+        bool is_version_b;
+        u8 *bufferptr = (u8 *)buffer;
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes\n", size);
-
-        if (IS_CHIP_VER_B(version)) {
-                u32 pageNums, remainSize;
+        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 page, offset;
 
-                if (IS_HARDWARE_TYPE_8192CE(rtlhal))
-                        _rtl92c_fill_dummy(bufferPtr, &size);
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192CE)
+                        _rtl92c_fill_dummy(bufferptr, &size);
 
                 pageNums = size / FW_8192C_PAGE_SIZE;
-                remainSize = size % FW_8192C_PAGE_SIZE;
+                remainsize = size % FW_8192C_PAGE_SIZE;
 
                 if (pageNums > 4) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -189,15 +152,15 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
 
                 for (page = 0; page < pageNums; page++) {
                         offset = page * FW_8192C_PAGE_SIZE;
-                        _rtl92c_fw_page_write(hw, page, (bufferPtr + offset),
+                        _rtl92c_fw_page_write(hw, page, (bufferptr + offset),
                                               FW_8192C_PAGE_SIZE);
                 }
 
-                if (remainSize) {
+                if (remainsize) {
                         offset = pageNums * FW_8192C_PAGE_SIZE;
                         page = pageNums;
-                        _rtl92c_fw_page_write(hw, page, (bufferPtr + offset),
-                                              remainSize);
+                        _rtl92c_fw_page_write(hw, page, (bufferptr + offset),
+                                              remainsize);
                 }
         } else {
                 _rtl92c_fw_block_write(hw, buffer, size);
@@ -207,6 +170,7 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
 static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int err = -EIO;
         u32 counter = 0;
         u32 value32;
 
@@ -217,12 +181,13 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
 
         if (counter >= FW_8192C_POLLING_TIMEOUT_COUNT) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "chksum report faill ! REG_MCUFWDL:0x%08x\n", value32);
-                return -EIO;
+                         "chksum report faill ! REG_MCUFWDL:0x%08x .\n",
+                          value32);
+                goto exit;
         }
 
         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                 "Checksum report OK ! REG_MCUFWDL:0x%08x\n", value32);
+                 "Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32);
 
         value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
         value32 |= MCUFWDL_RDY;
@@ -235,9 +200,10 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
                 value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
                 if (value32 & WINTINI_RDY) {
                         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                                 "Polling FW ready success!! REG_MCUFWDL:0x%08x\n",
-                                 value32);
-                        return 0;
+                                 "Polling FW ready success!! REG_MCUFWDL:0x%08x .\n",
+                                        value32);
+                        err = 0;
+                        goto exit;
                 }
 
                 mdelay(FW_8192C_POLLING_DELAY);
@@ -245,8 +211,10 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
         } while (counter++ < FW_8192C_POLLING_TIMEOUT_COUNT);
 
         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                 "Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", value32);
-        return -EIO;
+                 "Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n", value32);
+
+exit:
+        return err;
 }
 
 int rtl92c_download_fw(struct ieee80211_hw *hw)
@@ -256,21 +224,21 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         struct rtl92c_firmware_header *pfwheader;
         u8 *pfwdata;
         u32 fwsize;
+        int err;
         enum version_8192c version = rtlhal->version;
 
-        if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
+        if (!rtlhal->pfirmware)
                 return 1;
 
         pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
-        pfwdata = rtlhal->pfirmware;
+        pfwdata = (u8 *)rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
 
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
                          "Firmware Version(%d), Signature(%#x),Size(%d)\n",
-                         le16_to_cpu(pfwheader->version),
-                         le16_to_cpu(pfwheader->signature),
-                         (uint)sizeof(struct rtl92c_firmware_header));
+                          pfwheader->version, pfwheader->signature,
+                          (int)sizeof(struct rtl92c_firmware_header));
 
                 pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
                 fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
@@ -280,7 +248,8 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         _rtl92c_write_fw(hw, version, pfwdata, fwsize);
         _rtl92c_enable_fw_download(hw, false);
 
-        if (_rtl92c_fw_free_to_go(hw)) {
+        err = _rtl92c_fw_free_to_go(hw);
+        if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Firmware is not ready to run!\n");
         } else {
@@ -307,7 +276,7 @@ static bool _rtl92c_check_fw_read_last_h2c(struct ieee80211_hw *hw, u8 boxnum)
 }
 
 static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
-                              u8 element_id, u32 cmd_len, u8 *p_cmdbuffer)
+                              u8 element_id, u32 cmd_len, u8 *cmdbuffer)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -315,7 +284,8 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
         u16 box_reg = 0, box_extreg = 0;
         u8 u1b_tmp;
         bool isfw_read = false;
-        bool bwrite_success = false;
+        u8 buf_index = 0;
+        bool bwrite_sucess = false;
         u8 wait_h2c_limmit = 100;
         u8 wait_writeh2c_limmit = 100;
         u8 boxcontent[4], boxextcontent[2];
@@ -329,16 +299,15 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                 spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
                 if (rtlhal->h2c_setinprogress) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "H2C set in progress! Wait to set..element_id(%d)\n",
+                                 "H2C set in progress! Wait to set..element_id(%d).\n",
                                  element_id);
-
                         while (rtlhal->h2c_setinprogress) {
                                 spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
                                                        flag);
                                 h2c_waitcounter++;
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                                          "Wait 100 us (%d times)...\n",
-                                         h2c_waitcounter);
+                                          h2c_waitcounter);
                                 udelay(100);
 
                                 if (h2c_waitcounter > 1000)
@@ -354,7 +323,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                 }
         }
 
-        while (!bwrite_success) {
+        while (!bwrite_sucess) {
                 wait_writeh2c_limmit--;
                 if (wait_writeh2c_limmit == 0) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -381,14 +350,13 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         box_extreg = REG_HMEBOX_EXT_3;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
                         break;
                 }
 
                 isfw_read = _rtl92c_check_fw_read_last_h2c(hw, boxnum);
                 while (!isfw_read) {
-
                         wait_h2c_limmit--;
                         if (wait_h2c_limmit == 0) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
@@ -408,7 +376,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
 
                 if (!isfw_read) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read\n",
+                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
                                  boxnum);
                         break;
                 }
@@ -418,13 +386,13 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                 boxcontent[0] = element_id;
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                          "Write element_id box_reg(%4x) = %2x\n",
-                         box_reg, element_id);
+                          box_reg, element_id);
 
                 switch (cmd_len) {
                 case 1:
                         boxcontent[0] &= ~(BIT(7));
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer, 1);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, 1);
 
                         for (idx = 0; idx < 4; idx++) {
                                 rtl_write_byte(rtlpriv, box_reg + idx,
@@ -433,8 +401,8 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 case 2:
                         boxcontent[0] &= ~(BIT(7));
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer, 2);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, 2);
 
                         for (idx = 0; idx < 4; idx++) {
                                 rtl_write_byte(rtlpriv, box_reg + idx,
@@ -443,8 +411,8 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 case 3:
                         boxcontent[0] &= ~(BIT(7));
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer, 3);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, 3);
 
                         for (idx = 0; idx < 4; idx++) {
                                 rtl_write_byte(rtlpriv, box_reg + idx,
@@ -453,10 +421,10 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 case 4:
                         boxcontent[0] |= (BIT(7));
-                        memcpy((u8 *) (boxextcontent),
-                               p_cmdbuffer, 2);
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer + 2, 2);
+                        memcpy((u8 *)(boxextcontent),
+                               cmdbuffer + buf_index, 2);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index + 2, 2);
 
                         for (idx = 0; idx < 2; idx++) {
                                 rtl_write_byte(rtlpriv, box_extreg + idx,
@@ -470,10 +438,10 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 case 5:
                         boxcontent[0] |= (BIT(7));
-                        memcpy((u8 *) (boxextcontent),
-                               p_cmdbuffer, 2);
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer + 2, 3);
+                        memcpy((u8 *)(boxextcontent),
+                               cmdbuffer + buf_index, 2);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index + 2, 3);
 
                         for (idx = 0; idx < 2; idx++) {
                                 rtl_write_byte(rtlpriv, box_extreg + idx,
@@ -486,12 +454,12 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         }
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
                         break;
                 }
 
-                bwrite_success = true;
+                bwrite_sucess = true;
 
                 rtlhal->last_hmeboxnum = boxnum + 1;
                 if (rtlhal->last_hmeboxnum == 4)
@@ -499,7 +467,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
 
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                          "pHalData->last_hmeboxnum  = %d\n",
-                         rtlhal->last_hmeboxnum);
+                          rtlhal->last_hmeboxnum);
         }
 
         spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
@@ -510,12 +478,19 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
 }
 
 void rtl92c_fill_h2c_cmd(struct ieee80211_hw *hw,
-                         u8 element_id, u32 cmd_len, u8 *p_cmdbuffer)
+                         u8 element_id, u32 cmd_len, u8 *cmdbuffer)
 {
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 tmp_cmdbuf[2];
 
+        if (!rtlhal->fw_ready) {
+                RT_ASSERT(false,
+                          "return H2C cmd because of Fw download fail!!!\n");
+                return;
+        }
+
         memset(tmp_cmdbuf, 0, 8);
-        memcpy(tmp_cmdbuf, p_cmdbuffer, cmd_len);
+        memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
         _rtl92c_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
 
         return;
@@ -534,7 +509,7 @@ void rtl92c_firmware_selfreset(struct ieee80211_hw *hw)
         while (u1b_tmp & BIT(2)) {
                 delay--;
                 if (delay == 0) {
-                        RT_ASSERT(false, "8051 reset fail\n");
+                        RT_ASSERT(false, "8051 reset fail.\n");
                         break;
                 }
                 udelay(50);
@@ -546,56 +521,24 @@ EXPORT_SYMBOL(rtl92c_firmware_selfreset);
 void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 u1_h2c_set_pwrmode[3] = {0};
+        u8 u1_h2c_set_pwrmode[3] = { 0 };
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
 
         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
         SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);
         SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
-                                         (rtlpriv->mac80211.p2p) ?
-                                         ppsc->smart_ps : 1);
+                (rtlpriv->mac80211.p2p) ? ppsc->smart_ps : 1);
         SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(u1_h2c_set_pwrmode,
                                               ppsc->reg_max_lps_awakeintvl);
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92c_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode",
+                      "rtl92c_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n",
                       u1_h2c_set_pwrmode, 3);
         rtl92c_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);
-
 }
 EXPORT_SYMBOL(rtl92c_set_fw_pwrmode_cmd);
 
-static bool _rtl92c_cmd_send_packet(struct ieee80211_hw *hw,
-                                struct sk_buff *skb)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        struct rtl8192_tx_ring *ring;
-        struct rtl_tx_desc *pdesc;
-        unsigned long flags;
-        struct sk_buff *pskb = NULL;
-
-        ring = &rtlpci->tx_ring[BEACON_QUEUE];
-
-        pskb = __skb_dequeue(&ring->queue);
-        kfree_skb(pskb);
-
-        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
-
-        pdesc = &ring->desc[0];
-
-        rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *) pdesc, 1, 1, skb);
-
-        __skb_queue_tail(&ring->queue, skb);
-
-        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-
-        rtlpriv->cfg->ops->tx_polling(hw, BEACON_QUEUE);
-
-        return true;
-}
-
 #define BEACON_PG               0 /*->1*/
 #define PSPOLL_PG               2
 #define NULL_PG                 3
@@ -713,7 +656,7 @@ static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
+void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -721,13 +664,13 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
 
         u32 totalpacketlen;
         bool rtstatus;
-        u8 u1RsvdPageLoc[3] = {0};
-        bool dlok = false;
+        u8 u1rsvdpageloc[3] = { 0 };
+        bool b_dlok = false;
 
         u8 *beacon;
-        u8 *pspoll;
+        u8 *p_pspoll;
         u8 *nullfunc;
-        u8 *probersp;
+        u8 *p_probersp;
         /*---------------------------------------------------------
                                 (1) beacon
         ---------------------------------------------------------*/
@@ -738,12 +681,12 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         /*-------------------------------------------------------
                                 (2) ps-poll
         --------------------------------------------------------*/
-        pspoll = &reserved_page_packet[PSPOLL_PG * 128];
-        SET_80211_PS_POLL_AID(pspoll, (mac->assoc_id | 0xc000));
-        SET_80211_PS_POLL_BSSID(pspoll, mac->bssid);
-        SET_80211_PS_POLL_TA(pspoll, mac->mac_addr);
+        p_pspoll = &reserved_page_packet[PSPOLL_PG * 128];
+        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
@@ -753,57 +696,54 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         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
         ----------------------------------------------------------*/
-        probersp = &reserved_page_packet[PROBERSP_PG * 128];
-        SET_80211_HDR_ADDRESS1(probersp, mac->bssid);
-        SET_80211_HDR_ADDRESS2(probersp, mac->mac_addr);
-        SET_80211_HDR_ADDRESS3(probersp, mac->bssid);
+        p_probersp = &reserved_page_packet[PROBERSP_PG * 128];
+        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,
-                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
+                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
-                      u1RsvdPageLoc, 3);
+                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      u1rsvdpageloc, 3);
 
 
         skb = dev_alloc_skb(totalpacketlen);
-        if (!skb)
-                return;
-        kmemleak_not_leak(skb);
-
-        memcpy((u8 *) skb_put(skb, totalpacketlen),
+        memcpy((u8 *)skb_put(skb, totalpacketlen),
                &reserved_page_packet, totalpacketlen);
 
-        rtstatus = _rtl92c_cmd_send_packet(hw, skb);
+        rtstatus = rtl_cmd_send_packet(hw, skb);
 
         if (rtstatus)
-                dlok = true;
+                b_dlok = true;
 
-        if (dlok) {
+        if (b_dlok) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         "Set RSVD page location to Fw\n");
+                         "Set RSVD page location to Fw.\n");
                 RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                              "H2C_RSVDPAGE", u1RsvdPageLoc, 3);
+                                "H2C_RSVDPAGE:\n",
+                                u1rsvdpageloc, 3);
                 rtl92c_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");
+                         "Set RSVD page location to Fw FAIL!!!!!!.\n");
 }
 EXPORT_SYMBOL(rtl92c_set_fw_rsvdpagepkt);
 
 void rtl92c_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
 {
-        u8 u1_joinbssrpt_parm[1] = {0};
+        u8 u1_joinbssrpt_parm[1] = { 0 };
 
         SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(u1_joinbssrpt_parm, mstatus);
 
@@ -813,11 +753,51 @@ EXPORT_SYMBOL(rtl92c_set_fw_joinbss_report_cmd);
 
 static void rtl92c_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw, u8 ctwindow)
 {
-        u8 u1_ctwindow_period[1] = {ctwindow};
+        u8 u1_ctwindow_period[1] = { ctwindow};
 
         rtl92c_fill_h2c_cmd(hw, H2C_P2P_PS_CTW_CMD, 1, u1_ctwindow_period);
 }
 
+/* refactored routine */
+static void set_noa_data(struct rtl_priv *rtlpriv,
+                         struct rtl_p2p_ps_info *p2pinfo,
+                         struct p2p_ps_offload_t *p2p_ps_offload)
+{
+        int i;
+        u32     start_time, tsf_low;
+
+        /* hw only support 2 set of NoA */
+        for (i = 0 ; i < p2pinfo->noa_num ; i++) {
+                /* To control the reg setting for which NOA*/
+                rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
+                if (i == 0)
+                        p2p_ps_offload->noa0_en = 1;
+                else
+                        p2p_ps_offload->noa1_en = 1;
+
+                /* config P2P NoA Descriptor Register */
+                rtl_write_dword(rtlpriv, 0x5E0,
+                                p2pinfo->noa_duration[i]);
+                rtl_write_dword(rtlpriv, 0x5E4,
+                                p2pinfo->noa_interval[i]);
+
+                /*Get Current TSF value */
+                tsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                start_time = p2pinfo->noa_start_time[i];
+                if (p2pinfo->noa_count_type[i] != 1) {
+                        while (start_time <= (tsf_low+(50*1024))) {
+                                start_time += p2pinfo->noa_interval[i];
+                                if (p2pinfo->noa_count_type[i] != 255)
+                                        p2pinfo->noa_count_type[i]--;
+                        }
+                }
+                rtl_write_dword(rtlpriv, 0x5E8, start_time);
+                rtl_write_dword(rtlpriv, 0x5EC,
+                                p2pinfo->noa_count_type[i]);
+        }
+}
+
 void rtl92c_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -825,83 +805,58 @@ void rtl92c_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_p2p_ps_info *p2pinfo = &(rtlps->p2p_ps_info);
         struct p2p_ps_offload_t *p2p_ps_offload = &rtlhal->p2p_ps_offload;
-        u8      i;
         u16     ctwindow;
-        u32     start_time, tsf_low;
 
         switch (p2p_ps_state) {
         case P2P_PS_DISABLE:
-                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
-                memset(p2p_ps_offload, 0, sizeof(struct p2p_ps_offload_t));
-                break;
+                        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                                 "P2P_PS_DISABLE\n");
+                        memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));
+                        break;
         case P2P_PS_ENABLE:
-                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
-                /* update CTWindow value. */
-                if (p2pinfo->ctwindow > 0) {
-                        p2p_ps_offload->ctwindow_en = 1;
-                        ctwindow = p2pinfo->ctwindow;
-                        rtl92c_set_p2p_ctw_period_cmd(hw, ctwindow);
-                }
-                /* hw only support 2 set of NoA */
-                for (i = 0; i < p2pinfo->noa_num; i++) {
-                        /* To control the register setting for which NOA*/
-                        rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
-                        if (i == 0)
-                                p2p_ps_offload->noa0_en = 1;
-                        else
-                                p2p_ps_offload->noa1_en = 1;
-
-                        /* config P2P NoA Descriptor Register */
-                        rtl_write_dword(rtlpriv, 0x5E0,
-                                        p2pinfo->noa_duration[i]);
-                        rtl_write_dword(rtlpriv, 0x5E4,
-                                        p2pinfo->noa_interval[i]);
-
-                        /*Get Current TSF value */
-                        tsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
-
-                        start_time = p2pinfo->noa_start_time[i];
-                        if (p2pinfo->noa_count_type[i] != 1) {
-                                while (start_time <= (tsf_low+(50*1024))) {
-                                        start_time += p2pinfo->noa_interval[i];
-                                        if (p2pinfo->noa_count_type[i] != 255)
-                                                p2pinfo->noa_count_type[i]--;
-                                }
+                        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                                 "P2P_PS_ENABLE\n");
+                        /* update CTWindow value. */
+                        if (p2pinfo->ctwindow > 0) {
+                                p2p_ps_offload->ctwindow_en = 1;
+                                ctwindow = p2pinfo->ctwindow;
+                                rtl92c_set_p2p_ctw_period_cmd(hw, ctwindow);
                         }
-                        rtl_write_dword(rtlpriv, 0x5E8, start_time);
-                        rtl_write_dword(rtlpriv, 0x5EC,
-                                        p2pinfo->noa_count_type[i]);
-                }
+                        /* call refactored routine */
+                        set_noa_data(rtlpriv, p2pinfo, p2p_ps_offload);
 
-                if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
-                        /* rst p2p circuit */
-                        rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, BIT(4));
+                        if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
+                                /* rst p2p circuit */
+                                rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST,
+                                               BIT(4));
 
-                        p2p_ps_offload->offload_en = 1;
+                                p2p_ps_offload->offload_en = 1;
 
-                        if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
-                                p2p_ps_offload->role = 1;
-                                p2p_ps_offload->allstasleep = 0;
-                        } else {
-                                p2p_ps_offload->role = 0;
-                        }
+                                if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
+                                        p2p_ps_offload->role = 1;
+                                        p2p_ps_offload->allstasleep = 0;
+                                } else {
+                                        p2p_ps_offload->role = 0;
+                                }
 
-                        p2p_ps_offload->discovery = 0;
-                }
-                break;
+                                p2p_ps_offload->discovery = 0;
+                        }
+                        break;
         case P2P_PS_SCAN:
-                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");
-                p2p_ps_offload->discovery = 1;
-                break;
+                        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");
+                        p2p_ps_offload->discovery = 1;
+                        break;
         case P2P_PS_SCAN_DONE:
-                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");
-                p2p_ps_offload->discovery = 0;
-                p2pinfo->p2p_ps_state = P2P_PS_ENABLE;
-                break;
+                        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                                 "P2P_PS_SCAN_DONE\n");
+                        p2p_ps_offload->discovery = 0;
+                        p2pinfo->p2p_ps_state = P2P_PS_ENABLE;
+                        break;
         default:
-                break;
+                        break;
         }
 
         rtl92c_fill_h2c_cmd(hw, H2C_P2P_PS_OFFLOAD, 1, (u8 *)p2p_ps_offload);
+
 }
 EXPORT_SYMBOL_GPL(rtl92c_set_p2p_ps_offload_cmd);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
index 15b2055e6212..a815bd6273da 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
@@ -36,11 +36,38 @@
 #define FW_8192C_PAGE_SIZE                      4096
 #define FW_8192C_POLLING_DELAY                  5
 #define FW_8192C_POLLING_TIMEOUT_COUNT          100
+#define NORMAL_CHIP                             BIT(4)
 
 #define IS_FW_HEADER_EXIST(_pfwhdr)     \
         ((le16_to_cpu(_pfwhdr->signature)&0xFFF0) == 0x92C0 ||\
         (le16_to_cpu(_pfwhdr->signature)&0xFFF0) == 0x88C0)
 
+#define CUT_VERSION_MASK                (BIT(6)|BIT(7))
+#define CHIP_VENDOR_UMC                 BIT(5)
+#define CHIP_VENDOR_UMC_B_CUT           BIT(6) /* Chip version for ECO */
+#define IS_CHIP_VER_B(version)  ((version & CHIP_VER_B) ? true : false)
+#define RF_TYPE_MASK                    (BIT(0)|BIT(1))
+#define GET_CVID_RF_TYPE(version)       \
+        ((version) & RF_TYPE_MASK)
+#define GET_CVID_CUT_VERSION(version) \
+        ((version) & CUT_VERSION_MASK)
+#define IS_NORMAL_CHIP(version) \
+        ((version & NORMAL_CHIP) ? true : false)
+#define IS_2T2R(version) \
+        (((GET_CVID_RF_TYPE(version)) == \
+        CHIP_92C_BITMASK) ? true : false)
+#define IS_92C_SERIAL(version) \
+        ((IS_2T2R(version)) ? true : false)
+#define IS_CHIP_VENDOR_UMC(version)     \
+        ((version & CHIP_VENDOR_UMC) ? true : false)
+#define IS_VENDOR_UMC_A_CUT(version) \
+        ((IS_CHIP_VENDOR_UMC(version)) ? \
+        ((GET_CVID_CUT_VERSION(version)) ? false : true) : false)
+#define IS_81XXC_VENDOR_UMC_B_CUT(version)      \
+        ((IS_CHIP_VENDOR_UMC(version)) ? \
+        ((GET_CVID_CUT_VERSION(version) == \
+                CHIP_VENDOR_UMC_B_CUT) ? true : false) : false)
+
 struct rtl92c_firmware_header {
         __le16 signature;
         u8 category;
@@ -60,19 +87,6 @@ struct rtl92c_firmware_header {
         __le32 rsvd5;
 };
 
-enum rtl8192c_h2c_cmd {
-        H2C_AP_OFFLOAD = 0,
-        H2C_SETPWRMODE = 1,
-        H2C_JOINBSSRPT = 2,
-        H2C_RSVDPAGE = 3,
-        H2C_RSSI_REPORT = 5,
-        H2C_RA_MASK = 6,
-        H2C_MACID_PS_MODE = 7,
-        H2C_P2P_PS_OFFLOAD = 8,
-        H2C_P2P_PS_CTW_CMD = 32,
-        MAX_H2CCMD
-};
-
 #define pagenum_128(_len)       (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))
 
 #define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val)                  \
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
index 9e32ac8a4425..77e61b19bf36 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -27,12 +27,13 @@
  *
  *****************************************************************************/
 
-#include <linux/export.h>
 #include "../wifi.h"
 #include "../rtl8192ce/reg.h"
 #include "../rtl8192ce/def.h"
 #include "dm_common.h"
+#include "fw_common.h"
 #include "phy_common.h"
+#include <linux/export.h>
 
 u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
 {
@@ -50,7 +51,6 @@ u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
                  bitmask, regaddr, originalvalue);
 
         return returnvalue;
-
 }
 EXPORT_SYMBOL(rtl92c_phy_query_bb_reg);
 
@@ -75,7 +75,6 @@ void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                  "regaddr(%#x), bitmask(%#x), data(%#x)\n",
                  regaddr, bitmask, data);
-
 }
 EXPORT_SYMBOL(rtl92c_phy_set_bb_reg);
 
@@ -84,7 +83,6 @@ u32 _rtl92c_phy_fw_rf_serial_read(struct ieee80211_hw *hw,
 {
         RT_ASSERT(false, "deprecated!\n");
         return 0;
-
 }
 EXPORT_SYMBOL(_rtl92c_phy_fw_rf_serial_read);
 
@@ -129,10 +127,10 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw,
                       tmplong | BLSSIREADEDGE);
         mdelay(1);
         if (rfpath == RF90_PATH_A)
-                rfpi_enable = (u8) rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
+                rfpi_enable = (u8)rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
                                                  BIT(8));
         else if (rfpath == RF90_PATH_B)
-                rfpi_enable = (u8) rtl_get_bbreg(hw, RFPGA0_XB_HSSIPARAMETER1,
+                rfpi_enable = (u8)rtl_get_bbreg(hw, RFPGA0_XB_HSSIPARAMETER1,
                                                  BIT(8));
         if (rfpi_enable)
                 retvalue = rtl_get_bbreg(hw, pphyreg->rf_rbpi,
@@ -141,7 +139,8 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw,
                 retvalue = rtl_get_bbreg(hw, pphyreg->rf_rb,
                                          BLSSIREADBACKDATA);
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x]=0x%x\n",
-                 rfpath, pphyreg->rf_rb, retvalue);
+                                               rfpath, pphyreg->rf_rb,
+                                               retvalue);
         return retvalue;
 }
 EXPORT_SYMBOL(_rtl92c_phy_rf_serial_read);
@@ -165,7 +164,8 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw,
         data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
         rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]=0x%x\n",
-                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
+                                               rfpath, pphyreg->rf3wire_offset,
+                                               data_and_addr);
 }
 EXPORT_SYMBOL(_rtl92c_phy_rf_serial_write);
 
@@ -174,7 +174,7 @@ u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask)
         u32 i;
 
         for (i = 0; i <= 31; i++) {
-                if ((bitmask >> i) & 0x1)
+                if (((bitmask >> i) & 0x1) == 1)
                         break;
         }
         return i;
@@ -210,11 +210,10 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         bool rtstatus;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n");
         rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw,
                                                  BASEBAND_CONFIG_PHY_REG);
         if (!rtstatus) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n");
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!");
                 return false;
         }
         if (rtlphy->rf_type == RF_1T2R) {
@@ -227,7 +226,7 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
                                                    BASEBAND_CONFIG_PHY_REG);
         }
         if (!rtstatus) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n");
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!");
                 return false;
         }
         rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw,
@@ -236,12 +235,12 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
                 return false;
         }
-        rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
-                                                RFPGA0_XA_HSSIPARAMETER2,
-                                                0x200));
+        rtlphy->cck_high_power =
+                (bool)(rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, 0x200));
 
         return true;
 }
+
 EXPORT_SYMBOL(_rtl92c_phy_bb8192c_config_parafile);
 
 void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
@@ -250,51 +249,153 @@ void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        int index;
-
-        if (regaddr == RTXAGC_A_RATE18_06)
-                index = 0;
-        else if (regaddr == RTXAGC_A_RATE54_24)
-                index = 1;
-        else if (regaddr == RTXAGC_A_CCK1_MCS32)
-                index = 6;
-        else if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00)
-                index = 7;
-        else if (regaddr == RTXAGC_A_MCS03_MCS00)
-                index = 2;
-        else if (regaddr == RTXAGC_A_MCS07_MCS04)
-                index = 3;
-        else if (regaddr == RTXAGC_A_MCS11_MCS08)
-                index = 4;
-        else if (regaddr == RTXAGC_A_MCS15_MCS12)
-                index = 5;
-        else if (regaddr == RTXAGC_B_RATE18_06)
-                index = 8;
-        else if (regaddr == RTXAGC_B_RATE54_24)
-                index = 9;
-        else if (regaddr == RTXAGC_B_CCK1_55_MCS32)
-                index = 14;
-        else if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff)
-                index = 15;
-        else if (regaddr == RTXAGC_B_MCS03_MCS00)
-                index = 10;
-        else if (regaddr == RTXAGC_B_MCS07_MCS04)
-                index = 11;
-        else if (regaddr == RTXAGC_B_MCS11_MCS08)
-                index = 12;
-        else if (regaddr == RTXAGC_B_MCS15_MCS12)
-                index = 13;
-        else
-                return;
 
-        rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index] = data;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%x\n",
-                 rtlphy->pwrgroup_cnt, index,
-                 rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index]);
+        if (regaddr == RTXAGC_A_RATE18_06) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][0] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][0]);
+        }
+        if (regaddr == RTXAGC_A_RATE54_24) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][1] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][1]);
+        }
+        if (regaddr == RTXAGC_A_CCK1_MCS32) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][6] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][6]);
+        }
+        if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][7] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][7]);
+        }
+        if (regaddr == RTXAGC_A_MCS03_MCS00) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][2] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][2]);
+        }
+        if (regaddr == RTXAGC_A_MCS07_MCS04) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][3] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][3]);
+        }
+        if (regaddr == RTXAGC_A_MCS11_MCS08) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][4] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][4]);
+        }
+        if (regaddr == RTXAGC_A_MCS15_MCS12) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][5] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][5]);
+        }
+        if (regaddr == RTXAGC_B_RATE18_06) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][8] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][8]);
+        }
+        if (regaddr == RTXAGC_B_RATE54_24) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][9] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][9]);
+        }
+        if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][14] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][14]);
+        }
+        if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][15] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][15]);
+        }
+        if (regaddr == RTXAGC_B_MCS03_MCS00) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][10] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][10]);
+        }
+        if (regaddr == RTXAGC_B_MCS07_MCS04) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][11] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][11]);
+        }
+        if (regaddr == RTXAGC_B_MCS11_MCS08) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][12] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][12]);
+        }
+        if (regaddr == RTXAGC_B_MCS15_MCS12) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][13] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][13]);
 
-        if (index == 13)
                 rtlphy->pwrgroup_cnt++;
+        }
 }
 EXPORT_SYMBOL(_rtl92c_store_pwrIndex_diffrate_offset);
 
@@ -304,29 +405,29 @@ void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
         rtlphy->default_initialgain[0] =
-            (u8) rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
+            (u8)rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
         rtlphy->default_initialgain[1] =
-            (u8) rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
+            (u8)rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
         rtlphy->default_initialgain[2] =
-            (u8) rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
+            (u8)rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
         rtlphy->default_initialgain[3] =
-            (u8) rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
+            (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                  "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
-                 rtlphy->default_initialgain[0],
-                 rtlphy->default_initialgain[1],
-                 rtlphy->default_initialgain[2],
-                 rtlphy->default_initialgain[3]);
+                  rtlphy->default_initialgain[0],
+                  rtlphy->default_initialgain[1],
+                  rtlphy->default_initialgain[2],
+                  rtlphy->default_initialgain[3]);
 
-        rtlphy->framesync = (u8) rtl_get_bbreg(hw,
+        rtlphy->framesync = (u8)rtl_get_bbreg(hw,
                                                ROFDM0_RXDETECTOR3, MASKBYTE0);
         rtlphy->framesync_c34 = rtl_get_bbreg(hw,
                                               ROFDM0_RXDETECTOR2, MASKDWORD);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                  "Default framesync (0x%x) = 0x%x\n",
-                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
+                  ROFDM0_RXDETECTOR3, rtlphy->framesync);
 }
 
 void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
@@ -426,19 +527,17 @@ void rtl92c_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel)
         long txpwr_dbm;
 
         txpwr_level = rtlphy->cur_cck_txpwridx;
-        txpwr_dbm = _rtl92c_phy_txpwr_idx_to_dbm(hw,
-                                                 WIRELESS_MODE_B, txpwr_level);
+        txpwr_dbm = _rtl92c_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_B,
+                                                 txpwr_level);
         txpwr_level = rtlphy->cur_ofdm24g_txpwridx +
             rtlefuse->legacy_ht_txpowerdiff;
-        if (_rtl92c_phy_txpwr_idx_to_dbm(hw,
-                                         WIRELESS_MODE_G,
+        if (_rtl92c_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G,
                                          txpwr_level) > txpwr_dbm)
                 txpwr_dbm =
                     _rtl92c_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G,
                                                  txpwr_level);
         txpwr_level = rtlphy->cur_ofdm24g_txpwridx;
-        if (_rtl92c_phy_txpwr_idx_to_dbm(hw,
-                                         WIRELESS_MODE_N_24G,
+        if (_rtl92c_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_N_24G,
                                          txpwr_level) > txpwr_dbm)
                 txpwr_dbm =
                     _rtl92c_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_N_24G,
@@ -480,21 +579,19 @@ static void _rtl92c_ccxpower_index_check(struct ieee80211_hw *hw,
 
         rtlphy->cur_cck_txpwridx = cckpowerlevel[0];
         rtlphy->cur_ofdm24g_txpwridx = ofdmpowerlevel[0];
-
 }
 
 void rtl92c_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 cckpowerlevel[2], ofdmpowerlevel[2];
 
         if (!rtlefuse->txpwr_fromeprom)
                 return;
         _rtl92c_get_txpower_index(hw, channel,
                                   &cckpowerlevel[0], &ofdmpowerlevel[0]);
-        _rtl92c_ccxpower_index_check(hw,
-                                     channel, &cckpowerlevel[0],
+        _rtl92c_ccxpower_index_check(hw, channel, &cckpowerlevel[0],
                                      &ofdmpowerlevel[0]);
         rtlpriv->cfg->ops->phy_rf6052_set_cck_txpower(hw, &cckpowerlevel[0]);
         rtlpriv->cfg->ops->phy_rf6052_set_ofdm_txpower(hw, &ofdmpowerlevel[0],
@@ -509,11 +606,9 @@ bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 idx;
         u8 rf_path;
-        u8 ccktxpwridx = _rtl92c_phy_dbm_to_txpwr_Idx(hw,
-                                                      WIRELESS_MODE_B,
+        u8 ccktxpwridx = _rtl92c_phy_dbm_to_txpwr_idx(hw, WIRELESS_MODE_B,
                                                       power_indbm);
-        u8 ofdmtxpwridx = _rtl92c_phy_dbm_to_txpwr_Idx(hw,
-                                                       WIRELESS_MODE_N_24G,
+        u8 ofdmtxpwridx = _rtl92c_phy_dbm_to_txpwr_idx(hw, WIRELESS_MODE_N_24G,
                                                        power_indbm);
         if (ofdmtxpwridx - rtlefuse->legacy_ht_txpowerdiff > 0)
                 ofdmtxpwridx -= rtlefuse->legacy_ht_txpowerdiff;
@@ -521,7 +616,7 @@ bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm)
                 ofdmtxpwridx = 0;
         RT_TRACE(rtlpriv, COMP_TXAGC, DBG_TRACE,
                  "%lx dBm, ccktxpwridx = %d, ofdmtxpwridx = %d\n",
-                 power_indbm, ccktxpwridx, ofdmtxpwridx);
+                  power_indbm, ccktxpwridx, ofdmtxpwridx);
         for (idx = 0; idx < 14; idx++) {
                 for (rf_path = 0; rf_path < 2; rf_path++) {
                         rtlefuse->txpwrlevel_cck[rf_path][idx] = ccktxpwridx;
@@ -536,7 +631,7 @@ bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm)
 }
 EXPORT_SYMBOL(rtl92c_phy_update_txpower_dbm);
 
-u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,
+u8 _rtl92c_phy_dbm_to_txpwr_idx(struct ieee80211_hw *hw,
                                 enum wireless_mode wirelessmode,
                                 long power_indbm)
 {
@@ -557,7 +652,7 @@ u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,
         }
 
         if ((power_indbm - offset) > 0)
-                txpwridx = (u8) ((power_indbm - offset) * 2);
+                txpwridx = (u8)((power_indbm - offset) * 2);
         else
                 txpwridx = 0;
 
@@ -566,7 +661,7 @@ u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,
 
         return txpwridx;
 }
-EXPORT_SYMBOL(_rtl92c_phy_dbm_to_txpwr_Idx);
+EXPORT_SYMBOL(_rtl92c_phy_dbm_to_txpwr_idx);
 
 long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
                                   enum wireless_mode wirelessmode,
@@ -607,7 +702,7 @@ void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw,
                 rtlpriv->cfg->ops->phy_set_bw_mode_callback(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         "FALSE driver sleep or unload\n");
+                         "false driver sleep or unload\n");
                 rtlphy->set_bwmode_inprogress = false;
                 rtlphy->current_chan_bw = tmp_bw;
         }
@@ -640,7 +735,7 @@ void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw)
                 }
                 break;
         } while (true);
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
 }
 EXPORT_SYMBOL(rtl92c_phy_sw_chnl_callback);
 
@@ -655,14 +750,14 @@ u8 rtl92c_phy_sw_chnl(struct ieee80211_hw *hw)
         if (rtlphy->set_bwmode_inprogress)
                 return 0;
         RT_ASSERT((rtlphy->current_channel <= 14),
-                  "WIRELESS_MODE_G but channel>14\n");
+                  "WIRELESS_MODE_G but channel>14");
         rtlphy->sw_chnl_inprogress = true;
         rtlphy->sw_chnl_stage = 0;
         rtlphy->sw_chnl_step = 0;
         if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
                 rtl92c_phy_sw_chnl_callback(hw);
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         "sw_chnl_inprogress false schedule workitem\n");
+                         "sw_chnl_inprogress false schdule workitem\n");
                 rtlphy->sw_chnl_inprogress = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
@@ -673,22 +768,22 @@ u8 rtl92c_phy_sw_chnl(struct ieee80211_hw *hw)
 }
 EXPORT_SYMBOL(rtl92c_phy_sw_chnl);
 
-static void _rtl92c_phy_sw_rf_setting(struct ieee80211_hw *hw, u8 channel)
+static void _rtl92c_phy_sw_rf_seting(struct ieee80211_hw *hw, u8 channel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         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 (channel == 6 && rtlphy->current_chan_bw ==
-                    HT_CHANNEL_WIDTH_20)
-                        rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1, MASKDWORD,
-                                      0x00255);
-                else{
-                        u32 backupRF0x1A = (u32)rtl_get_rfreg(hw, RF90_PATH_A,
-                                            RF_RX_G1, RFREG_OFFSET_MASK);
+        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,
+                                      MASKDWORD, 0x00255);
+                } else {
+                        u32 backuprf0x1A =
+                          (u32)rtl_get_rfreg(hw, RF90_PATH_A, RF_RX_G1,
+                                             RFREG_OFFSET_MASK);
                         rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1, MASKDWORD,
-                                      backupRF0x1A);
+                                      backuprf0x1A);
                 }
         }
 }
@@ -701,7 +796,7 @@ static bool _rtl92c_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
         struct swchnlcmd *pcmd;
 
         if (cmdtable == NULL) {
-                RT_ASSERT(false, "cmdtable cannot be NULL\n");
+                RT_ASSERT(false, "cmdtable cannot be NULL.\n");
                 return false;
         }
 
@@ -747,7 +842,7 @@ bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
         rfdependcmdcnt = 0;
 
         RT_ASSERT((channel >= 1 && channel <= 14),
-                  "invalid channel for Zebra: %d\n", channel);
+                  "illegal channel for Zebra: %d\n", channel);
 
         _rtl92c_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
                                          MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
@@ -768,6 +863,10 @@ bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                 case 2:
                         currentcmd = &postcommoncmd[*step];
                         break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Invalid 'stage' = %d, Check it!\n", *stage);
+                        return true;
                 }
 
                 if (currentcmd->cmdid == CMDID_END) {
@@ -794,7 +893,7 @@ bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                         break;
                 case CMDID_WRITEPORT_UCHAR:
                         rtl_write_byte(rtlpriv, currentcmd->para1,
-                                       (u8) currentcmd->para2);
+                                       (u8)currentcmd->para2);
                         break;
                 case CMDID_RF_WRITEREG:
                         for (rfpath = 0; rfpath < num_total_rfpath; rfpath++) {
@@ -806,12 +905,12 @@ bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                                               currentcmd->para1,
                                               RFREG_OFFSET_MASK,
                                               rtlphy->rfreg_chnlval[rfpath]);
-                        _rtl92c_phy_sw_rf_setting(hw, channel);
                         }
+                        _rtl92c_phy_sw_rf_seting(hw, channel);
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
                         break;
                 }
 
@@ -900,7 +999,7 @@ static u8 _rtl92c_phy_path_b_iqk(struct ieee80211_hw *hw)
 }
 
 static void _rtl92c_phy_path_a_fill_iqk_matrix(struct ieee80211_hw *hw,
-                                               bool iqk_ok, long result[][8],
+                                               bool b_iqk_ok, long result[][8],
                                                u8 final_candidate, bool btxonly)
 {
         u32 oldval_0, x, tx0_a, reg;
@@ -908,7 +1007,7 @@ static void _rtl92c_phy_path_a_fill_iqk_matrix(struct ieee80211_hw *hw,
 
         if (final_candidate == 0xFF) {
                 return;
-        } else if (iqk_ok) {
+        } else if (b_iqk_ok) {
                 oldval_0 = (rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
                                           MASKDWORD) >> 22) & 0x3FF;
                 x = result[final_candidate][0];
@@ -940,7 +1039,7 @@ static void _rtl92c_phy_path_a_fill_iqk_matrix(struct ieee80211_hw *hw,
 }
 
 static void _rtl92c_phy_path_b_fill_iqk_matrix(struct ieee80211_hw *hw,
-                                               bool iqk_ok, long result[][8],
+                                               bool b_iqk_ok, long result[][8],
                                                u8 final_candidate, bool btxonly)
 {
         u32 oldval_1, x, tx1_a, reg;
@@ -948,7 +1047,7 @@ static void _rtl92c_phy_path_b_fill_iqk_matrix(struct ieee80211_hw *hw,
 
         if (final_candidate == 0xFF) {
                 return;
-        } else if (iqk_ok) {
+        } else if (b_iqk_ok) {
                 oldval_1 = (rtl_get_bbreg(hw, ROFDM0_XBTXIQIMBALANCE,
                                           MASKDWORD) >> 22) & 0x3FF;
                 x = result[final_candidate][4];
@@ -1017,7 +1116,7 @@ static void _rtl92c_phy_reload_mac_registers(struct ieee80211_hw *hw,
         u32 i;
 
         for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
-                rtl_write_byte(rtlpriv, macreg[i], (u8) macbackup[i]);
+                rtl_write_byte(rtlpriv, macreg[i], (u8)macbackup[i]);
         rtl_write_dword(rtlpriv, macreg[i], macbackup[i]);
 }
 
@@ -1043,14 +1142,14 @@ static void _rtl92c_phy_mac_setting_calibration(struct ieee80211_hw *hw,
                                                 u32 *macreg, u32 *macbackup)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 i;
+        u32 i = 0;
 
-        rtl_write_byte(rtlpriv, macreg[0], 0x3F);
+        rtl_write_byte(rtlpriv, macreg[i], 0x3F);
 
         for (i = 1; i < (IQK_MAC_REG_NUM - 1); i++)
                 rtl_write_byte(rtlpriv, macreg[i],
-                               (u8) (macbackup[i] & (~BIT(3))));
-        rtl_write_byte(rtlpriv, macreg[i], (u8) (macbackup[i] & (~BIT(5))));
+                               (u8)(macbackup[i] & (~BIT(3))));
+        rtl_write_byte(rtlpriv, macreg[i], (u8)(macbackup[i] & (~BIT(5))));
 }
 
 static void _rtl92c_phy_path_a_standby(struct ieee80211_hw *hw)
@@ -1126,7 +1225,6 @@ static bool _rtl92c_phy_simularity_compare(struct ieee80211_hw *hw,
         } else {
                 return false;
         }
-
 }
 
 static void _rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw,
@@ -1142,51 +1240,37 @@ static void _rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw,
                 0xe88, 0xe8c, 0xed0, 0xed4,
                 0xed8, 0xedc, 0xee0, 0xeec
         };
-
         u32 iqk_mac_reg[IQK_MAC_REG_NUM] = {
                 0x522, 0x550, 0x551, 0x040
         };
-
-        u32 iqk_bb_reg_92C[9] = {
-                0xc04, 0xc08, 0x874, 0xb68,
-                0xb6c, 0x870, 0x860, 0x864,
-                0x800
-        };
-
         const u32 retrycount = 2;
+        u32 bbvalue;
 
         if (t == 0) {
-                /* dummy read */
-                rtl_get_bbreg(hw, 0x800, MASKDWORD);
+                bbvalue = rtl_get_bbreg(hw, 0x800, MASKDWORD);
 
                 _rtl92c_phy_save_adda_registers(hw, adda_reg,
                                                 rtlphy->adda_backup, 16);
                 _rtl92c_phy_save_mac_registers(hw, iqk_mac_reg,
                                                rtlphy->iqk_mac_backup);
-                _rtl92c_phy_save_adda_registers(hw, iqk_bb_reg_92C,
-                                                rtlphy->iqk_bb_backup, 9);
         }
         _rtl92c_phy_path_adda_on(hw, adda_reg, true, is2t);
         if (t == 0) {
-                rtlphy->rfpi_enable = (u8) rtl_get_bbreg(hw,
-                                                   RFPGA0_XA_HSSIPARAMETER1,
-                                                   BIT(8));
+                rtlphy->rfpi_enable =
+                   (u8)rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
+                                     BIT(8));
         }
 
         if (!rtlphy->rfpi_enable)
                 _rtl92c_phy_pi_mode_switch(hw, true);
-
-        rtl_set_bbreg(hw, 0x800, BIT(24), 0x0);
-
+        if (t == 0) {
+                rtlphy->reg_c04 = rtl_get_bbreg(hw, 0xc04, MASKDWORD);
+                rtlphy->reg_c08 = rtl_get_bbreg(hw, 0xc08, MASKDWORD);
+                rtlphy->reg_874 = rtl_get_bbreg(hw, 0x874, MASKDWORD);
+        }
         rtl_set_bbreg(hw, 0xc04, MASKDWORD, 0x03a05600);
         rtl_set_bbreg(hw, 0xc08, MASKDWORD, 0x000800e4);
         rtl_set_bbreg(hw, 0x874, MASKDWORD, 0x22204000);
-
-        rtl_set_bbreg(hw, 0x870, BIT(10), 0x1);
-        rtl_set_bbreg(hw, 0x870, BIT(26), 0x1);
-        rtl_set_bbreg(hw, 0x860, BIT(10), 0x0);
-        rtl_set_bbreg(hw, 0x864, BIT(10), 0x0);
-
         if (is2t) {
                 rtl_set_bbreg(hw, 0x840, MASKDWORD, 0x00010000);
                 rtl_set_bbreg(hw, 0x844, MASKDWORD, 0x00010000);
@@ -1228,8 +1312,8 @@ static void _rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw,
                         pathb_ok = _rtl92c_phy_path_b_iqk(hw);
                         if (pathb_ok == 0x03) {
                                 result[t][4] = (rtl_get_bbreg(hw,
-                                                      0xeb4,
-                                                      MASKDWORD) &
+                                                              0xeb4,
+                                                              MASKDWORD) &
                                                 0x3FF0000) >> 16;
                                 result[t][5] =
                                     (rtl_get_bbreg(hw, 0xebc, MASKDWORD) &
@@ -1243,17 +1327,21 @@ static void _rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw,
                                 break;
                         } else if (i == (retrycount - 1) && pathb_ok == 0x01) {
                                 result[t][4] = (rtl_get_bbreg(hw,
-                                                      0xeb4,
-                                                      MASKDWORD) &
+                                                              0xeb4,
+                                                              MASKDWORD) &
                                                 0x3FF0000) >> 16;
                         }
                         result[t][5] = (rtl_get_bbreg(hw, 0xebc, MASKDWORD) &
                                         0x3FF0000) >> 16;
                 }
         }
-
+        rtl_set_bbreg(hw, 0xc04, MASKDWORD, rtlphy->reg_c04);
+        rtl_set_bbreg(hw, 0x874, MASKDWORD, rtlphy->reg_874);
+        rtl_set_bbreg(hw, 0xc08, MASKDWORD, rtlphy->reg_c08);
         rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0);
-
+        rtl_set_bbreg(hw, 0x840, MASKDWORD, 0x00032ed3);
+        if (is2t)
+                rtl_set_bbreg(hw, 0x844, MASKDWORD, 0x00032ed3);
         if (t != 0) {
                 if (!rtlphy->rfpi_enable)
                         _rtl92c_phy_pi_mode_switch(hw, false);
@@ -1261,379 +1349,12 @@ static void _rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw,
                                                   rtlphy->adda_backup, 16);
                 _rtl92c_phy_reload_mac_registers(hw, iqk_mac_reg,
                                                  rtlphy->iqk_mac_backup);
-                _rtl92c_phy_reload_adda_registers(hw, iqk_bb_reg_92C,
-                                                  rtlphy->iqk_bb_backup, 9);
-
-                rtl_set_bbreg(hw, 0x840, MASKDWORD, 0x00032ed3);
-                if (is2t)
-                        rtl_set_bbreg(hw, 0x844, MASKDWORD, 0x00032ed3);
-
-                rtl_set_bbreg(hw, 0xe30, MASKDWORD, 0x01008c00);
-                rtl_set_bbreg(hw, 0xe34, MASKDWORD, 0x01008c00);
         }
 }
 
 static void _rtl92c_phy_ap_calibrate(struct ieee80211_hw *hw,
                                      char delta, bool is2t)
 {
-#if 0 /* This routine is deliberately dummied out for later fixes */
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-
-        u32 reg_d[PATH_NUM];
-        u32 tmpreg, index, offset, path, i, pathbound = PATH_NUM, apkbound;
-
-        u32 bb_backup[APK_BB_REG_NUM];
-        u32 bb_reg[APK_BB_REG_NUM] = {
-                0x904, 0xc04, 0x800, 0xc08, 0x874
-        };
-        u32 bb_ap_mode[APK_BB_REG_NUM] = {
-                0x00000020, 0x00a05430, 0x02040000,
-                0x000800e4, 0x00204000
-        };
-        u32 bb_normal_ap_mode[APK_BB_REG_NUM] = {
-                0x00000020, 0x00a05430, 0x02040000,
-                0x000800e4, 0x22204000
-        };
-
-        u32 afe_backup[APK_AFE_REG_NUM];
-        u32 afe_reg[APK_AFE_REG_NUM] = {
-                0x85c, 0xe6c, 0xe70, 0xe74, 0xe78,
-                0xe7c, 0xe80, 0xe84, 0xe88, 0xe8c,
-                0xed0, 0xed4, 0xed8, 0xedc, 0xee0,
-                0xeec
-        };
-
-        u32 mac_backup[IQK_MAC_REG_NUM];
-        u32 mac_reg[IQK_MAC_REG_NUM] = {
-                0x522, 0x550, 0x551, 0x040
-        };
-
-        u32 apk_rf_init_value[PATH_NUM][APK_BB_REG_NUM] = {
-                {0x0852c, 0x1852c, 0x5852c, 0x1852c, 0x5852c},
-                {0x2852e, 0x0852e, 0x3852e, 0x0852e, 0x0852e}
-        };
-
-        u32 apk_normal_rf_init_value[PATH_NUM][APK_BB_REG_NUM] = {
-                {0x0852c, 0x0a52c, 0x3a52c, 0x5a52c, 0x5a52c},
-                {0x0852c, 0x0a52c, 0x5a52c, 0x5a52c, 0x5a52c}
-        };
-
-        u32 apk_rf_value_0[PATH_NUM][APK_BB_REG_NUM] = {
-                {0x52019, 0x52014, 0x52013, 0x5200f, 0x5208d},
-                {0x5201a, 0x52019, 0x52016, 0x52033, 0x52050}
-        };
-
-        u32 apk_normal_rf_value_0[PATH_NUM][APK_BB_REG_NUM] = {
-                {0x52019, 0x52017, 0x52010, 0x5200d, 0x5206a},
-                {0x52019, 0x52017, 0x52010, 0x5200d, 0x5206a}
-        };
-
-        u32 afe_on_off[PATH_NUM] = {
-                0x04db25a4, 0x0b1b25a4
-        };
-
-        const u32 apk_offset[PATH_NUM] = { 0xb68, 0xb6c };
-
-        u32 apk_normal_offset[PATH_NUM] = { 0xb28, 0xb98 };
-
-        u32 apk_value[PATH_NUM] = { 0x92fc0000, 0x12fc0000 };
-
-        u32 apk_normal_value[PATH_NUM] = { 0x92680000, 0x12680000 };
-
-        const char apk_delta_mapping[APK_BB_REG_NUM][13] = {
-                {-4, -3, -2, -2, -1, -1, 0, 1, 2, 3, 4, 5, 6},
-                {-4, -3, -2, -2, -1, -1, 0, 1, 2, 3, 4, 5, 6},
-                {-6, -4, -2, -2, -1, -1, 0, 1, 2, 3, 4, 5, 6},
-                {-1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6},
-                {-11, -9, -7, -5, -3, -1, 0, 0, 0, 0, 0, 0, 0}
-        };
-
-        const u32 apk_normal_setting_value_1[13] = {
-                0x01017018, 0xf7ed8f84, 0x1b1a1816, 0x2522201e, 0x322e2b28,
-                0x433f3a36, 0x5b544e49, 0x7b726a62, 0xa69a8f84, 0xdfcfc0b3,
-                0x12680000, 0x00880000, 0x00880000
-        };
-
-        const u32 apk_normal_setting_value_2[16] = {
-                0x01c7021d, 0x01670183, 0x01000123, 0x00bf00e2, 0x008d00a3,
-                0x0068007b, 0x004d0059, 0x003a0042, 0x002b0031, 0x001f0025,
-                0x0017001b, 0x00110014, 0x000c000f, 0x0009000b, 0x00070008,
-                0x00050006
-        };
-
-        u32 apk_result[PATH_NUM][APK_BB_REG_NUM];
-
-        long bb_offset, delta_v, delta_offset;
-
-        if (!is2t)
-                pathbound = 1;
-
-        return;
-
-        for (index = 0; index < PATH_NUM; index++) {
-                apk_offset[index] = apk_normal_offset[index];
-                apk_value[index] = apk_normal_value[index];
-                afe_on_off[index] = 0x6fdb25a4;
-        }
-
-        for (index = 0; index < APK_BB_REG_NUM; index++) {
-                for (path = 0; path < pathbound; path++) {
-                        apk_rf_init_value[path][index] =
-                            apk_normal_rf_init_value[path][index];
-                        apk_rf_value_0[path][index] =
-                            apk_normal_rf_value_0[path][index];
-                }
-                bb_ap_mode[index] = bb_normal_ap_mode[index];
-
-                apkbound = 6;
-        }
-
-        for (index = 0; index < APK_BB_REG_NUM; index++) {
-                if (index == 0)
-                        continue;
-                bb_backup[index] = rtl_get_bbreg(hw, bb_reg[index], MASKDWORD);
-        }
-
-        _rtl92c_phy_save_mac_registers(hw, mac_reg, mac_backup);
-
-        _rtl92c_phy_save_adda_registers(hw, afe_reg, afe_backup, 16);
-
-        for (path = 0; path < pathbound; path++) {
-                if (path == RF90_PATH_A) {
-                        offset = 0xb00;
-                        for (index = 0; index < 11; index++) {
-                                rtl_set_bbreg(hw, offset, MASKDWORD,
-                                              apk_normal_setting_value_1
-                                              [index]);
-
-                                offset += 0x04;
-                        }
-
-                        rtl_set_bbreg(hw, 0xb98, MASKDWORD, 0x12680000);
-
-                        offset = 0xb68;
-                        for (; index < 13; index++) {
-                                rtl_set_bbreg(hw, offset, MASKDWORD,
-                                              apk_normal_setting_value_1
-                                              [index]);
-
-                                offset += 0x04;
-                        }
-
-                        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x40000000);
-
-                        offset = 0xb00;
-                        for (index = 0; index < 16; index++) {
-                                rtl_set_bbreg(hw, offset, MASKDWORD,
-                                              apk_normal_setting_value_2
-                                              [index]);
-
-                                offset += 0x04;
-                        }
-                        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x00000000);
-                } else if (path == RF90_PATH_B) {
-                        offset = 0xb70;
-                        for (index = 0; index < 10; index++) {
-                                rtl_set_bbreg(hw, offset, MASKDWORD,
-                                              apk_normal_setting_value_1
-                                              [index]);
-
-                                offset += 0x04;
-                        }
-                        rtl_set_bbreg(hw, 0xb28, MASKDWORD, 0x12680000);
-                        rtl_set_bbreg(hw, 0xb98, MASKDWORD, 0x12680000);
-
-                        offset = 0xb68;
-                        index = 11;
-                        for (; index < 13; index++) {
-                                rtl_set_bbreg(hw, offset, MASKDWORD,
-                                              apk_normal_setting_value_1
-                                              [index]);
-
-                                offset += 0x04;
-                        }
-
-                        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x40000000);
-
-                        offset = 0xb60;
-                        for (index = 0; index < 16; index++) {
-                                rtl_set_bbreg(hw, offset, MASKDWORD,
-                                              apk_normal_setting_value_2
-                                              [index]);
-
-                                offset += 0x04;
-                        }
-                        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x00000000);
-                }
-
-                reg_d[path] = rtl_get_rfreg(hw, (enum radio_path)path,
-                                            0xd, MASKDWORD);
-
-                for (index = 0; index < APK_AFE_REG_NUM; index++)
-                        rtl_set_bbreg(hw, afe_reg[index], MASKDWORD,
-                                      afe_on_off[path]);
-
-                if (path == RF90_PATH_A) {
-                        for (index = 0; index < APK_BB_REG_NUM; index++) {
-                                if (index == 0)
-                                        continue;
-                                rtl_set_bbreg(hw, bb_reg[index], MASKDWORD,
-                                              bb_ap_mode[index]);
-                        }
-                }
-
-                _rtl92c_phy_mac_setting_calibration(hw, mac_reg, mac_backup);
-
-                if (path == 0) {
-                        rtl_set_rfreg(hw, RF90_PATH_B, 0x0, MASKDWORD, 0x10000);
-                } else {
-                        rtl_set_rfreg(hw, RF90_PATH_A, 0x00, MASKDWORD,
-                                      0x10000);
-                        rtl_set_rfreg(hw, RF90_PATH_A, 0x10, MASKDWORD,
-                                      0x1000f);
-                        rtl_set_rfreg(hw, RF90_PATH_A, 0x11, MASKDWORD,
-                                      0x20103);
-                }
-
-                delta_offset = ((delta + 14) / 2);
-                if (delta_offset < 0)
-                        delta_offset = 0;
-                else if (delta_offset > 12)
-                        delta_offset = 12;
-
-                for (index = 0; index < APK_BB_REG_NUM; index++) {
-                        if (index != 1)
-                                continue;
-
-                        tmpreg = apk_rf_init_value[path][index];
-
-                        if (!rtlefuse->apk_thermalmeterignore) {
-                                bb_offset = (tmpreg & 0xF0000) >> 16;
-
-                                if (!(tmpreg & BIT(15)))
-                                        bb_offset = -bb_offset;
-
-                                delta_v =
-                                    apk_delta_mapping[index][delta_offset];
-
-                                bb_offset += delta_v;
-
-                                if (bb_offset < 0) {
-                                        tmpreg = tmpreg & (~BIT(15));
-                                        bb_offset = -bb_offset;
-                                } else {
-                                        tmpreg = tmpreg | BIT(15);
-                                }
-
-                                tmpreg =
-                                    (tmpreg & 0xFFF0FFFF) | (bb_offset << 16);
-                        }
-
-                        rtl_set_rfreg(hw, (enum radio_path)path, 0xc,
-                                      MASKDWORD, 0x8992e);
-                        rtl_set_rfreg(hw, (enum radio_path)path, 0x0,
-                                      MASKDWORD, apk_rf_value_0[path][index]);
-                        rtl_set_rfreg(hw, (enum radio_path)path, 0xd,
-                                      MASKDWORD, tmpreg);
-
-                        i = 0;
-                        do {
-                                rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x80000000);
-                                rtl_set_bbreg(hw, apk_offset[path],
-                                              MASKDWORD, apk_value[0]);
-                                RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                        ("PHY_APCalibrate() offset 0x%x "
-                                         "value 0x%x\n",
-                                         apk_offset[path],
-                                         rtl_get_bbreg(hw, apk_offset[path],
-                                                       MASKDWORD)));
-
-                                mdelay(3);
-
-                                rtl_set_bbreg(hw, apk_offset[path],
-                                              MASKDWORD, apk_value[1]);
-                                RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                        ("PHY_APCalibrate() offset 0x%x "
-                                         "value 0x%x\n",
-                                         apk_offset[path],
-                                         rtl_get_bbreg(hw, apk_offset[path],
-                                                       MASKDWORD)));
-
-                                mdelay(20);
-
-                                rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x00000000);
-
-                                if (path == RF90_PATH_A)
-                                        tmpreg = rtl_get_bbreg(hw, 0xbd8,
-                                                               0x03E00000);
-                                else
-                                        tmpreg = rtl_get_bbreg(hw, 0xbd8,
-                                                               0xF8000000);
-
-                                RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                        ("PHY_APCalibrate() offset "
-                                         "0xbd8[25:21] %x\n", tmpreg));
-
-                                i++;
-
-                        } while (tmpreg > apkbound && i < 4);
-
-                        apk_result[path][index] = tmpreg;
-                }
-        }
-
-        _rtl92c_phy_reload_mac_registers(hw, mac_reg, mac_backup);
-
-        for (index = 0; index < APK_BB_REG_NUM; index++) {
-                if (index == 0)
-                        continue;
-                rtl_set_bbreg(hw, bb_reg[index], MASKDWORD, bb_backup[index]);
-        }
-
-        _rtl92c_phy_reload_adda_registers(hw, afe_reg, afe_backup, 16);
-
-        for (path = 0; path < pathbound; path++) {
-                rtl_set_rfreg(hw, (enum radio_path)path, 0xd,
-                              MASKDWORD, reg_d[path]);
-
-                if (path == RF90_PATH_B) {
-                        rtl_set_rfreg(hw, RF90_PATH_A, 0x10, MASKDWORD,
-                                      0x1000f);
-                        rtl_set_rfreg(hw, RF90_PATH_A, 0x11, MASKDWORD,
-                                      0x20101);
-                }
-
-                if (apk_result[path][1] > 6)
-                        apk_result[path][1] = 6;
-        }
-
-        for (path = 0; path < pathbound; path++) {
-                rtl_set_rfreg(hw, (enum radio_path)path, 0x3, MASKDWORD,
-                              ((apk_result[path][1] << 15) |
-                               (apk_result[path][1] << 10) |
-                               (apk_result[path][1] << 5) |
-                               apk_result[path][1]));
-
-                if (path == RF90_PATH_A)
-                        rtl_set_rfreg(hw, (enum radio_path)path, 0x4, MASKDWORD,
-                                      ((apk_result[path][1] << 15) |
-                                       (apk_result[path][1] << 10) |
-                                       (0x00 << 5) | 0x05));
-                else
-                        rtl_set_rfreg(hw, (enum radio_path)path, 0x4, MASKDWORD,
-                                      ((apk_result[path][1] << 15) |
-                                       (apk_result[path][1] << 10) |
-                                       (0x02 << 5) | 0x05));
-
-                rtl_set_rfreg(hw, (enum radio_path)path, 0xe, MASKDWORD,
-                              ((0x08 << 15) | (0x08 << 10) | (0x08 << 5) |
-                               0x08));
-
-        }
-        rtlphy->b_apk_done = true;
-#endif
 }
 
 static void _rtl92c_phy_set_rfpath_switch(struct ieee80211_hw *hw,
@@ -1657,15 +1378,13 @@ static void _rtl92c_phy_set_rfpath_switch(struct ieee80211_hw *hw,
                         rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, 0x300, 0x2);
                 else
                         rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, 0x300, 0x1);
-
         }
-
 }
 
 #undef IQK_ADDA_REG_NUM
 #undef IQK_DELAY_TIME
 
-void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
+void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -1673,10 +1392,10 @@ void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
 
         long result[4][8];
         u8 i, final_candidate;
-        bool patha_ok, pathb_ok;
-        long reg_e94, reg_e9c, reg_ea4, reg_eb4, reg_ebc, reg_ec4, reg_tmp = 0;
+        bool b_patha_ok, b_pathb_ok;
+        long reg_e94, reg_e9c, reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4,
+            reg_ecc, reg_tmp = 0;
         bool is12simular, is13simular, is23simular;
-        bool start_conttx = false, singletone = false;
         u32 iqk_bb_reg[10] = {
                 ROFDM0_XARXIQIMBALANCE,
                 ROFDM0_XBRXIQIMBALANCE,
@@ -1690,14 +1409,12 @@ void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 ROFDM0_RXIQEXTANTA
         };
 
-        if (recovery) {
+        if (b_recovery) {
                 _rtl92c_phy_reload_adda_registers(hw,
                                                   iqk_bb_reg,
                                                   rtlphy->iqk_bb_backup, 10);
                 return;
         }
-        if (start_conttx || singletone)
-                return;
         for (i = 0; i < 8; i++) {
                 result[0][i] = 0;
                 result[1][i] = 0;
@@ -1705,8 +1422,8 @@ void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 result[3][i] = 0;
         }
         final_candidate = 0xff;
-        patha_ok = false;
-        pathb_ok = false;
+        b_patha_ok = false;
+        b_pathb_ok = false;
         is12simular = false;
         is23simular = false;
         is13simular = false;
@@ -1752,29 +1469,34 @@ void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 reg_e94 = result[i][0];
                 reg_e9c = result[i][1];
                 reg_ea4 = result[i][2];
+                reg_eac = result[i][3];
                 reg_eb4 = result[i][4];
                 reg_ebc = result[i][5];
                 reg_ec4 = result[i][6];
+                reg_ecc = result[i][7];
         }
         if (final_candidate != 0xff) {
                 rtlphy->reg_e94 = reg_e94 = result[final_candidate][0];
                 rtlphy->reg_e9c = reg_e9c = result[final_candidate][1];
                 reg_ea4 = result[final_candidate][2];
+                reg_eac = result[final_candidate][3];
                 rtlphy->reg_eb4 = reg_eb4 = result[final_candidate][4];
                 rtlphy->reg_ebc = reg_ebc = result[final_candidate][5];
                 reg_ec4 = result[final_candidate][6];
-                patha_ok = pathb_ok = true;
+                reg_ecc = result[final_candidate][7];
+                b_patha_ok = true;
+                b_pathb_ok = true;
         } else {
                 rtlphy->reg_e94 = rtlphy->reg_eb4 = 0x100;
                 rtlphy->reg_e9c = rtlphy->reg_ebc = 0x0;
         }
         if (reg_e94 != 0) /*&&(reg_ea4 != 0) */
-                _rtl92c_phy_path_a_fill_iqk_matrix(hw, patha_ok, result,
+                _rtl92c_phy_path_a_fill_iqk_matrix(hw, b_patha_ok, result,
                                                    final_candidate,
                                                    (reg_ea4 == 0));
         if (IS_92C_SERIAL(rtlhal->version)) {
                 if (reg_eb4 != 0) /*&&(reg_ec4 != 0) */
-                        _rtl92c_phy_path_b_fill_iqk_matrix(hw, pathb_ok,
+                        _rtl92c_phy_path_b_fill_iqk_matrix(hw, b_pathb_ok,
                                                            result,
                                                            final_candidate,
                                                            (reg_ec4 == 0));
@@ -1788,10 +1510,7 @@ void rtl92c_phy_lc_calibrate(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        bool start_conttx = false, singletone = false;
 
-        if (start_conttx || singletone)
-                return;
         if (IS_92C_SERIAL(rtlhal->version))
                 rtlpriv->cfg->ops->phy_lc_calibrate(hw, true);
         else
@@ -1833,22 +1552,22 @@ bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                  "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
-                 iotype, rtlphy->set_io_inprogress);
+                  iotype, rtlphy->set_io_inprogress);
         do {
                 switch (iotype) {
                 case IO_CMD_RESUME_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 "[IO CMD] Resume DM after scan\n");
+                                 "[IO CMD] Resume DM after scan.\n");
                         postprocessing = true;
                         break;
-                case IO_CMD_PAUSE_DM_BY_SCAN:
+                case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 "[IO CMD] Pause DM before scan\n");
+                                 "[IO CMD] Pause DM before scan.\n");
                         postprocessing = true;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
                         break;
                 }
         } while (false);
@@ -1859,7 +1578,7 @@ bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                 return false;
         }
         rtl92c_phy_set_io(hw);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<--IO Type(%#x)\n", iotype);
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
         return true;
 }
 EXPORT_SYMBOL(rtl92c_phy_set_io_cmd);
@@ -1868,30 +1587,30 @@ void rtl92c_phy_set_io(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct dig_t dm_digtable = rtlpriv->dm_digtable;
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                  "--->Cmd(%#x), set_io_inprogress(%d)\n",
-                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
+                  rtlphy->current_io_type, rtlphy->set_io_inprogress);
         switch (rtlphy->current_io_type) {
         case IO_CMD_RESUME_DM_BY_SCAN:
-                dm_digtable.cur_igvalue = rtlphy->initgain_backup.xaagccore1;
+                dm_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
                 rtl92c_dm_write_dig(hw);
                 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
                 break;
-        case IO_CMD_PAUSE_DM_BY_SCAN:
-                rtlphy->initgain_backup.xaagccore1 = dm_digtable.cur_igvalue;
-                dm_digtable.cur_igvalue = 0x37;
+        case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
+                rtlphy->initgain_backup.xaagccore1 = dm_digtable->cur_igvalue;
+                dm_digtable->cur_igvalue = 0x17;
                 rtl92c_dm_write_dig(hw);
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
                 break;
         }
         rtlphy->set_io_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<---(%#x)\n",
-                 rtlphy->current_io_type);
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "(%#x)\n", rtlphy->current_io_type);
 }
 EXPORT_SYMBOL(rtl92c_phy_set_io);
 
@@ -1931,7 +1650,7 @@ void _rtl92c_phy_set_rf_sleep(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         "Switch RF timeout !!!\n");
+                         "Switch RF timeout !!!.\n");
                 return;
         }
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
index e79dabe9ba1d..64bc49f4dbc6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
@@ -226,7 +226,7 @@ u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask);
 long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
                                   enum wireless_mode wirelessmode,
                                   u8 txpwridx);
-u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,
+u8 _rtl92c_phy_dbm_to_txpwr_idx(struct ieee80211_hw *hw,
                                 enum wireless_mode wirelessmode,
                                 long power_indbm);
 void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
index fa24de43ce79..831df101d7b7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
@@ -146,21 +146,6 @@ enum version_8192c {
         VERSION_UNKNOWN = 0x88,
 };
 
-#define CUT_VERSION_MASK                (BIT(6)|BIT(7))
-#define CHIP_VENDOR_UMC                 BIT(5)
-#define CHIP_VENDOR_UMC_B_CUT           BIT(6) /* Chip version for ECO */
-#define IS_VENDOR_UMC_A_CUT(version)    ((IS_CHIP_VENDOR_UMC(version)) ? \
-        ((GET_CVID_CUT_VERSION(version)) ? false : true) : false)
-#define IS_CHIP_VER_B(version)  ((version & CHIP_VER_B) ? true : false)
-#define IS_92C_SERIAL(version)  ((version & CHIP_92C_BITMASK) ? true : false)
-#define IS_CHIP_VENDOR_UMC(version)             \
-        ((version & CHIP_VENDOR_UMC) ? true : false)
-#define GET_CVID_CUT_VERSION(version)   ((version) & CUT_VERSION_MASK)
-#define IS_81xxC_VENDOR_UMC_B_CUT(version)              \
-        ((IS_CHIP_VENDOR_UMC(version)) ? \
-        ((GET_CVID_CUT_VERSION(version) == CHIP_VENDOR_UMC_B_CUT) ?     \
-        true : false) : false)
-
 enum rtl819x_loopback_e {
         RTL819X_NO_LOOPBACK = 0,
         RTL819X_MAC_LOOPBACK = 1,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
index d4a3d032c7bf..9c5311c299fd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
@@ -86,70 +86,6 @@
 #define TX_POWER_NEAR_FIELD_THRESH_LVL2         74
 #define TX_POWER_NEAR_FIELD_THRESH_LVL1         67
 
-struct swat_t {
-        u8 failure_cnt;
-        u8 try_flag;
-        u8 stop_trying;
-        long pre_rssi;
-        long trying_threshold;
-        u8 cur_antenna;
-        u8 pre_antenna;
-};
-
-enum tag_dynamic_init_gain_operation_type_definition {
-        DIG_TYPE_THRESH_HIGH = 0,
-        DIG_TYPE_THRESH_LOW = 1,
-        DIG_TYPE_BACKOFF = 2,
-        DIG_TYPE_RX_GAIN_MIN = 3,
-        DIG_TYPE_RX_GAIN_MAX = 4,
-        DIG_TYPE_ENABLE = 5,
-        DIG_TYPE_DISABLE = 6,
-        DIG_OP_TYPE_MAX
-};
-
-enum tag_cck_packet_detection_threshold_type_definition {
-        CCK_PD_STAGE_LowRssi = 0,
-        CCK_PD_STAGE_HighRssi = 1,
-        CCK_FA_STAGE_Low = 2,
-        CCK_FA_STAGE_High = 3,
-        CCK_PD_STAGE_MAX = 4,
-};
-
-enum dm_1r_cca_e {
-        CCA_1R = 0,
-        CCA_2R = 1,
-        CCA_MAX = 2,
-};
-
-enum dm_rf_e {
-        RF_SAVE = 0,
-        RF_NORMAL = 1,
-        RF_MAX = 2,
-};
-
-enum dm_sw_ant_switch_e {
-        ANS_ANTENNA_B = 1,
-        ANS_ANTENNA_A = 2,
-        ANS_ANTENNA_MAX = 3,
-};
-
-enum dm_dig_ext_port_alg_e {
-        DIG_EXT_PORT_STAGE_0 = 0,
-        DIG_EXT_PORT_STAGE_1 = 1,
-        DIG_EXT_PORT_STAGE_2 = 2,
-        DIG_EXT_PORT_STAGE_3 = 3,
-        DIG_EXT_PORT_STAGE_MAX = 4,
-};
-
-enum dm_dig_connect_e {
-        DIG_STA_DISCONNECT = 0,
-        DIG_STA_CONNECT = 1,
-        DIG_STA_BEFORE_CONNECT = 2,
-        DIG_MULTISTA_DISCONNECT = 3,
-        DIG_MULTISTA_CONNECT = 4,
-        DIG_CONNECT_MAX
-};
-
 void rtl92c_dm_init(struct ieee80211_hw *hw);
 void rtl92c_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92c_dm_write_dig(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index df98a5e4729a..8ec0f031f48a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -37,7 +37,9 @@
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
+#include "../rtl8192c/dm_common.h"
 #include "../rtl8192c/fw_common.h"
+#include "../rtl8192c/phy_common.h"
 #include "dm.h"
 #include "led.h"
 #include "hw.h"
@@ -53,7 +55,7 @@ static void _rtl92ce_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
         rtlpci->reg_bcn_ctrl_val |= set_bits;
         rtlpci->reg_bcn_ctrl_val &= ~clear_bits;
 
-        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8) rtlpci->reg_bcn_ctrl_val);
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8)rtlpci->reg_bcn_ctrl_val);
 }
 
 static void _rtl92ce_stop_tx_beacon(struct ieee80211_hw *hw)
@@ -985,7 +987,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
             !IS_92C_SERIAL(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);
@@ -1330,7 +1332,7 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
         rtl_write_word(rtlpriv, REG_GPIO_IO_SEL, 0x0790);
         rtl_write_word(rtlpriv, REG_LEDCFG0, 0x8080);
         rtl_write_byte(rtlpriv, REG_AFE_PLL_CTRL, 0x80);
-        if (!IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
+        if (!IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))
                 rtl_write_byte(rtlpriv, REG_SPS0_CTRL, 0x23);
         if (rtlpcipriv->bt_coexist.bt_coexistence) {
                 u4b_tmp = rtl_read_dword(rtlpriv, REG_AFE_XTAL_CTRL);
@@ -1494,7 +1496,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
-                        index = _rtl92c_get_chnl_group((u8) i);
+                        index = rtl92c_get_chnl_group((u8)i);
 
                         rtlefuse->txpwrlevel_cck[rf_path][i] =
                             rtlefuse->eeprom_chnlarea_txpwr_cck[rf_path][index];
@@ -1543,7 +1545,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
-                        index = _rtl92c_get_chnl_group((u8) i);
+                        index = rtl92c_get_chnl_group((u8)i);
 
                         if (rf_path == RF90_PATH_A) {
                                 rtlefuse->pwrgroup_ht20[rf_path][i] =
@@ -1573,7 +1575,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         }
 
         for (i = 0; i < 14; i++) {
-                index = _rtl92c_get_chnl_group((u8) i);
+                index = rtl92c_get_chnl_group((u8)i);
 
                 if (!autoload_fail)
                         tempval = hwinfo[EEPROM_TXPOWERHT20DIFF + index];
@@ -1590,7 +1592,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 if (rtlefuse->txpwr_ht20diff[RF90_PATH_B][i] & BIT(3))
                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i] |= 0xF0;
 
-                index = _rtl92c_get_chnl_group((u8) i);
+                index = rtl92c_get_chnl_group((u8)i);
 
                 if (!autoload_fail)
                         tempval = hwinfo[EEPROM_TXPOWER_OFDMDIFF + index];
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
index 5533070f266c..98a086822aac 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
@@ -30,7 +30,7 @@
 #ifndef __RTL92CE_HW_H__
 #define __RTL92CE_HW_H__
 
-static inline u8 _rtl92c_get_chnl_group(u8 chnl)
+static inline u8 rtl92c_get_chnl_group(u8 chnl)
 {
         u8 group;
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index 98b22303c84d..bc5ca989b915 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
@@ -35,8 +35,11 @@
 #include "def.h"
 #include "hw.h"
 #include "phy.h"
+#include "../rtl8192c/phy_common.h"
 #include "rf.h"
 #include "dm.h"
+#include "../rtl8192c/dm_common.h"
+#include "../rtl8192c/fw_common.h"
 #include "table.h"
 
 static bool _rtl92c_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
index 94486cca4000..e5e1353a94c3 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
@@ -78,113 +78,6 @@
 
 #define RTL92C_MAX_PATH_NUM             2
 
-enum swchnlcmd_id {
-        CMDID_END,
-        CMDID_SET_TXPOWEROWER_LEVEL,
-        CMDID_BBREGWRITE10,
-        CMDID_WRITEPORT_ULONG,
-        CMDID_WRITEPORT_USHORT,
-        CMDID_WRITEPORT_UCHAR,
-        CMDID_RF_WRITEREG,
-};
-
-struct swchnlcmd {
-        enum swchnlcmd_id cmdid;
-        u32 para1;
-        u32 para2;
-        u32 msdelay;
-};
-
-enum hw90_block_e {
-        HW90_BLOCK_MAC = 0,
-        HW90_BLOCK_PHY0 = 1,
-        HW90_BLOCK_PHY1 = 2,
-        HW90_BLOCK_RF = 3,
-        HW90_BLOCK_MAXIMUM = 4,
-};
-
-enum baseband_config_type {
-        BASEBAND_CONFIG_PHY_REG = 0,
-        BASEBAND_CONFIG_AGC_TAB = 1,
-};
-
-enum ra_offset_area {
-        RA_OFFSET_LEGACY_OFDM1,
-        RA_OFFSET_LEGACY_OFDM2,
-        RA_OFFSET_HT_OFDM1,
-        RA_OFFSET_HT_OFDM2,
-        RA_OFFSET_HT_OFDM3,
-        RA_OFFSET_HT_OFDM4,
-        RA_OFFSET_HT_CCK,
-};
-
-enum antenna_path {
-        ANTENNA_NONE,
-        ANTENNA_D,
-        ANTENNA_C,
-        ANTENNA_CD,
-        ANTENNA_B,
-        ANTENNA_BD,
-        ANTENNA_BC,
-        ANTENNA_BCD,
-        ANTENNA_A,
-        ANTENNA_AD,
-        ANTENNA_AC,
-        ANTENNA_ACD,
-        ANTENNA_AB,
-        ANTENNA_ABD,
-        ANTENNA_ABC,
-        ANTENNA_ABCD
-};
-
-struct r_antenna_select_ofdm {
-        u32 r_tx_antenna:4;
-        u32 r_ant_l:4;
-        u32 r_ant_non_ht:4;
-        u32 r_ant_ht1:4;
-        u32 r_ant_ht2:4;
-        u32 r_ant_ht_s1:4;
-        u32 r_ant_non_ht_s1:4;
-        u32 ofdm_txsc:2;
-        u32 reserved:2;
-};
-
-struct r_antenna_select_cck {
-        u8 r_cckrx_enable_2:2;
-        u8 r_cckrx_enable:2;
-        u8 r_ccktx_enable:4;
-};
-
-struct efuse_contents {
-        u8 mac_addr[ETH_ALEN];
-        u8 cck_tx_power_idx[6];
-        u8 ht40_1s_tx_power_idx[6];
-        u8 ht40_2s_tx_power_idx_diff[3];
-        u8 ht20_tx_power_idx_diff[3];
-        u8 ofdm_tx_power_idx_diff[3];
-        u8 ht40_max_power_offset[3];
-        u8 ht20_max_power_offset[3];
-        u8 channel_plan;
-        u8 thermal_meter;
-        u8 rf_option[5];
-        u8 version;
-        u8 oem_id;
-        u8 regulatory;
-};
-
-struct tx_power_struct {
-        u8 cck[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 ht40_1s[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 ht40_2s[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 ht20_diff[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 legacy_ht_diff[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 legacy_ht_txpowerdiff;
-        u8 groupht20[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 groupht40[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 pwrgroup_cnt;
-        u32 mcs_original_offset[4][16];
-};
-
 bool rtl92c_phy_bb_config(struct ieee80211_hw *hw);
 u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask);
 void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index 4bbdfb2df363..d86b5b566444 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -35,6 +35,9 @@
 #include "def.h"
 #include "phy.h"
 #include "dm.h"
+#include "../rtl8192c/dm_common.h"
+#include "../rtl8192c/fw_common.h"
+#include "../rtl8192c/phy_common.h"
 #include "hw.h"
 #include "rf.h"
 #include "sw.h"
@@ -165,7 +168,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
         if (IS_VENDOR_UMC_A_CUT(rtlhal->version) &&
             !IS_92C_SERIAL(rtlhal->version))
                 rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU.bin";
-        else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
+        else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))
                 rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU_B.bin";
 
         rtlpriv->max_fw_size = 0x4000;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 8f04817cb7ec..2fb9c7acb76a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -125,7 +125,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
         u32 rssi, total_rssi = 0;
         bool is_cck_rate;
 
-        is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc);
+        is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);
         pstats->packet_matchbssid = packet_match_bssid;
         pstats->packet_toself = packet_toself;
         pstats->is_cck = is_cck_rate;
@@ -361,7 +361,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
         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);
+        stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);
 
         rx_status->freq = hw->conf.chandef.chan->center_freq;
         rx_status->band = hw->conf.chandef.chan->band;
@@ -389,10 +389,6 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (stats->decrypted) {
-                if (!hdr) {
-                        /* In testing, hdr was NULL here */
-                        return false;
-                }
                 if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/def.h b/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
index f916555e6311..c940a87175ca 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
@@ -38,9 +38,6 @@
 #define CHIP_VENDOR_UMC                 BIT(5)
 #define CHIP_VENDOR_UMC_B_CUT           BIT(6)
 
-#define IS_NORMAL_CHIP(version)         \
-        (((version) & NORMAL_CHIP) ? true : false)
-
 #define IS_8723_SERIES(version)         \
         (((version) & CHIP_8723) ? true : false)
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 270cbffcac70..04aa0b5f5b3d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -36,8 +36,11 @@
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
+#include "../rtl8192c/phy_common.h"
 #include "mac.h"
 #include "dm.h"
+#include "../rtl8192c/dm_common.h"
+#include "../rtl8192c/fw_common.h"
 #include "hw.h"
 #include "../rtl8192ce/hw.h"
 #include "trx.h"
@@ -180,7 +183,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                                 eprom_chnl_txpwr_ht40_2sdf[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
-                        index = _rtl92c_get_chnl_group((u8) i);
+                        index = rtl92c_get_chnl_group((u8)i);
                         rtlefuse->txpwrlevel_cck[rf_path][i] =
                             rtlefuse->eeprom_chnlarea_txpwr_cck[rf_path][index];
                         rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
@@ -222,7 +225,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         }
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
-                        index = _rtl92c_get_chnl_group((u8) i);
+                        index = rtl92c_get_chnl_group((u8)i);
                         if (rf_path == RF90_PATH_A) {
                                 rtlefuse->pwrgroup_ht20[rf_path][i] =
                                     (rtlefuse->eeprom_pwrlimit_ht20[index]
@@ -249,7 +252,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 }
         }
         for (i = 0; i < 14; i++) {
-                index = _rtl92c_get_chnl_group((u8) i);
+                index = rtl92c_get_chnl_group((u8)i);
                 if (!autoload_fail)
                         tempval = hwinfo[EEPROM_TXPOWERHT20DIFF + index];
                 else
@@ -261,7 +264,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i] |= 0xF0;
                 if (rtlefuse->txpwr_ht20diff[RF90_PATH_B][i] & BIT(3))
                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i] |= 0xF0;
-                index = _rtl92c_get_chnl_group((u8) i);
+                index = rtl92c_get_chnl_group((u8)i);
                 if (!autoload_fail)
                         tempval = hwinfo[EEPROM_TXPOWER_OFDMDIFF + index];
                 else
@@ -1169,13 +1172,13 @@ n. LEDCFG 0x4C[15:0] = 0x8080
         /* 1. Disable GPIO[7:0] */
         rtl_write_word(rtlpriv, REG_GPIO_PIN_CTRL+2, 0x0000);
         value32 = rtl_read_dword(rtlpriv, REG_GPIO_PIN_CTRL) & 0xFFFF00FF;
-        value8 = (u8) (value32&0x000000FF);
+        value8 = (u8)(value32&0x000000FF);
         value32 |= ((value8<<8) | 0x00FF0000);
         rtl_write_dword(rtlpriv, REG_GPIO_PIN_CTRL, value32);
         /* 2. Disable GPIO[10:8] */
         rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG+3, 0x00);
         value16 = rtl_read_word(rtlpriv, REG_GPIO_MUXCFG+2) & 0xFF0F;
-        value8 = (u8) (value16&0x000F);
+        value8 = (u8)(value16&0x000F);
         value16 |= ((value8<<4) | 0x0780);
         rtl_write_word(rtlpriv, REG_GPIO_PIN_CTRL+2, value16);
         /* 3. Disable LED0 & 1 */
@@ -1245,7 +1248,7 @@ static void _rtl92cu_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
 
         rtlusb->reg_bcn_ctrl_val |= set_bits;
         rtlusb->reg_bcn_ctrl_val &= ~clear_bits;
-        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8) rtlusb->reg_bcn_ctrl_val);
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8)rtlusb->reg_bcn_ctrl_val);
 }
 
 static void _rtl92cu_stop_tx_beacon(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index e26312fb4356..c2d8ec6afcda 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -40,6 +40,7 @@
 #include "dm.h"
 #include "mac.h"
 #include "trx.h"
+#include "../rtl8192c/fw_common.h"
 
 #include <linux/module.h>
 
@@ -786,7 +787,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,
         bool is_cck_rate;
         u8 *pdesc = (u8 *)p_desc;
 
-        is_cck_rate = RX_HAL_IS_CCK_RATE(p_desc);
+        is_cck_rate = RX_HAL_IS_CCK_RATE(p_desc->rxmcs);
         pstats->packet_matchbssid = packet_match_bssid;
         pstats->packet_toself = packet_toself;
         pstats->packet_beacon = packet_beacon;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index 9831ff1128ca..12f6d474b492 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
@@ -34,8 +34,11 @@
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
+#include "../rtl8192c/phy_common.h"
 #include "rf.h"
 #include "dm.h"
+#include "../rtl8192c/dm_common.h"
+#include "../rtl8192c/fw_common.h"
 #include "table.h"
 
 u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 1ac6383e7947..7c5fbaf5fee0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -42,6 +42,7 @@
 #include "trx.h"
 #include "led.h"
 #include "hw.h"
+#include "../rtl8192c/fw_common.h"
 #include <linux/module.h>
 
 MODULE_AUTHOR("Georgia          <georgia@realtek.com>");
@@ -75,7 +76,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
         if (IS_VENDOR_UMC_A_CUT(rtlpriv->rtlhal.version) &&
             !IS_92C_SERIAL(rtlpriv->rtlhal.version)) {
                 rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cufw_A.bin";
-        } else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlpriv->rtlhal.version)) {
+        } else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlpriv->rtlhal.version)) {
                 rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cufw_B.bin";
         } else {
                 rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cufw_TMSC.bin";
@@ -121,7 +122,6 @@ static struct rtl_hal_ops rtl8192cu_hal_ops = {
         .fill_tx_desc = rtl92cu_tx_fill_desc,
         .fill_fake_txdesc = rtl92cu_fill_fake_txdesc,
         .fill_tx_cmddesc = rtl92cu_tx_fill_cmddesc,
-        .cmd_send_packet = rtl92cu_cmd_send_packet,
         .query_rx_desc = rtl92cu_rx_query_desc,
         .set_channel_access = rtl92cu_update_channel_access_setting,
         .radio_onoff_checking = rtl92cu_gpio_radio_on_off_checking,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 035e0dc3922c..f383d5f1fed5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -38,6 +38,7 @@
 #include "dm.h"
 #include "mac.h"
 #include "trx.h"
+#include "../rtl8192c/fw_common.h"
 
 static int _ConfigVerTOutEP(struct ieee80211_hw *hw)
 {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.h b/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
index 1ffacdda734c..a55a803a0b4d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
@@ -132,18 +132,6 @@ struct rtl92d_firmware_header {
         u32 rsvd5;
 };
 
-enum rtl8192d_h2c_cmd {
-        H2C_AP_OFFLOAD = 0,
-        H2C_SETPWRMODE = 1,
-        H2C_JOINBSSRPT = 2,
-        H2C_RSVDPAGE = 3,
-        H2C_RSSI_REPORT = 5,
-        H2C_RA_MASK = 6,
-        H2C_MAC_MODE_SEL = 9,
-        H2C_PWRM = 15,
-        MAX_H2CCMD
-};
-
 int rtl92d_download_fw(struct ieee80211_hw *hw);
 void rtl92d_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
                          u32 cmd_len, u8 *p_cmdbuffer);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
index 99c2ab5dfceb..8efbcc7af250 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
@@ -127,7 +127,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
         u32 rssi, total_rssi = 0;
         bool is_cck_rate;
 
-        is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc);
+        is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);
         pstats->packet_matchbssid = packet_match_bssid;
         pstats->packet_toself = packet_toself;
         pstats->packet_beacon = packet_beacon;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/Makefile b/drivers/net/wireless/rtlwifi/rtl8192ee/Makefile
new file mode 100644
index 000000000000..11952b99daf8
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/Makefile
@@ -0,0 +1,19 @@
+obj-m := rtl8192ee.o
+
+
+rtl8192ee-objs :=               \
+                dm.o            \
+                fw.o            \
+                hw.o            \
+                led.o           \
+                phy.o           \
+                pwrseq.o        \
+                rf.o            \
+                sw.o            \
+                table.o         \
+                trx.o           \
+
+
+obj-$(CONFIG_RTL8821AE) += rtl8192ee.o
+
+ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/def.h b/drivers/net/wireless/rtlwifi/rtl8192ee/def.h
new file mode 100644
index 000000000000..60f5728b4e2d
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/def.h
@@ -0,0 +1,101 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_DEF_H__
+#define __RTL92E_DEF_H__
+
+#define RX_DESC_NUM_92E                                 512
+
+#define HAL_PRIME_CHNL_OFFSET_DONT_CARE                 0
+#define HAL_PRIME_CHNL_OFFSET_LOWER                     1
+#define HAL_PRIME_CHNL_OFFSET_UPPER                     2
+
+#define RX_MPDU_QUEUE                                   0
+
+#define IS_HT_RATE(_rate)       \
+        (_rate >= DESC92C_RATEMCS0)
+#define IS_CCK_RATE(_rate)      \
+        (_rate >= DESC92C_RATE1M && _rate <= DESC92C_RATE11M)
+#define IS_OFDM_RATE(_rate)     \
+        (_rate >= DESC92C_RATE6M && _rate <= DESC92C_RATE54M)
+
+enum version_8192e {
+        VERSION_TEST_CHIP_2T2R_8192E = 0x0024,
+        VERSION_NORMAL_CHIP_2T2R_8192E = 0x102C,
+        VERSION_UNKNOWN = 0xFF,
+};
+
+enum rx_packet_type {
+        NORMAL_RX,
+        TX_REPORT1,
+        TX_REPORT2,
+        HIS_REPORT,
+        C2H_PACKET,
+};
+
+enum rtl_desc_qsel {
+        QSLT_BK = 0x2,
+        QSLT_BE = 0x0,
+        QSLT_VI = 0x5,
+        QSLT_VO = 0x7,
+        QSLT_BEACON = 0x10,
+        QSLT_HIGH = 0x11,
+        QSLT_MGNT = 0x12,
+        QSLT_CMD = 0x13,
+};
+
+enum rtl_desc92c_rate {
+        DESC92C_RATE1M = 0x00,
+        DESC92C_RATE2M = 0x01,
+        DESC92C_RATE5_5M = 0x02,
+        DESC92C_RATE11M = 0x03,
+
+        DESC92C_RATE6M = 0x04,
+        DESC92C_RATE9M = 0x05,
+        DESC92C_RATE12M = 0x06,
+        DESC92C_RATE18M = 0x07,
+        DESC92C_RATE24M = 0x08,
+        DESC92C_RATE36M = 0x09,
+        DESC92C_RATE48M = 0x0a,
+        DESC92C_RATE54M = 0x0b,
+
+        DESC92C_RATEMCS0 = 0x0c,
+        DESC92C_RATEMCS1 = 0x0d,
+        DESC92C_RATEMCS2 = 0x0e,
+        DESC92C_RATEMCS3 = 0x0f,
+        DESC92C_RATEMCS4 = 0x10,
+        DESC92C_RATEMCS5 = 0x11,
+        DESC92C_RATEMCS6 = 0x12,
+        DESC92C_RATEMCS7 = 0x13,
+        DESC92C_RATEMCS8 = 0x14,
+        DESC92C_RATEMCS9 = 0x15,
+        DESC92C_RATEMCS10 = 0x16,
+        DESC92C_RATEMCS11 = 0x17,
+        DESC92C_RATEMCS12 = 0x18,
+        DESC92C_RATEMCS13 = 0x19,
+        DESC92C_RATEMCS14 = 0x1a,
+        DESC92C_RATEMCS15 = 0x1b,
+};
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8192ee/dm.c
new file mode 100644
index 000000000000..77deedf79d1d
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/dm.c
@@ -0,0 +1,1263 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../base.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "fw.h"
+#include "trx.h"
+
+static const u32 ofdmswing_table[OFDM_TABLE_SIZE] = {
+        0x7f8001fe,             /* 0, +6.0dB */
+        0x788001e2,             /* 1, +5.5dB */
+        0x71c001c7,             /* 2, +5.0dB */
+        0x6b8001ae,             /* 3, +4.5dB */
+        0x65400195,             /* 4, +4.0dB */
+        0x5fc0017f,             /* 5, +3.5dB */
+        0x5a400169,             /* 6, +3.0dB */
+        0x55400155,             /* 7, +2.5dB */
+        0x50800142,             /* 8, +2.0dB */
+        0x4c000130,             /* 9, +1.5dB */
+        0x47c0011f,             /* 10, +1.0dB */
+        0x43c0010f,             /* 11, +0.5dB */
+        0x40000100,             /* 12, +0dB */
+        0x3c8000f2,             /* 13, -0.5dB */
+        0x390000e4,             /* 14, -1.0dB */
+        0x35c000d7,             /* 15, -1.5dB */
+        0x32c000cb,             /* 16, -2.0dB */
+        0x300000c0,             /* 17, -2.5dB */
+        0x2d4000b5,             /* 18, -3.0dB */
+        0x2ac000ab,             /* 19, -3.5dB */
+        0x288000a2,             /* 20, -4.0dB */
+        0x26000098,             /* 21, -4.5dB */
+        0x24000090,             /* 22, -5.0dB */
+        0x22000088,             /* 23, -5.5dB */
+        0x20000080,             /* 24, -6.0dB */
+        0x1e400079,             /* 25, -6.5dB */
+        0x1c800072,             /* 26, -7.0dB */
+        0x1b00006c,             /* 27. -7.5dB */
+        0x19800066,             /* 28, -8.0dB */
+        0x18000060,             /* 29, -8.5dB */
+        0x16c0005b,             /* 30, -9.0dB */
+        0x15800056,             /* 31, -9.5dB */
+        0x14400051,             /* 32, -10.0dB */
+        0x1300004c,             /* 33, -10.5dB */
+        0x12000048,             /* 34, -11.0dB */
+        0x11000044,             /* 35, -11.5dB */
+        0x10000040,             /* 36, -12.0dB */
+        0x0f00003c,             /* 37, -12.5dB */
+        0x0e400039,             /* 38, -13.0dB */
+        0x0d800036,             /* 39, -13.5dB */
+        0x0cc00033,             /* 40, -14.0dB */
+        0x0c000030,             /* 41, -14.5dB */
+        0x0b40002d,             /* 42, -15.0dB */
+};
+
+static const u8 cckswing_table_ch1ch13[CCK_TABLE_SIZE][8] = {
+        {0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04}, /* 0, +0dB */
+        {0x33, 0x32, 0x2b, 0x23, 0x1a, 0x11, 0x08, 0x04}, /* 1, -0.5dB */
+        {0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03}, /* 2, -1.0dB */
+        {0x2d, 0x2d, 0x27, 0x1f, 0x18, 0x0f, 0x08, 0x03}, /* 3, -1.5dB */
+        {0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03}, /* 4, -2.0dB */
+        {0x28, 0x28, 0x22, 0x1c, 0x15, 0x0d, 0x07, 0x03}, /* 5, -2.5dB */
+        {0x26, 0x25, 0x21, 0x1b, 0x14, 0x0d, 0x06, 0x03}, /* 6, -3.0dB */
+        {0x24, 0x23, 0x1f, 0x19, 0x13, 0x0c, 0x06, 0x03}, /* 7, -3.5dB */
+        {0x22, 0x21, 0x1d, 0x18, 0x11, 0x0b, 0x06, 0x02}, /* 8, -4.0dB */
+        {0x20, 0x20, 0x1b, 0x16, 0x11, 0x08, 0x05, 0x02}, /* 9, -4.5dB */
+        {0x1f, 0x1e, 0x1a, 0x15, 0x10, 0x0a, 0x05, 0x02}, /* 10, -5.0dB */
+        {0x1d, 0x1c, 0x18, 0x14, 0x0f, 0x0a, 0x05, 0x02}, /* 11, -5.5dB */
+        {0x1b, 0x1a, 0x17, 0x13, 0x0e, 0x09, 0x04, 0x02}, /* 12, -6.0dB */
+        {0x1a, 0x19, 0x16, 0x12, 0x0d, 0x09, 0x04, 0x02}, /* 13, -6.5dB */
+        {0x18, 0x17, 0x15, 0x11, 0x0c, 0x08, 0x04, 0x02}, /* 14, -7.0dB */
+        {0x17, 0x16, 0x13, 0x10, 0x0c, 0x08, 0x04, 0x02}, /* 15, -7.5dB */
+        {0x16, 0x15, 0x12, 0x0f, 0x0b, 0x07, 0x04, 0x01}, /* 16, -8.0dB */
+        {0x14, 0x14, 0x11, 0x0e, 0x0b, 0x07, 0x03, 0x02}, /* 17, -8.5dB */
+        {0x13, 0x13, 0x10, 0x0d, 0x0a, 0x06, 0x03, 0x01}, /* 18, -9.0dB */
+        {0x12, 0x12, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01}, /* 19, -9.5dB */
+        {0x11, 0x11, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01}, /* 20, -10.0dB */
+        {0x10, 0x10, 0x0e, 0x0b, 0x08, 0x05, 0x03, 0x01}, /* 21, -10.5dB */
+        {0x0f, 0x0f, 0x0d, 0x0b, 0x08, 0x05, 0x03, 0x01}, /* 22, -11.0dB */
+        {0x0e, 0x0e, 0x0c, 0x0a, 0x08, 0x05, 0x02, 0x01}, /* 23, -11.5dB */
+        {0x0d, 0x0d, 0x0c, 0x0a, 0x07, 0x05, 0x02, 0x01}, /* 24, -12.0dB */
+        {0x0d, 0x0c, 0x0b, 0x09, 0x07, 0x04, 0x02, 0x01}, /* 25, -12.5dB */
+        {0x0c, 0x0c, 0x0a, 0x09, 0x06, 0x04, 0x02, 0x01}, /* 26, -13.0dB */
+        {0x0b, 0x0b, 0x0a, 0x08, 0x06, 0x04, 0x02, 0x01}, /* 27, -13.5dB */
+        {0x0b, 0x0a, 0x09, 0x08, 0x06, 0x04, 0x02, 0x01}, /* 28, -14.0dB */
+        {0x0a, 0x0a, 0x09, 0x07, 0x05, 0x03, 0x02, 0x01}, /* 29, -14.5dB */
+        {0x0a, 0x09, 0x08, 0x07, 0x05, 0x03, 0x02, 0x01}, /* 30, -15.0dB */
+        {0x09, 0x09, 0x08, 0x06, 0x05, 0x03, 0x01, 0x01}, /* 31, -15.5dB */
+        {0x09, 0x08, 0x07, 0x06, 0x04, 0x03, 0x01, 0x01}  /* 32, -16.0dB */
+};
+
+static const u8 cckswing_table_ch14[CCK_TABLE_SIZE][8] = {
+        {0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00}, /* 0, +0dB */
+        {0x33, 0x32, 0x2b, 0x19, 0x00, 0x00, 0x00, 0x00}, /* 1, -0.5dB */
+        {0x30, 0x2f, 0x29, 0x18, 0x00, 0x00, 0x00, 0x00}, /* 2, -1.0dB */
+        {0x2d, 0x2d, 0x17, 0x17, 0x00, 0x00, 0x00, 0x00}, /* 3, -1.5dB */
+        {0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00}, /* 4, -2.0dB */
+        {0x28, 0x28, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00}, /* 5, -2.5dB */
+        {0x26, 0x25, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00}, /* 6, -3.0dB */
+        {0x24, 0x23, 0x1f, 0x12, 0x00, 0x00, 0x00, 0x00}, /* 7, -3.5dB */
+        {0x22, 0x21, 0x1d, 0x11, 0x00, 0x00, 0x00, 0x00}, /* 8, -4.0dB */
+        {0x20, 0x20, 0x1b, 0x10, 0x00, 0x00, 0x00, 0x00}, /* 9, -4.5dB */
+        {0x1f, 0x1e, 0x1a, 0x0f, 0x00, 0x00, 0x00, 0x00}, /* 10, -5.0dB */
+        {0x1d, 0x1c, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00}, /* 11, -5.5dB */
+        {0x1b, 0x1a, 0x17, 0x0e, 0x00, 0x00, 0x00, 0x00}, /* 12, -6.0dB */
+        {0x1a, 0x19, 0x16, 0x0d, 0x00, 0x00, 0x00, 0x00}, /* 13, -6.5dB */
+        {0x18, 0x17, 0x15, 0x0c, 0x00, 0x00, 0x00, 0x00}, /* 14, -7.0dB */
+        {0x17, 0x16, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x00}, /* 15, -7.5dB */
+        {0x16, 0x15, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00}, /* 16, -8.0dB */
+        {0x14, 0x14, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x00}, /* 17, -8.5dB */
+        {0x13, 0x13, 0x10, 0x0a, 0x00, 0x00, 0x00, 0x00}, /* 18, -9.0dB */
+        {0x12, 0x12, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, /* 19, -9.5dB */
+        {0x11, 0x11, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, /* 20, -10.0dB */
+        {0x10, 0x10, 0x0e, 0x08, 0x00, 0x00, 0x00, 0x00}, /* 21, -10.5dB */
+        {0x0f, 0x0f, 0x0d, 0x08, 0x00, 0x00, 0x00, 0x00}, /* 22, -11.0dB */
+        {0x0e, 0x0e, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00}, /* 23, -11.5dB */
+        {0x0d, 0x0d, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00}, /* 24, -12.0dB */
+        {0x0d, 0x0c, 0x0b, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 25, -12.5dB */
+        {0x0c, 0x0c, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 26, -13.0dB */
+        {0x0b, 0x0b, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 27, -13.5dB */
+        {0x0b, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 28, -14.0dB */
+        {0x0a, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 29, -14.5dB */
+        {0x0a, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 30, -15.0dB */
+        {0x09, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 31, -15.5dB */
+        {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00}  /* 32, -16.0dB */
+};
+
+static void rtl92ee_dm_diginit(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+
+        dm_dig->cur_igvalue = rtl_get_bbreg(hw, DM_REG_IGI_A_11N,
+                                            DM_BIT_IGI_11N);
+        dm_dig->rssi_lowthresh = DM_DIG_THRESH_LOW;
+        dm_dig->rssi_highthresh = DM_DIG_THRESH_HIGH;
+        dm_dig->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
+        dm_dig->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
+        dm_dig->rx_gain_max = DM_DIG_MAX;
+        dm_dig->rx_gain_min = DM_DIG_MIN;
+        dm_dig->back_val = DM_DIG_BACKOFF_DEFAULT;
+        dm_dig->back_range_max = DM_DIG_BACKOFF_MAX;
+        dm_dig->back_range_min = DM_DIG_BACKOFF_MIN;
+        dm_dig->pre_cck_cca_thres = 0xff;
+        dm_dig->cur_cck_cca_thres = 0x83;
+        dm_dig->forbidden_igi = DM_DIG_MIN;
+        dm_dig->large_fa_hit = 0;
+        dm_dig->recover_cnt = 0;
+        dm_dig->dig_dynamic_min = DM_DIG_MIN;
+        dm_dig->dig_dynamic_min_1 = DM_DIG_MIN;
+        dm_dig->media_connect_0 = false;
+        dm_dig->media_connect_1 = false;
+        rtlpriv->dm.dm_initialgain_enable = true;
+        dm_dig->bt30_cur_igi = 0x32;
+}
+
+static void rtl92ee_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
+{
+        u32 ret_value;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct false_alarm_statistics *falsealm_cnt = &rtlpriv->falsealm_cnt;
+
+        rtl_set_bbreg(hw, DM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1);
+        rtl_set_bbreg(hw, DM_REG_OFDM_FA_RSTD_11N, BIT(31), 1);
+
+        ret_value = rtl_get_bbreg(hw, DM_REG_OFDM_FA_TYPE1_11N, MASKDWORD);
+        falsealm_cnt->cnt_fast_fsync_fail = (ret_value & 0xffff);
+        falsealm_cnt->cnt_sb_search_fail = ((ret_value & 0xffff0000) >> 16);
+
+        ret_value = rtl_get_bbreg(hw, DM_REG_OFDM_FA_TYPE2_11N, MASKDWORD);
+        falsealm_cnt->cnt_ofdm_cca = (ret_value & 0xffff);
+        falsealm_cnt->cnt_parity_fail = ((ret_value & 0xffff0000) >> 16);
+
+        ret_value = rtl_get_bbreg(hw, DM_REG_OFDM_FA_TYPE3_11N, MASKDWORD);
+        falsealm_cnt->cnt_rate_illegal = (ret_value & 0xffff);
+        falsealm_cnt->cnt_crc8_fail = ((ret_value & 0xffff0000) >> 16);
+
+        ret_value = rtl_get_bbreg(hw, DM_REG_OFDM_FA_TYPE4_11N, MASKDWORD);
+        falsealm_cnt->cnt_mcs_fail = (ret_value & 0xffff);
+
+        falsealm_cnt->cnt_ofdm_fail = falsealm_cnt->cnt_parity_fail +
+                                      falsealm_cnt->cnt_rate_illegal +
+                                      falsealm_cnt->cnt_crc8_fail +
+                                      falsealm_cnt->cnt_mcs_fail +
+                                      falsealm_cnt->cnt_fast_fsync_fail +
+                                      falsealm_cnt->cnt_sb_search_fail;
+
+        ret_value = rtl_get_bbreg(hw, DM_REG_SC_CNT_11N, MASKDWORD);
+        falsealm_cnt->cnt_bw_lsc = (ret_value & 0xffff);
+        falsealm_cnt->cnt_bw_usc = ((ret_value & 0xffff0000) >> 16);
+
+        rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, BIT(12), 1);
+        rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, BIT(14), 1);
+
+        ret_value = rtl_get_bbreg(hw, DM_REG_CCK_FA_LSB_11N, MASKBYTE0);
+        falsealm_cnt->cnt_cck_fail = ret_value;
+
+        ret_value = rtl_get_bbreg(hw, DM_REG_CCK_FA_MSB_11N, MASKBYTE3);
+        falsealm_cnt->cnt_cck_fail += (ret_value & 0xff) << 8;
+
+        ret_value = rtl_get_bbreg(hw, DM_REG_CCK_CCA_CNT_11N, MASKDWORD);
+        falsealm_cnt->cnt_cck_cca = ((ret_value & 0xff) << 8) |
+                                    ((ret_value & 0xFF00) >> 8);
+
+        falsealm_cnt->cnt_all = falsealm_cnt->cnt_fast_fsync_fail +
+                                falsealm_cnt->cnt_sb_search_fail +
+                                falsealm_cnt->cnt_parity_fail +
+                                falsealm_cnt->cnt_rate_illegal +
+                                falsealm_cnt->cnt_crc8_fail +
+                                falsealm_cnt->cnt_mcs_fail +
+                                falsealm_cnt->cnt_cck_fail;
+
+        falsealm_cnt->cnt_cca_all = falsealm_cnt->cnt_ofdm_cca +
+                                    falsealm_cnt->cnt_cck_cca;
+
+        /*reset false alarm counter registers*/
+        rtl_set_bbreg(hw, DM_REG_OFDM_FA_RSTC_11N, BIT(31), 1);
+        rtl_set_bbreg(hw, DM_REG_OFDM_FA_RSTC_11N, BIT(31), 0);
+        rtl_set_bbreg(hw, DM_REG_OFDM_FA_RSTD_11N, BIT(27), 1);
+        rtl_set_bbreg(hw, DM_REG_OFDM_FA_RSTD_11N, BIT(27), 0);
+        /*update ofdm counter*/
+        rtl_set_bbreg(hw, DM_REG_OFDM_FA_HOLDC_11N, BIT(31), 0);
+        rtl_set_bbreg(hw, DM_REG_OFDM_FA_RSTD_11N, BIT(31), 0);
+        /*reset CCK CCA counter*/
+        rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, BIT(13) | BIT(12), 0);
+        rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, BIT(13) | BIT(12), 2);
+        /*reset CCK FA counter*/
+        rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, BIT(15) | BIT(14), 0);
+        rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, BIT(15) | BIT(14), 2);
+
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
+                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
+                  falsealm_cnt->cnt_parity_fail,
+                  falsealm_cnt->cnt_rate_illegal,
+                  falsealm_cnt->cnt_crc8_fail, falsealm_cnt->cnt_mcs_fail);
+
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
+                 "cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",
+                  falsealm_cnt->cnt_ofdm_fail,
+                  falsealm_cnt->cnt_cck_fail, falsealm_cnt->cnt_all);
+}
+
+static void rtl92ee_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        u8 cur_cck_cca_thresh;
+
+        if (rtlpriv->mac80211.link_state >= MAC80211_LINKED) {
+                if (dm_dig->rssi_val_min > 25) {
+                        cur_cck_cca_thresh = 0xcd;
+                } else if ((dm_dig->rssi_val_min <= 25) &&
+                           (dm_dig->rssi_val_min > 10)) {
+                        cur_cck_cca_thresh = 0x83;
+                } else {
+                        if (rtlpriv->falsealm_cnt.cnt_cck_fail > 1000)
+                                cur_cck_cca_thresh = 0x83;
+                        else
+                                cur_cck_cca_thresh = 0x40;
+                }
+        } else {
+                if (rtlpriv->falsealm_cnt.cnt_cck_fail > 1000)
+                        cur_cck_cca_thresh = 0x83;
+                else
+                        cur_cck_cca_thresh = 0x40;
+        }
+        rtl92ee_dm_write_cck_cca_thres(hw, cur_cck_cca_thresh);
+}
+
+static void rtl92ee_dm_dig(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        u8 dig_dynamic_min , dig_maxofmin;
+        bool bfirstconnect , bfirstdisconnect;
+        u8 dm_dig_max, dm_dig_min;
+        u8 current_igi = dm_dig->cur_igvalue;
+        u8 offset;
+
+        /* AP,BT */
+        if (mac->act_scanning)
+                return;
+
+        dig_dynamic_min = dm_dig->dig_dynamic_min;
+        bfirstconnect = (mac->link_state >= MAC80211_LINKED) &&
+                        !dm_dig->media_connect_0;
+        bfirstdisconnect = (mac->link_state < MAC80211_LINKED) &&
+                           dm_dig->media_connect_0;
+
+        dm_dig_max = 0x5a;
+        dm_dig_min = DM_DIG_MIN;
+        dig_maxofmin = DM_DIG_MAX_AP;
+
+        if (mac->link_state >= MAC80211_LINKED) {
+                if ((dm_dig->rssi_val_min + 10) > dm_dig_max)
+                        dm_dig->rx_gain_max = dm_dig_max;
+                else if ((dm_dig->rssi_val_min + 10) < dm_dig_min)
+                        dm_dig->rx_gain_max = dm_dig_min;
+                else
+                        dm_dig->rx_gain_max = dm_dig->rssi_val_min + 10;
+
+                if (rtlpriv->dm.one_entry_only) {
+                        offset = 0;
+                        if (dm_dig->rssi_val_min - offset < dm_dig_min)
+                                dig_dynamic_min = dm_dig_min;
+                        else if (dm_dig->rssi_val_min - offset >
+                                 dig_maxofmin)
+                                dig_dynamic_min = dig_maxofmin;
+                        else
+                                dig_dynamic_min = dm_dig->rssi_val_min - offset;
+                } else {
+                        dig_dynamic_min = dm_dig_min;
+                }
+
+        } else {
+                dm_dig->rx_gain_max = dm_dig_max;
+                dig_dynamic_min = dm_dig_min;
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "no link\n");
+        }
+
+        if (rtlpriv->falsealm_cnt.cnt_all > 10000) {
+                if (dm_dig->large_fa_hit != 3)
+                        dm_dig->large_fa_hit++;
+                if (dm_dig->forbidden_igi < current_igi) {
+                        dm_dig->forbidden_igi = current_igi;
+                        dm_dig->large_fa_hit = 1;
+                }
+
+                if (dm_dig->large_fa_hit >= 3) {
+                        if (dm_dig->forbidden_igi + 1 > dm_dig->rx_gain_max)
+                                dm_dig->rx_gain_min =
+                                                dm_dig->rx_gain_max;
+                        else
+                                dm_dig->rx_gain_min =
+                                                dm_dig->forbidden_igi + 1;
+                        dm_dig->recover_cnt = 3600;
+                }
+        } else {
+                if (dm_dig->recover_cnt != 0) {
+                        dm_dig->recover_cnt--;
+                } else {
+                        if (dm_dig->large_fa_hit < 3) {
+                                if ((dm_dig->forbidden_igi - 1) <
+                                    dig_dynamic_min) {
+                                        dm_dig->forbidden_igi = dig_dynamic_min;
+                                        dm_dig->rx_gain_min =
+                                                                dig_dynamic_min;
+                                } else {
+                                        dm_dig->forbidden_igi--;
+                                        dm_dig->rx_gain_min =
+                                                dm_dig->forbidden_igi + 1;
+                                }
+                        } else {
+                                dm_dig->large_fa_hit = 0;
+                        }
+                }
+        }
+
+        if (rtlpriv->dm.dbginfo.num_qry_beacon_pkt < 5)
+                dm_dig->rx_gain_min = dm_dig_min;
+
+        if (dm_dig->rx_gain_min > dm_dig->rx_gain_max)
+                dm_dig->rx_gain_min = dm_dig->rx_gain_max;
+
+        if (mac->link_state >= MAC80211_LINKED) {
+                if (bfirstconnect) {
+                        if (dm_dig->rssi_val_min <= dig_maxofmin)
+                                current_igi = dm_dig->rssi_val_min;
+                        else
+                                current_igi = dig_maxofmin;
+
+                        dm_dig->large_fa_hit = 0;
+                } else {
+                        if (rtlpriv->falsealm_cnt.cnt_all > DM_DIG_FA_TH2)
+                                current_igi += 4;
+                        else if (rtlpriv->falsealm_cnt.cnt_all > DM_DIG_FA_TH1)
+                                current_igi += 2;
+                        else if (rtlpriv->falsealm_cnt.cnt_all < DM_DIG_FA_TH0)
+                                current_igi -= 2;
+
+                        if (rtlpriv->dm.dbginfo.num_qry_beacon_pkt < 5 &&
+                            rtlpriv->falsealm_cnt.cnt_all < DM_DIG_FA_TH1)
+                                current_igi = dm_dig->rx_gain_min;
+                }
+        } else {
+                if (bfirstdisconnect) {
+                        current_igi = dm_dig->rx_gain_min;
+                } else {
+                        if (rtlpriv->falsealm_cnt.cnt_all > 10000)
+                                current_igi += 4;
+                        else if (rtlpriv->falsealm_cnt.cnt_all > 8000)
+                                current_igi += 2;
+                        else if (rtlpriv->falsealm_cnt.cnt_all < 500)
+                                current_igi -= 2;
+                }
+        }
+
+        if (current_igi > dm_dig->rx_gain_max)
+                current_igi = dm_dig->rx_gain_max;
+        if (current_igi < dm_dig->rx_gain_min)
+                current_igi = dm_dig->rx_gain_min;
+
+        rtl92ee_dm_write_dig(hw , current_igi);
+        dm_dig->media_connect_0 = ((mac->link_state >= MAC80211_LINKED) ?
+                                   true : false);
+        dm_dig->dig_dynamic_min = dig_dynamic_min;
+}
+
+void rtl92ee_dm_write_cck_cca_thres(struct ieee80211_hw *hw, u8 cur_thres)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+
+        if (dm_dig->cur_cck_cca_thres != cur_thres)
+                rtl_write_byte(rtlpriv, DM_REG_CCK_CCA_11N, cur_thres);
+
+        dm_dig->pre_cck_cca_thres = dm_dig->cur_cck_cca_thres;
+        dm_dig->cur_cck_cca_thres = cur_thres;
+}
+
+void rtl92ee_dm_write_dig(struct ieee80211_hw *hw, u8 current_igi)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+
+        if (dm_dig->stop_dig)
+                return;
+
+        if (dm_dig->cur_igvalue != current_igi) {
+                rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f, current_igi);
+                if (rtlpriv->phy.rf_type != RF_1T1R)
+                        rtl_set_bbreg(hw, ROFDM0_XBAGCCORE1, 0x7f, current_igi);
+        }
+        dm_dig->pre_igvalue = dm_dig->cur_igvalue;
+        dm_dig->cur_igvalue = current_igi;
+}
+
+static void rtl92ee_rssi_dump_to_register(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl_write_byte(rtlpriv, RA_RSSIDUMP,
+                       rtlpriv->stats.rx_rssi_percentage[0]);
+        rtl_write_byte(rtlpriv, RB_RSSIDUMP,
+                       rtlpriv->stats.rx_rssi_percentage[1]);
+        /*It seems the following values are not initialized.
+          *According to Windows code,
+          *these value will only be valid with JAGUAR chips
+          */
+        /* Rx EVM */
+        rtl_write_byte(rtlpriv, RS1_RXEVMDUMP, rtlpriv->stats.rx_evm_dbm[0]);
+        rtl_write_byte(rtlpriv, RS2_RXEVMDUMP, rtlpriv->stats.rx_evm_dbm[1]);
+        /* Rx SNR */
+        rtl_write_byte(rtlpriv, RA_RXSNRDUMP,
+                       (u8)(rtlpriv->stats.rx_snr_db[0]));
+        rtl_write_byte(rtlpriv, RB_RXSNRDUMP,
+                       (u8)(rtlpriv->stats.rx_snr_db[1]));
+        /* Rx Cfo_Short */
+        rtl_write_word(rtlpriv, RA_CFOSHORTDUMP,
+                       rtlpriv->stats.rx_cfo_short[0]);
+        rtl_write_word(rtlpriv, RB_CFOSHORTDUMP,
+                       rtlpriv->stats.rx_cfo_short[1]);
+        /* Rx Cfo_Tail */
+        rtl_write_word(rtlpriv, RA_CFOLONGDUMP, rtlpriv->stats.rx_cfo_tail[0]);
+        rtl_write_word(rtlpriv, RB_CFOLONGDUMP, rtlpriv->stats.rx_cfo_tail[1]);
+}
+
+static void rtl92ee_dm_find_minimum_rssi(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *rtl_dm_dig = &rtlpriv->dm_digtable;
+        struct rtl_mac *mac = rtl_mac(rtlpriv);
+
+        /* Determine the minimum RSSI  */
+        if ((mac->link_state < MAC80211_LINKED) &&
+            (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {
+                rtl_dm_dig->min_undec_pwdb_for_dm = 0;
+                RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
+                         "Not connected to any\n");
+        }
+        if (mac->link_state >= MAC80211_LINKED) {
+                if (mac->opmode == NL80211_IFTYPE_AP ||
+                    mac->opmode == NL80211_IFTYPE_ADHOC) {
+                        rtl_dm_dig->min_undec_pwdb_for_dm =
+                                rtlpriv->dm.entry_min_undec_sm_pwdb;
+                        RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
+                                 "AP Client PWDB = 0x%lx\n",
+                                 rtlpriv->dm.entry_min_undec_sm_pwdb);
+                } else {
+                        rtl_dm_dig->min_undec_pwdb_for_dm =
+                            rtlpriv->dm.undec_sm_pwdb;
+                        RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
+                                 "STA Default Port PWDB = 0x%x\n",
+                                 rtl_dm_dig->min_undec_pwdb_for_dm);
+                }
+        } else {
+                rtl_dm_dig->min_undec_pwdb_for_dm =
+                        rtlpriv->dm.entry_min_undec_sm_pwdb;
+                RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
+                         "AP Ext Port or disconnet PWDB = 0x%x\n",
+                         rtl_dm_dig->min_undec_pwdb_for_dm);
+        }
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "MinUndecoratedPWDBForDM =%d\n",
+                 rtl_dm_dig->min_undec_pwdb_for_dm);
+}
+
+static void rtl92ee_dm_check_rssi_monitor(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+        struct rtl_mac *mac = rtl_mac(rtlpriv);
+        struct rtl_dm *dm = rtl_dm(rtlpriv);
+        struct rtl_sta_info *drv_priv;
+        u8 h2c[4] = { 0 };
+        long max = 0, min = 0xff;
+        u8 i = 0;
+
+        if (mac->opmode == NL80211_IFTYPE_AP ||
+            mac->opmode == NL80211_IFTYPE_ADHOC ||
+            mac->opmode == NL80211_IFTYPE_MESH_POINT) {
+                /* AP & ADHOC & MESH */
+                spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                list_for_each_entry(drv_priv, &rtlpriv->entry_list, list) {
+                        struct rssi_sta *stat = &drv_priv->rssi_stat;
+
+                        if (stat->undec_sm_pwdb < min)
+                                min = stat->undec_sm_pwdb;
+                        if (stat->undec_sm_pwdb > max)
+                                max = stat->undec_sm_pwdb;
+
+                        h2c[3] = 0;
+                        h2c[2] = (u8)(dm->undec_sm_pwdb & 0xFF);
+                        h2c[1] = 0x20;
+                        h2c[0] = ++i;
+                        rtl92ee_fill_h2c_cmd(hw, H2C_92E_RSSI_REPORT, 4, h2c);
+                }
+                spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
+
+                /* If associated entry is found */
+                if (max != 0) {
+                        dm->entry_max_undec_sm_pwdb = max;
+                        RTPRINT(rtlpriv, FDM, DM_PWDB,
+                                "EntryMaxPWDB = 0x%lx(%ld)\n", max, max);
+                } else {
+                        dm->entry_max_undec_sm_pwdb = 0;
+                }
+                /* If associated entry is found */
+                if (min != 0xff) {
+                        dm->entry_min_undec_sm_pwdb = min;
+                        RTPRINT(rtlpriv, FDM, DM_PWDB,
+                                "EntryMinPWDB = 0x%lx(%ld)\n", min, min);
+                } else {
+                        dm->entry_min_undec_sm_pwdb = 0;
+                }
+        }
+
+        /* Indicate Rx signal strength to FW. */
+        if (dm->useramask) {
+                h2c[3] = 0;
+                h2c[2] = (u8)(dm->undec_sm_pwdb & 0xFF);
+                h2c[1] = 0x20;
+                h2c[0] = 0;
+                rtl92ee_fill_h2c_cmd(hw, H2C_92E_RSSI_REPORT, 4, h2c);
+        } else {
+                rtl_write_byte(rtlpriv, 0x4fe, dm->undec_sm_pwdb);
+        }
+        rtl92ee_rssi_dump_to_register(hw);
+        rtl92ee_dm_find_minimum_rssi(hw);
+        dm_dig->rssi_val_min = rtlpriv->dm_digtable.min_undec_pwdb_for_dm;
+}
+
+static void rtl92ee_dm_init_primary_cca_check(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct dynamic_primary_cca *primarycca = &rtlpriv->primarycca;
+
+        rtlhal->rts_en = 0;
+        primarycca->dup_rts_flag = 0;
+        primarycca->intf_flag = 0;
+        primarycca->intf_type = 0;
+        primarycca->monitor_flag = 0;
+        primarycca->ch_offset = 0;
+        primarycca->mf_state = 0;
+}
+
+static bool rtl92ee_dm_is_edca_turbo_disable(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->mac80211.mode == WIRELESS_MODE_B)
+                return true;
+
+        return false;
+}
+
+void rtl92ee_dm_init_edca_turbo(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.current_turbo_edca = false;
+        rtlpriv->dm.is_cur_rdlstate = false;
+        rtlpriv->dm.is_any_nonbepkts = false;
+}
+
+static void rtl92ee_dm_check_edca_turbo(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        static u64 last_txok_cnt;
+        static u64 last_rxok_cnt;
+        u64 cur_txok_cnt = 0;
+        u64 cur_rxok_cnt = 0;
+        u32 edca_be_ul = 0x5ea42b;
+        u32 edca_be_dl = 0x5ea42b; /*not sure*/
+        u32 edca_be = 0x5ea42b;
+        bool is_cur_rdlstate;
+        bool b_edca_turbo_on = false;
+
+        if (rtlpriv->dm.dbginfo.num_non_be_pkt > 0x100)
+                rtlpriv->dm.is_any_nonbepkts = true;
+        rtlpriv->dm.dbginfo.num_non_be_pkt = 0;
+
+        cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok_cnt;
+        cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rxok_cnt;
+
+        /*b_bias_on_rx = false;*/
+        b_edca_turbo_on = ((!rtlpriv->dm.is_any_nonbepkts) &&
+                           (!rtlpriv->dm.disable_framebursting)) ?
+                          true : false;
+
+        if (rtl92ee_dm_is_edca_turbo_disable(hw))
+                goto check_exit;
+
+        if (b_edca_turbo_on) {
+                is_cur_rdlstate = (cur_rxok_cnt > cur_txok_cnt * 4) ?
+                                    true : false;
+
+                edca_be = is_cur_rdlstate ? edca_be_dl : edca_be_ul;
+                rtl_write_dword(rtlpriv , REG_EDCA_BE_PARAM , edca_be);
+                rtlpriv->dm.is_cur_rdlstate = is_cur_rdlstate;
+                rtlpriv->dm.current_turbo_edca = true;
+        } else {
+                if (rtlpriv->dm.current_turbo_edca) {
+                        u8 tmp = AC0_BE;
+
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
+                                                      (u8 *)(&tmp));
+                }
+                rtlpriv->dm.current_turbo_edca = false;
+        }
+
+check_exit:
+        rtlpriv->dm.is_any_nonbepkts = false;
+        last_txok_cnt = rtlpriv->stats.txbytesunicast;
+        last_rxok_cnt = rtlpriv->stats.rxbytesunicast;
+}
+
+static void rtl92ee_dm_dynamic_edcca(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 reg_c50 , reg_c58;
+        bool fw_current_in_ps_mode = false;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                      (u8 *)(&fw_current_in_ps_mode));
+        if (fw_current_in_ps_mode)
+                return;
+
+        reg_c50 = rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
+        reg_c58 = rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
+
+        if (reg_c50 > 0x28 && reg_c58 > 0x28) {
+                if (!rtlpriv->rtlhal.pre_edcca_enable) {
+                        rtl_write_byte(rtlpriv, ROFDM0_ECCATHRESHOLD, 0x03);
+                        rtl_write_byte(rtlpriv, ROFDM0_ECCATHRESHOLD + 2, 0x00);
+                        rtlpriv->rtlhal.pre_edcca_enable = true;
+                }
+        } else if (reg_c50 < 0x25 && reg_c58 < 0x25) {
+                if (rtlpriv->rtlhal.pre_edcca_enable) {
+                        rtl_write_byte(rtlpriv, ROFDM0_ECCATHRESHOLD, 0x7f);
+                        rtl_write_byte(rtlpriv, ROFDM0_ECCATHRESHOLD + 2, 0x7f);
+                        rtlpriv->rtlhal.pre_edcca_enable = false;
+                }
+        }
+}
+
+static void rtl92ee_dm_adaptivity(struct ieee80211_hw *hw)
+{
+        rtl92ee_dm_dynamic_edcca(hw);
+}
+
+static void rtl92ee_dm_write_dynamic_cca(struct ieee80211_hw *hw,
+                                         u8 cur_mf_state)
+{
+        struct dynamic_primary_cca *primarycca = &rtl_priv(hw)->primarycca;
+
+        if (primarycca->mf_state != cur_mf_state)
+                rtl_set_bbreg(hw, DM_REG_L1SBD_PD_CH_11N, BIT(8) | BIT(7),
+                              cur_mf_state);
+
+        primarycca->mf_state = cur_mf_state;
+}
+
+static void rtl92ee_dm_dynamic_primary_cca_ckeck(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct false_alarm_statistics *falsealm_cnt = &rtlpriv->falsealm_cnt;
+        struct dynamic_primary_cca *primarycca = &rtlpriv->primarycca;
+        bool is40mhz = false;
+        u64 ofdm_cca, ofdm_fa, bw_usc_cnt, bw_lsc_cnt;
+        u8 sec_ch_offset;
+        u8 cur_mf_state;
+        static u8 count_down = MONITOR_TIME;
+
+        ofdm_cca = falsealm_cnt->cnt_ofdm_cca;
+        ofdm_fa = falsealm_cnt->cnt_ofdm_fail;
+        bw_usc_cnt = falsealm_cnt->cnt_bw_usc;
+        bw_lsc_cnt = falsealm_cnt->cnt_bw_lsc;
+        is40mhz = rtlpriv->mac80211.bw_40;
+        sec_ch_offset = rtlpriv->mac80211.cur_40_prime_sc;
+        /* NIC: 2: sec is below,  1: sec is above */
+
+        if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP) {
+                cur_mf_state = MF_USC_LSC;
+                rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
+                return;
+        }
+
+        if (rtlpriv->mac80211.link_state < MAC80211_LINKED)
+                return;
+
+        if (is40mhz)
+                return;
+
+        if (primarycca->pricca_flag == 0) {
+                /* Primary channel is above
+                 * NOTE: duplicate CTS can remove this condition
+                 */
+                if (sec_ch_offset == 2) {
+                        if ((ofdm_cca > OFDMCCA_TH) &&
+                            (bw_lsc_cnt > (bw_usc_cnt + BW_IND_BIAS)) &&
+                            (ofdm_fa > (ofdm_cca >> 1))) {
+                                primarycca->intf_type = 1;
+                                primarycca->intf_flag = 1;
+                                cur_mf_state = MF_USC;
+                                rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
+                                primarycca->pricca_flag = 1;
+                        } else if ((ofdm_cca > OFDMCCA_TH) &&
+                                   (bw_lsc_cnt > (bw_usc_cnt + BW_IND_BIAS)) &&
+                                   (ofdm_fa < (ofdm_cca >> 1))) {
+                                primarycca->intf_type = 2;
+                                primarycca->intf_flag = 1;
+                                cur_mf_state = MF_USC;
+                                rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
+                                primarycca->pricca_flag = 1;
+                                primarycca->dup_rts_flag = 1;
+                                rtlpriv->rtlhal.rts_en = 1;
+                        } else {
+                                primarycca->intf_type = 0;
+                                primarycca->intf_flag = 0;
+                                cur_mf_state = MF_USC_LSC;
+                                rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
+                                rtlpriv->rtlhal.rts_en = 0;
+                                primarycca->dup_rts_flag = 0;
+                        }
+                } else if (sec_ch_offset == 1) {
+                        if ((ofdm_cca > OFDMCCA_TH) &&
+                            (bw_usc_cnt > (bw_lsc_cnt + BW_IND_BIAS)) &&
+                            (ofdm_fa > (ofdm_cca >> 1))) {
+                                primarycca->intf_type = 1;
+                                primarycca->intf_flag = 1;
+                                cur_mf_state = MF_LSC;
+                                rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
+                                primarycca->pricca_flag = 1;
+                        } else if ((ofdm_cca > OFDMCCA_TH) &&
+                                   (bw_usc_cnt > (bw_lsc_cnt + BW_IND_BIAS)) &&
+                                   (ofdm_fa < (ofdm_cca >> 1))) {
+                                primarycca->intf_type = 2;
+                                primarycca->intf_flag = 1;
+                                cur_mf_state = MF_LSC;
+                                rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
+                                primarycca->pricca_flag = 1;
+                                primarycca->dup_rts_flag = 1;
+                                rtlpriv->rtlhal.rts_en = 1;
+                        } else {
+                                primarycca->intf_type = 0;
+                                primarycca->intf_flag = 0;
+                                cur_mf_state = MF_USC_LSC;
+                                rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
+                                rtlpriv->rtlhal.rts_en = 0;
+                                primarycca->dup_rts_flag = 0;
+                        }
+                }
+        } else {/* PrimaryCCA->PriCCA_flag==1 */
+                count_down--;
+                if (count_down == 0) {
+                        count_down = MONITOR_TIME;
+                        primarycca->pricca_flag = 0;
+                        cur_mf_state = MF_USC_LSC;
+                        /* default */
+                        rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
+                        rtlpriv->rtlhal.rts_en = 0;
+                        primarycca->dup_rts_flag = 0;
+                        primarycca->intf_type = 0;
+                        primarycca->intf_flag = 0;
+                }
+        }
+}
+
+static void rtl92ee_dm_dynamic_atc_switch(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        u8 crystal_cap;
+        u32 packet_count;
+        int cfo_khz_a , cfo_khz_b , cfo_ave = 0, adjust_xtal = 0;
+        int cfo_ave_diff;
+
+        if (rtlpriv->mac80211.link_state < MAC80211_LINKED) {
+                if (rtldm->atc_status == ATC_STATUS_OFF) {
+                        rtl_set_bbreg(hw, ROFDM1_CFOTRACKING, BIT(11),
+                                      ATC_STATUS_ON);
+                        rtldm->atc_status = ATC_STATUS_ON;
+                }
+                /* Disable CFO tracking for BT */
+                if (rtlpriv->cfg->ops->get_btc_status()) {
+                        if (!rtlpriv->btcoexist.btc_ops->
+                            btc_is_bt_disabled(rtlpriv)) {
+                                RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
+                                         "odm_DynamicATCSwitch(): Disable CFO tracking for BT!!\n");
+                                return;
+                        }
+                }
+                /* Reset Crystal Cap */
+                if (rtldm->crystal_cap != rtlpriv->efuse.crystalcap) {
+                        rtldm->crystal_cap = rtlpriv->efuse.crystalcap;
+                        crystal_cap = rtldm->crystal_cap & 0x3f;
+                        rtl_set_bbreg(hw, REG_MAC_PHY_CTRL, 0xFFF000,
+                                      (crystal_cap | (crystal_cap << 6)));
+                }
+        } else {
+                cfo_khz_a = (int)(rtldm->cfo_tail[0] * 3125) / 1280;
+                cfo_khz_b = (int)(rtldm->cfo_tail[1] * 3125) / 1280;
+                packet_count = rtldm->packet_count;
+
+                if (packet_count == rtldm->packet_count_pre)
+                        return;
+
+                rtldm->packet_count_pre = packet_count;
+
+                if (rtlpriv->phy.rf_type == RF_1T1R)
+                        cfo_ave = cfo_khz_a;
+                else
+                        cfo_ave = (int)(cfo_khz_a + cfo_khz_b) >> 1;
+
+                cfo_ave_diff = (rtldm->cfo_ave_pre >= cfo_ave) ?
+                               (rtldm->cfo_ave_pre - cfo_ave) :
+                               (cfo_ave - rtldm->cfo_ave_pre);
+
+                if (cfo_ave_diff > 20 && rtldm->large_cfo_hit == 0) {
+                        rtldm->large_cfo_hit = 1;
+                        return;
+                }
+                rtldm->large_cfo_hit = 0;
+
+                rtldm->cfo_ave_pre = cfo_ave;
+
+                if (cfo_ave >= -rtldm->cfo_threshold &&
+                    cfo_ave <= rtldm->cfo_threshold && rtldm->is_freeze == 0) {
+                        if (rtldm->cfo_threshold == CFO_THRESHOLD_XTAL) {
+                                rtldm->cfo_threshold = CFO_THRESHOLD_XTAL + 10;
+                                rtldm->is_freeze = 1;
+                        } else {
+                                rtldm->cfo_threshold = CFO_THRESHOLD_XTAL;
+                        }
+                }
+
+                if (cfo_ave > rtldm->cfo_threshold && rtldm->crystal_cap < 0x3f)
+                        adjust_xtal = ((cfo_ave - CFO_THRESHOLD_XTAL) >> 2) + 1;
+                else if ((cfo_ave < -rtlpriv->dm.cfo_threshold) &&
+                         rtlpriv->dm.crystal_cap > 0)
+                        adjust_xtal = ((cfo_ave + CFO_THRESHOLD_XTAL) >> 2) - 1;
+
+                if (adjust_xtal != 0) {
+                        rtldm->is_freeze = 0;
+                        rtldm->crystal_cap += adjust_xtal;
+
+                        if (rtldm->crystal_cap > 0x3f)
+                                rtldm->crystal_cap = 0x3f;
+                        else if (rtldm->crystal_cap < 0)
+                                rtldm->crystal_cap = 0;
+
+                        crystal_cap = rtldm->crystal_cap & 0x3f;
+                        rtl_set_bbreg(hw, REG_MAC_PHY_CTRL, 0xFFF000,
+                                      (crystal_cap | (crystal_cap << 6)));
+                }
+
+                if (cfo_ave < CFO_THRESHOLD_ATC &&
+                    cfo_ave > -CFO_THRESHOLD_ATC) {
+                        if (rtldm->atc_status == ATC_STATUS_ON) {
+                                rtl_set_bbreg(hw, ROFDM1_CFOTRACKING, BIT(11),
+                                              ATC_STATUS_OFF);
+                                rtldm->atc_status = ATC_STATUS_OFF;
+                        }
+                } else {
+                        if (rtldm->atc_status == ATC_STATUS_OFF) {
+                                rtl_set_bbreg(hw, ROFDM1_CFOTRACKING, BIT(11),
+                                              ATC_STATUS_ON);
+                                rtldm->atc_status = ATC_STATUS_ON;
+                        }
+                }
+        }
+}
+
+static void rtl92ee_dm_init_txpower_tracking(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *dm = rtl_dm(rtlpriv);
+        u8 path;
+
+        dm->txpower_tracking = true;
+        dm->default_ofdm_index = 30;
+        dm->default_cck_index = 20;
+
+        dm->swing_idx_cck_base = dm->default_cck_index;
+        dm->cck_index = dm->default_cck_index;
+
+        for (path = RF90_PATH_A; path < MAX_RF_PATH; path++) {
+                dm->swing_idx_ofdm_base[path] = dm->default_ofdm_index;
+                dm->ofdm_index[path] = dm->default_ofdm_index;
+                dm->delta_power_index[path] = 0;
+                dm->delta_power_index_last[path] = 0;
+                dm->power_index_offset[path] = 0;
+        }
+}
+
+void rtl92ee_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
+
+        p_ra->ratr_state = DM_RATR_STA_INIT;
+        p_ra->pre_ratr_state = DM_RATR_STA_INIT;
+
+        if (rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER)
+                rtlpriv->dm.useramask = true;
+        else
+                rtlpriv->dm.useramask = false;
+
+        p_ra->ldpc_thres = 35;
+        p_ra->use_ldpc = false;
+        p_ra->high_rssi_thresh_for_ra = 50;
+        p_ra->low_rssi_thresh_for_ra40m = 20;
+}
+
+static bool _rtl92ee_dm_ra_state_check(struct ieee80211_hw *hw,
+                                       s32 rssi, u8 *ratr_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
+        const u8 go_up_gap = 5;
+        u32 high_rssithresh_for_ra = p_ra->high_rssi_thresh_for_ra;
+        u32 low_rssithresh_for_ra = p_ra->low_rssi_thresh_for_ra40m;
+        u8 state;
+
+        /* Threshold Adjustment:
+         * when RSSI state trends to go up one or two levels,
+         * make sure RSSI is high enough.
+         * Here GoUpGap is added to solve
+         * the boundary's level alternation issue.
+         */
+        switch (*ratr_state) {
+        case DM_RATR_STA_INIT:
+        case DM_RATR_STA_HIGH:
+                break;
+        case DM_RATR_STA_MIDDLE:
+                high_rssithresh_for_ra += go_up_gap;
+                break;
+        case DM_RATR_STA_LOW:
+                high_rssithresh_for_ra += go_up_gap;
+                low_rssithresh_for_ra += go_up_gap;
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                         "wrong rssi level setting %d !", *ratr_state);
+                break;
+        }
+
+        /* Decide RATRState by RSSI. */
+        if (rssi > high_rssithresh_for_ra)
+                state = DM_RATR_STA_HIGH;
+        else if (rssi > low_rssithresh_for_ra)
+                state = DM_RATR_STA_MIDDLE;
+        else
+                state = DM_RATR_STA_LOW;
+
+        if (*ratr_state != state) {
+                *ratr_state = state;
+                return true;
+        }
+
+        return false;
+}
+
+static void rtl92ee_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
+        struct ieee80211_sta *sta = NULL;
+
+        if (is_hal_stop(rtlhal)) {
+                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                         "driver is going to unload\n");
+                return;
+        }
+
+        if (!rtlpriv->dm.useramask) {
+                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                         "driver does not control rate adaptive mask\n");
+                return;
+        }
+
+        if (mac->link_state == MAC80211_LINKED &&
+            mac->opmode == NL80211_IFTYPE_STATION) {
+                if (rtlpriv->dm.undec_sm_pwdb < p_ra->ldpc_thres) {
+                        p_ra->use_ldpc = true;
+                        p_ra->lower_rts_rate = true;
+                } else if (rtlpriv->dm.undec_sm_pwdb >
+                           (p_ra->ldpc_thres - 5)) {
+                        p_ra->use_ldpc = false;
+                        p_ra->lower_rts_rate = false;
+                }
+                if (_rtl92ee_dm_ra_state_check(hw, rtlpriv->dm.undec_sm_pwdb,
+                                               &p_ra->ratr_state)) {
+                        rcu_read_lock();
+                        sta = rtl_find_sta(hw, mac->bssid);
+                        if (sta)
+                                rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
+                                                              p_ra->ratr_state);
+                        rcu_read_unlock();
+
+                        p_ra->pre_ratr_state = p_ra->ratr_state;
+                }
+        }
+}
+
+static void rtl92ee_dm_init_dynamic_atc_switch(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.crystal_cap = rtlpriv->efuse.crystalcap;
+
+        rtlpriv->dm.atc_status = rtl_get_bbreg(hw, ROFDM1_CFOTRACKING, BIT(11));
+        rtlpriv->dm.cfo_threshold = CFO_THRESHOLD_XTAL;
+}
+
+void rtl92ee_dm_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.dm_type = DM_TYPE_BYDRIVER;
+
+        rtl92ee_dm_diginit(hw);
+        rtl92ee_dm_init_rate_adaptive_mask(hw);
+        rtl92ee_dm_init_primary_cca_check(hw);
+        rtl92ee_dm_init_edca_turbo(hw);
+        rtl92ee_dm_init_txpower_tracking(hw);
+        rtl92ee_dm_init_dynamic_atc_switch(hw);
+}
+
+static void rtl92ee_dm_common_info_self_update(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_sta_info *drv_priv;
+        u8 cnt = 0;
+
+        rtlpriv->dm.one_entry_only = false;
+
+        if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_STATION &&
+            rtlpriv->mac80211.link_state >= MAC80211_LINKED) {
+                rtlpriv->dm.one_entry_only = true;
+                return;
+        }
+
+        if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP ||
+            rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC ||
+            rtlpriv->mac80211.opmode == NL80211_IFTYPE_MESH_POINT) {
+                spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                list_for_each_entry(drv_priv, &rtlpriv->entry_list, list) {
+                        cnt++;
+                }
+                spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
+
+                if (cnt == 1)
+                        rtlpriv->dm.one_entry_only = true;
+        }
+}
+
+void rtl92ee_dm_dynamic_arfb_select(struct ieee80211_hw *hw,
+                                    u8 rate, bool collision_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rate >= DESC92C_RATEMCS8  && rate <= DESC92C_RATEMCS12) {
+                if (collision_state == 1) {
+                        if (rate == DESC92C_RATEMCS12) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC, 0x0);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x07060501);
+                        } else if (rate == DESC92C_RATEMCS11) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC, 0x0);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x07070605);
+                        } else if (rate == DESC92C_RATEMCS10) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC, 0x0);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x08080706);
+                        } else if (rate == DESC92C_RATEMCS9) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC, 0x0);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x08080707);
+                        } else {
+                                rtl_write_dword(rtlpriv, REG_DARFRC, 0x0);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x09090808);
+                        }
+                } else {   /* collision_state == 0 */
+                        if (rate == DESC92C_RATEMCS12) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x05010000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x09080706);
+                        } else if (rate == DESC92C_RATEMCS11) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x06050000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x09080807);
+                        } else if (rate == DESC92C_RATEMCS10) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x07060000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x0a090908);
+                        } else if (rate == DESC92C_RATEMCS9) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x07070000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x0a090808);
+                        } else {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x08080000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x0b0a0909);
+                        }
+                }
+        } else {  /* MCS13~MCS15,  1SS, G-mode */
+                if (collision_state == 1) {
+                        if (rate == DESC92C_RATEMCS15) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x00000000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x05040302);
+                        } else if (rate == DESC92C_RATEMCS14) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x00000000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x06050302);
+                        } else if (rate == DESC92C_RATEMCS13) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x00000000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x07060502);
+                        } else {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x00000000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x06050402);
+                        }
+                } else{   /* collision_state == 0 */
+                        if (rate == DESC92C_RATEMCS15) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x03020000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x07060504);
+                        } else if (rate == DESC92C_RATEMCS14) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x03020000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x08070605);
+                        } else if (rate == DESC92C_RATEMCS13) {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x05020000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x09080706);
+                        } else {
+                                rtl_write_dword(rtlpriv, REG_DARFRC,
+                                                0x04020000);
+                                rtl_write_dword(rtlpriv, REG_DARFRC + 4,
+                                                0x08070605);
+                        }
+                }
+        }
+}
+
+void rtl92ee_dm_watchdog(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        bool fw_current_inpsmode = false;
+        bool fw_ps_awake = true;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                      (u8 *)(&fw_current_inpsmode));
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
+                                      (u8 *)(&fw_ps_awake));
+        if (ppsc->p2p_ps_info.p2p_ps_mode)
+                fw_ps_awake = false;
+
+        if ((ppsc->rfpwr_state == ERFON) &&
+            ((!fw_current_inpsmode) && fw_ps_awake) &&
+            (!ppsc->rfchange_inprogress)) {
+                rtl92ee_dm_common_info_self_update(hw);
+                rtl92ee_dm_false_alarm_counter_statistics(hw);
+                rtl92ee_dm_check_rssi_monitor(hw);
+                rtl92ee_dm_dig(hw);
+                rtl92ee_dm_adaptivity(hw);
+                rtl92ee_dm_cck_packet_detection_thresh(hw);
+                rtl92ee_dm_refresh_rate_adaptive_mask(hw);
+                rtl92ee_dm_check_edca_turbo(hw);
+                rtl92ee_dm_dynamic_atc_switch(hw);
+                rtl92ee_dm_dynamic_primary_cca_ckeck(hw);
+        }
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/dm.h b/drivers/net/wireless/rtlwifi/rtl8192ee/dm.h
new file mode 100644
index 000000000000..881db7d6fef7
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/dm.h
@@ -0,0 +1,267 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_DM_H__
+#define __RTL92E_DM_H__
+
+#define OFDMCCA_TH                              500
+#define BW_IND_BIAS                             500
+#define MF_USC                                  2
+#define MF_LSC                                  1
+#define MF_USC_LSC                              0
+#define MONITOR_TIME                            30
+
+#define MAIN_ANT                                0
+#define AUX_ANT                                 1
+#define MAIN_ANT_CG_TRX                         1
+#define AUX_ANT_CG_TRX                          0
+#define MAIN_ANT_CGCS_RX                        0
+#define AUX_ANT_CGCS_RX                         1
+
+/*RF REG LIST*/
+#define DM_REG_RF_MODE_11N                      0x00
+#define DM_REG_RF_0B_11N                        0x0B
+#define DM_REG_CHNBW_11N                        0x18
+#define DM_REG_T_METER_11N                      0x24
+#define DM_REG_RF_25_11N                        0x25
+#define DM_REG_RF_26_11N                        0x26
+#define DM_REG_RF_27_11N                        0x27
+#define DM_REG_RF_2B_11N                        0x2B
+#define DM_REG_RF_2C_11N                        0x2C
+#define DM_REG_RXRF_A3_11N                      0x3C
+#define DM_REG_T_METER_92D_11N                  0x42
+#define DM_REG_T_METER_92E_11N                  0x42
+
+/*BB REG LIST*/
+/*PAGE 8 */
+#define DM_REG_BB_CTRL_11N                      0x800
+#define DM_REG_RF_PIN_11N                       0x804
+#define DM_REG_PSD_CTRL_11N                     0x808
+#define DM_REG_TX_ANT_CTRL_11N                  0x80C
+#define DM_REG_BB_PWR_SAV5_11N                  0x818
+#define DM_REG_CCK_RPT_FORMAT_11N               0x824
+#define DM_REG_RX_DEFUALT_A_11N                 0x858
+#define DM_REG_RX_DEFUALT_B_11N                 0x85A
+#define DM_REG_BB_PWR_SAV3_11N                  0x85C
+#define DM_REG_ANTSEL_CTRL_11N                  0x860
+#define DM_REG_RX_ANT_CTRL_11N                  0x864
+#define DM_REG_PIN_CTRL_11N                     0x870
+#define DM_REG_BB_PWR_SAV1_11N                  0x874
+#define DM_REG_ANTSEL_PATH_11N                  0x878
+#define DM_REG_BB_3WIRE_11N                     0x88C
+#define DM_REG_SC_CNT_11N                       0x8C4
+#define DM_REG_PSD_DATA_11N                     0x8B4
+/*PAGE 9*/
+#define DM_REG_ANT_MAPPING1_11N                 0x914
+#define DM_REG_ANT_MAPPING2_11N                 0x918
+/*PAGE A*/
+#define DM_REG_CCK_ANTDIV_PARA1_11N             0xA00
+#define DM_REG_CCK_CCA_11N                      0xA0A
+#define DM_REG_CCK_ANTDIV_PARA2_11N             0xA0C
+#define DM_REG_CCK_ANTDIV_PARA3_11N             0xA10
+#define DM_REG_CCK_ANTDIV_PARA4_11N             0xA14
+#define DM_REG_CCK_FILTER_PARA1_11N             0xA22
+#define DM_REG_CCK_FILTER_PARA2_11N             0xA23
+#define DM_REG_CCK_FILTER_PARA3_11N             0xA24
+#define DM_REG_CCK_FILTER_PARA4_11N             0xA25
+#define DM_REG_CCK_FILTER_PARA5_11N             0xA26
+#define DM_REG_CCK_FILTER_PARA6_11N             0xA27
+#define DM_REG_CCK_FILTER_PARA7_11N             0xA28
+#define DM_REG_CCK_FILTER_PARA8_11N             0xA29
+#define DM_REG_CCK_FA_RST_11N                   0xA2C
+#define DM_REG_CCK_FA_MSB_11N                   0xA58
+#define DM_REG_CCK_FA_LSB_11N                   0xA5C
+#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
+/*PAGE C */
+#define DM_REG_OFDM_FA_HOLDC_11N                0xC00
+#define DM_REG_RX_PATH_11N                      0xC04
+#define DM_REG_TRMUX_11N                        0xC08
+#define DM_REG_OFDM_FA_RSTC_11N                 0xC0C
+#define DM_REG_RXIQI_MATRIX_11N                 0xC14
+#define DM_REG_TXIQK_MATRIX_LSB1_11N            0xC4C
+#define DM_REG_IGI_A_11N                        0xC50
+#define DM_REG_ANTDIV_PARA2_11N                 0xC54
+#define DM_REG_IGI_B_11N                        0xC58
+#define DM_REG_ANTDIV_PARA3_11N                 0xC5C
+#define DM_REG_L1SBD_PD_CH_11N                  0XC6C
+#define DM_REG_BB_PWR_SAV2_11N                  0xC70
+#define DM_REG_RX_OFF_11N                       0xC7C
+#define DM_REG_TXIQK_MATRIXA_11N                0xC80
+#define DM_REG_TXIQK_MATRIXB_11N                0xC88
+#define DM_REG_TXIQK_MATRIXA_LSB2_11N           0xC94
+#define DM_REG_TXIQK_MATRIXB_LSB2_11N           0xC9C
+#define DM_REG_RXIQK_MATRIX_LSB_11N             0xCA0
+#define DM_REG_ANTDIV_PARA1_11N                 0xCA4
+#define DM_REG_OFDM_FA_TYPE1_11N                0xCF0
+/*PAGE D */
+#define DM_REG_OFDM_FA_RSTD_11N                 0xD00
+#define DM_REG_OFDM_FA_TYPE2_11N                0xDA0
+#define DM_REG_OFDM_FA_TYPE3_11N                0xDA4
+#define DM_REG_OFDM_FA_TYPE4_11N                0xDA8
+/*PAGE E */
+#define DM_REG_TXAGC_A_6_18_11N                 0xE00
+#define DM_REG_TXAGC_A_24_54_11N                0xE04
+#define DM_REG_TXAGC_A_1_MCS32_11N              0xE08
+#define DM_REG_TXAGC_A_MCS0_3_11N               0xE10
+#define DM_REG_TXAGC_A_MCS4_7_11N               0xE14
+#define DM_REG_TXAGC_A_MCS8_11_11N              0xE18
+#define DM_REG_TXAGC_A_MCS12_15_11N             0xE1C
+#define DM_REG_FPGA0_IQK_11N                    0xE28
+#define DM_REG_TXIQK_TONE_A_11N                 0xE30
+#define DM_REG_RXIQK_TONE_A_11N                 0xE34
+#define DM_REG_TXIQK_PI_A_11N                   0xE38
+#define DM_REG_RXIQK_PI_A_11N                   0xE3C
+#define DM_REG_TXIQK_11N                        0xE40
+#define DM_REG_RXIQK_11N                        0xE44
+#define DM_REG_IQK_AGC_PTS_11N                  0xE48
+#define DM_REG_IQK_AGC_RSP_11N                  0xE4C
+#define DM_REG_BLUETOOTH_11N                    0xE6C
+#define DM_REG_RX_WAIT_CCA_11N                  0xE70
+#define DM_REG_TX_CCK_RFON_11N                  0xE74
+#define DM_REG_TX_CCK_BBON_11N                  0xE78
+#define DM_REG_OFDM_RFON_11N                    0xE7C
+#define DM_REG_OFDM_BBON_11N                    0xE80
+#define         DM_REG_TX2RX_11N                0xE84
+#define DM_REG_TX2TX_11N                        0xE88
+#define DM_REG_RX_CCK_11N                       0xE8C
+#define DM_REG_RX_OFDM_11N                      0xED0
+#define DM_REG_RX_WAIT_RIFS_11N                 0xED4
+#define DM_REG_RX2RX_11N                        0xED8
+#define DM_REG_STANDBY_11N                      0xEDC
+#define DM_REG_SLEEP_11N                        0xEE0
+#define DM_REG_PMPD_ANAEN_11N                   0xEEC
+
+/*MAC REG LIST*/
+#define DM_REG_BB_RST_11N                       0x02
+#define DM_REG_ANTSEL_PIN_11N                   0x4C
+#define DM_REG_EARLY_MODE_11N                   0x4D0
+#define DM_REG_RSSI_MONITOR_11N                 0x4FE
+#define DM_REG_EDCA_VO_11N                      0x500
+#define DM_REG_EDCA_VI_11N                      0x504
+#define DM_REG_EDCA_BE_11N                      0x508
+#define DM_REG_EDCA_BK_11N                      0x50C
+#define DM_REG_TXPAUSE_11N                      0x522
+#define DM_REG_RESP_TX_11N                      0x6D8
+#define DM_REG_ANT_TRAIN_PARA1_11N              0x7b0
+#define DM_REG_ANT_TRAIN_PARA2_11N              0x7b4
+
+/*DIG Related*/
+#define DM_BIT_IGI_11N                          0x0000007F
+
+#define HAL_DM_DIG_DISABLE                      BIT(0)
+#define HAL_DM_HIPWR_DISABLE                    BIT(1)
+
+#define OFDM_TABLE_LENGTH                       43
+#define CCK_TABLE_LENGTH                        33
+
+#define OFDM_TABLE_SIZE                         43
+#define CCK_TABLE_SIZE                          33
+
+#define BW_AUTO_SWITCH_HIGH_LOW                 25
+#define BW_AUTO_SWITCH_LOW_HIGH                 30
+
+#define DM_DIG_THRESH_HIGH                      40
+#define DM_DIG_THRESH_LOW                       35
+
+#define DM_FALSEALARM_THRESH_LOW                400
+#define DM_FALSEALARM_THRESH_HIGH               1000
+
+#define DM_DIG_MAX                              0x3e
+#define DM_DIG_MIN                              0x1e
+
+#define DM_DIG_MAX_AP                           0x32
+#define DM_DIG_MIN_AP                           0x20
+
+#define DM_DIG_FA_UPPER                         0x3e
+#define DM_DIG_FA_LOWER                         0x1e
+#define DM_DIG_FA_TH0                           0x200
+#define DM_DIG_FA_TH1                           0x300
+#define DM_DIG_FA_TH2                           0x400
+
+#define DM_DIG_BACKOFF_MAX                      12
+#define DM_DIG_BACKOFF_MIN                      -4
+#define DM_DIG_BACKOFF_DEFAULT                  10
+
+#define RXPATHSELECTION_SS_TH_LOW               30
+#define RXPATHSELECTION_DIFF_TH                 18
+
+#define DM_RATR_STA_INIT                        0
+#define DM_RATR_STA_HIGH                        1
+#define DM_RATR_STA_MIDDLE                      2
+#define DM_RATR_STA_LOW                         3
+
+#define CTS2SELF_THVAL                          30
+#define REGC38_TH                               20
+
+#define WAIOTTHVAL                              25
+
+#define TXHIGHPWRLEVEL_NORMAL                   0
+#define TXHIGHPWRLEVEL_LEVEL1                   1
+#define TXHIGHPWRLEVEL_LEVEL2                   2
+#define TXHIGHPWRLEVEL_BT1                      3
+#define TXHIGHPWRLEVEL_BT2                      4
+
+#define DM_TYPE_BYFW                            0
+#define DM_TYPE_BYDRIVER                        1
+
+#define TX_POWER_NEAR_FIELD_THRESH_LVL2         74
+#define TX_POWER_NEAR_FIELD_THRESH_LVL1         67
+#define TXPWRTRACK_MAX_IDX                      6
+
+/* Dynamic ATC switch */
+#define ATC_STATUS_OFF                          0x0     /* enable */
+#define ATC_STATUS_ON                           0x1     /* disable */
+#define CFO_THRESHOLD_XTAL                      10      /* kHz */
+#define CFO_THRESHOLD_ATC                       80      /* kHz */
+
+/* RSSI Dump Message */
+#define RA_RSSIDUMP                             0xcb0
+#define RB_RSSIDUMP                             0xcb1
+#define RS1_RXEVMDUMP                           0xcb2
+#define RS2_RXEVMDUMP                           0xcb3
+#define RA_RXSNRDUMP                            0xcb4
+#define RB_RXSNRDUMP                            0xcb5
+#define RA_CFOSHORTDUMP                         0xcb6
+#define RB_CFOSHORTDUMP                         0xcb8
+#define RA_CFOLONGDUMP                          0xcba
+#define RB_CFOLONGDUMP                          0xcbc
+
+void rtl92ee_dm_init(struct ieee80211_hw *hw);
+void rtl92ee_dm_watchdog(struct ieee80211_hw *hw);
+void rtl92ee_dm_write_cck_cca_thres(struct ieee80211_hw *hw,
+                                    u8 cur_thres);
+void rtl92ee_dm_write_dig(struct ieee80211_hw *hw, u8 current_igi);
+void rtl92ee_dm_init_edca_turbo(struct ieee80211_hw *hw);
+void rtl92ee_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw);
+void rtl92ee_dm_dynamic_arfb_select(struct ieee80211_hw *hw,
+                                    u8 rate, bool collision_state);
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c
new file mode 100644
index 000000000000..45c128b91f7f
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c
@@ -0,0 +1,906 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../base.h"
+#include "../core.h"
+#include "reg.h"
+#include "def.h"
+#include "fw.h"
+#include "dm.h"
+
+static void _rtl92ee_enable_fw_download(struct ieee80211_hw *hw, bool enable)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp;
+
+        if (enable) {
+                rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x05);
+
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL + 2);
+                rtl_write_byte(rtlpriv, REG_MCUFWDL + 2, tmp & 0xf7);
+        } else {
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL);
+                rtl_write_byte(rtlpriv, REG_MCUFWDL, tmp & 0xfe);
+        }
+}
+
+static void _rtl92ee_fw_block_write(struct ieee80211_hw *hw,
+                                    const u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 blocksize = sizeof(u32);
+        u8 *bufferptr = (u8 *)buffer;
+        u32 *pu4byteptr = (u32 *)buffer;
+        u32 i, offset, blockcount, remainsize;
+
+        blockcount = size / blocksize;
+        remainsize = size % blocksize;
+
+        for (i = 0; i < blockcount; i++) {
+                offset = i * blocksize;
+                rtl_write_dword(rtlpriv, (FW_8192C_START_ADDRESS + offset),
+                                *(pu4byteptr + i));
+        }
+
+        if (remainsize) {
+                offset = blockcount * blocksize;
+                bufferptr += offset;
+                for (i = 0; i < remainsize; i++) {
+                        rtl_write_byte(rtlpriv,
+                                       (FW_8192C_START_ADDRESS + offset + i),
+                                       *(bufferptr + i));
+                }
+        }
+}
+
+static void _rtl92ee_fw_page_write(struct ieee80211_hw *hw, u32 page,
+                                   const u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 value8;
+        u8 u8page = (u8)(page & 0x07);
+
+        value8 = (rtl_read_byte(rtlpriv, REG_MCUFWDL + 2) & 0xF8) | u8page;
+        rtl_write_byte(rtlpriv, (REG_MCUFWDL + 2), value8);
+
+        _rtl92ee_fw_block_write(hw, buffer, size);
+}
+
+static void _rtl92ee_fill_dummy(u8 *pfwbuf, u32 *pfwlen)
+{
+        u32 fwlen = *pfwlen;
+        u8 remain = (u8)(fwlen % 4);
+
+        remain = (remain == 0) ? 0 : (4 - remain);
+
+        while (remain > 0) {
+                pfwbuf[fwlen] = 0;
+                fwlen++;
+                remain--;
+        }
+
+        *pfwlen = fwlen;
+}
+
+static void _rtl92ee_write_fw(struct ieee80211_hw *hw,
+                              enum version_8192e version,
+                              u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 *bufferptr = (u8 *)buffer;
+        u32 pagenums, remainsize;
+        u32 page, offset;
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD , "FW size is %d bytes,\n", size);
+
+        _rtl92ee_fill_dummy(bufferptr, &size);
+
+        pagenums = size / FW_8192C_PAGE_SIZE;
+        remainsize = size % FW_8192C_PAGE_SIZE;
+
+        if (pagenums > 8) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Page numbers should not greater then 8\n");
+        }
+
+        for (page = 0; page < pagenums; page++) {
+                offset = page * FW_8192C_PAGE_SIZE;
+                _rtl92ee_fw_page_write(hw, page, (bufferptr + offset),
+                                       FW_8192C_PAGE_SIZE);
+                udelay(2);
+        }
+
+        if (remainsize) {
+                offset = pagenums * FW_8192C_PAGE_SIZE;
+                page = pagenums;
+                _rtl92ee_fw_page_write(hw, page, (bufferptr + offset),
+                                       remainsize);
+        }
+}
+
+static int _rtl92ee_fw_free_to_go(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int err = -EIO;
+        u32 counter = 0;
+        u32 value32;
+
+        do {
+                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+        } while ((counter++ < FW_8192C_POLLING_TIMEOUT_COUNT) &&
+                 (!(value32 & FWDL_CHKSUM_RPT)));
+
+        if (counter >= FW_8192C_POLLING_TIMEOUT_COUNT) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "chksum report faill ! REG_MCUFWDL:0x%08x .\n",
+                          value32);
+                goto exit;
+        }
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                 "Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32);
+
+        value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+        value32 |= MCUFWDL_RDY;
+        value32 &= ~WINTINI_RDY;
+        rtl_write_dword(rtlpriv, REG_MCUFWDL, value32);
+
+        rtl92ee_firmware_selfreset(hw);
+        counter = 0;
+
+        do {
+                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+                if (value32 & WINTINI_RDY) {
+                        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD ,
+                                 "Polling FW ready success!! REG_MCUFWDL:0x%08x. count = %d\n",
+                                 value32, counter);
+                        err = 0;
+                        goto exit;
+                }
+
+                udelay(FW_8192C_POLLING_DELAY*10);
+
+        } while (counter++ < FW_8192C_POLLING_TIMEOUT_COUNT);
+
+        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                 "Polling FW ready fail!! REG_MCUFWDL:0x%08x. count = %d\n",
+                 value32, counter);
+
+exit:
+        return err;
+}
+
+int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl92c_firmware_header *pfwheader;
+        u8 *pfwdata;
+        u32 fwsize;
+        int err;
+        enum version_8192e version = rtlhal->version;
+
+        if (!rtlhal->pfirmware)
+                return 1;
+
+        pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
+        rtlhal->fw_version = pfwheader->version;
+        rtlhal->fw_subversion = pfwheader->subversion;
+        pfwdata = (u8 *)rtlhal->pfirmware;
+        fwsize = rtlhal->fwsize;
+        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
+                 "normal Firmware SIZE %d\n" , fwsize);
+
+        if (IS_FW_HEADER_EXIST(pfwheader)) {
+                RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
+                         "Firmware Version(%d), Signature(%#x),Size(%d)\n",
+                          pfwheader->version, pfwheader->signature,
+                          (int)sizeof(struct rtl92c_firmware_header));
+
+                pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
+                fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
+        } else {
+                RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
+                         "Firmware no Header, Signature(%#x)\n",
+                          pfwheader->signature);
+        }
+
+        if (rtlhal->mac_func_enable) {
+                if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) {
+                        rtl_write_byte(rtlpriv, REG_MCUFWDL, 0);
+                        rtl92ee_firmware_selfreset(hw);
+                }
+        }
+        _rtl92ee_enable_fw_download(hw, true);
+        _rtl92ee_write_fw(hw, version, pfwdata, fwsize);
+        _rtl92ee_enable_fw_download(hw, false);
+
+        err = _rtl92ee_fw_free_to_go(hw);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Firmware is not ready to run!\n");
+        } else {
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD ,
+                         "Firmware is ready to run!\n");
+        }
+
+        return 0;
+}
+
+static bool _rtl92ee_check_fw_read_last_h2c(struct ieee80211_hw *hw, u8 boxnum)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 val_hmetfr;
+        bool result = false;
+
+        val_hmetfr = rtl_read_byte(rtlpriv, REG_HMETFR);
+        if (((val_hmetfr >> boxnum) & BIT(0)) == 0)
+                result = true;
+        return result;
+}
+
+static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
+                                      u32 cmd_len, u8 *cmdbuffer)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 boxnum;
+        u16 box_reg = 0, box_extreg = 0;
+        u8 u1b_tmp;
+        bool isfw_read = false;
+        u8 buf_index = 0;
+        bool bwrite_sucess = false;
+        u8 wait_h2c_limmit = 100;
+        u8 boxcontent[4], boxextcontent[4];
+        u32 h2c_waitcounter = 0;
+        unsigned long flag;
+        u8 idx;
+
+        if (ppsc->dot11_psmode != EACTIVE ||
+            ppsc->inactive_pwrstate == ERFOFF) {
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,
+                         "FillH2CCommand8192E(): Return because RF is off!!!\n");
+                return;
+        }
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD , "come in\n");
+
+        /* 1. Prevent race condition in setting H2C cmd.
+         * (copy from MgntActSet_RF_State().)
+         */
+        while (true) {
+                spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
+                if (rtlhal->h2c_setinprogress) {
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,
+                                 "H2C set in progress! Wait to set..element_id(%d).\n",
+                                  element_id);
+
+                        while (rtlhal->h2c_setinprogress) {
+                                spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
+                                                       flag);
+                                h2c_waitcounter++;
+                                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,
+                                         "Wait 100 us (%d times)...\n",
+                                          h2c_waitcounter);
+                                udelay(100);
+
+                                if (h2c_waitcounter > 1000)
+                                        return;
+                                spin_lock_irqsave(&rtlpriv->locks.h2c_lock,
+                                                  flag);
+                        }
+                        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+                } else {
+                        rtlhal->h2c_setinprogress = true;
+                        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+                        break;
+                }
+        }
+
+        while (!bwrite_sucess) {
+                /* 2. Find the last BOX number which has been writen. */
+                boxnum = rtlhal->last_hmeboxnum;
+                switch (boxnum) {
+                case 0:
+                        box_reg = REG_HMEBOX_0;
+                        box_extreg = REG_HMEBOX_EXT_0;
+                        break;
+                case 1:
+                        box_reg = REG_HMEBOX_1;
+                        box_extreg = REG_HMEBOX_EXT_1;
+                        break;
+                case 2:
+                        box_reg = REG_HMEBOX_2;
+                        box_extreg = REG_HMEBOX_EXT_2;
+                        break;
+                case 3:
+                        box_reg = REG_HMEBOX_3;
+                        box_extreg = REG_HMEBOX_EXT_3;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
+                        break;
+                }
+
+                /* 3. Check if the box content is empty. */
+                isfw_read = false;
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_CR);
+
+                if (u1b_tmp != 0xea) {
+                        isfw_read = true;
+                } else {
+                        if (rtl_read_byte(rtlpriv, REG_TXDMA_STATUS) == 0xea ||
+                            rtl_read_byte(rtlpriv, REG_TXPKT_EMPTY) == 0xea)
+                                rtl_write_byte(rtlpriv, REG_SYS_CFG1 + 3, 0xff);
+                }
+
+                if (isfw_read) {
+                        wait_h2c_limmit = 100;
+                        isfw_read = _rtl92ee_check_fw_read_last_h2c(hw, boxnum);
+                        while (!isfw_read) {
+                                wait_h2c_limmit--;
+                                if (wait_h2c_limmit == 0) {
+                                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,
+                                                 "Waiting too long for FW read clear HMEBox(%d)!!!\n",
+                                                 boxnum);
+                                        break;
+                                }
+                                udelay(10);
+                                isfw_read =
+                                  _rtl92ee_check_fw_read_last_h2c(hw, boxnum);
+                                u1b_tmp = rtl_read_byte(rtlpriv, 0x130);
+                                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,
+                                         "Waiting for FW read clear HMEBox(%d)!!! 0x130 = %2x\n",
+                                         boxnum, u1b_tmp);
+                        }
+                }
+
+                /* If Fw has not read the last
+                 * H2C cmd, break and give up this H2C.
+                 */
+                if (!isfw_read) {
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,
+                                 "Write H2C reg BOX[%d] fail,Fw don't read.\n",
+                                 boxnum);
+                        break;
+                }
+                /* 4. Fill the H2C cmd into box */
+                memset(boxcontent, 0, sizeof(boxcontent));
+                memset(boxextcontent, 0, sizeof(boxextcontent));
+                boxcontent[0] = element_id;
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,
+                         "Write element_id box_reg(%4x) = %2x\n",
+                          box_reg, element_id);
+
+                switch (cmd_len) {
+                case 1:
+                case 2:
+                case 3:
+                        /*boxcontent[0] &= ~(BIT(7));*/
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, cmd_len);
+
+                        for (idx = 0; idx < 4; idx++) {
+                                rtl_write_byte(rtlpriv, box_reg + idx,
+                                               boxcontent[idx]);
+                        }
+                        break;
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                        /*boxcontent[0] |= (BIT(7));*/
+                        memcpy((u8 *)(boxextcontent),
+                               cmdbuffer + buf_index+3, cmd_len-3);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, 3);
+
+                        for (idx = 0; idx < 4; idx++) {
+                                rtl_write_byte(rtlpriv, box_extreg + idx,
+                                               boxextcontent[idx]);
+                        }
+
+                        for (idx = 0; idx < 4; idx++) {
+                                rtl_write_byte(rtlpriv, box_reg + idx,
+                                               boxcontent[idx]);
+                        }
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
+                        break;
+                }
+
+                bwrite_sucess = true;
+
+                rtlhal->last_hmeboxnum = boxnum + 1;
+                if (rtlhal->last_hmeboxnum == 4)
+                        rtlhal->last_hmeboxnum = 0;
+
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD ,
+                         "pHalData->last_hmeboxnum  = %d\n",
+                          rtlhal->last_hmeboxnum);
+        }
+
+        spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
+        rtlhal->h2c_setinprogress = false;
+        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD , "go out\n");
+}
+
+void rtl92ee_fill_h2c_cmd(struct ieee80211_hw *hw,
+                          u8 element_id, u32 cmd_len, u8 *cmdbuffer)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 tmp_cmdbuf[2];
+
+        if (!rtlhal->fw_ready) {
+                RT_ASSERT(false,
+                          "return H2C cmd because of Fw download fail!!!\n");
+                return;
+        }
+
+        memset(tmp_cmdbuf, 0, 8);
+        memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
+        _rtl92ee_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
+}
+
+void rtl92ee_firmware_selfreset(struct ieee80211_hw *hw)
+{
+        u8 u1b_tmp;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1b_tmp & (~BIT(0))));
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, (u1b_tmp & (~BIT(2))));
+
+        udelay(50);
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1b_tmp | BIT(0)));
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, (u1b_tmp | BIT(2)));
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD ,
+                 "  _8051Reset92E(): 8051 reset success .\n");
+}
+
+void rtl92ee_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 u1_h2c_set_pwrmode[H2C_92E_PWEMODE_LENGTH] = { 0 };
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 rlbm , power_state = 0;
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD , "FW LPS mode = %d\n", mode);
+
+        SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));
+        rlbm = 0;/*YJ,temp,120316. FW now not support RLBM=2.*/
+        SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, rlbm);
+        SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
+                                         (rtlpriv->mac80211.p2p) ?
+                                         ppsc->smart_ps : 1);
+        SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(u1_h2c_set_pwrmode,
+                                               ppsc->reg_max_lps_awakeintvl);
+        SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(u1_h2c_set_pwrmode, 0);
+        if (mode == FW_PS_ACTIVE_MODE)
+                power_state |= FW_PWR_STATE_ACTIVE;
+        else
+                power_state |= FW_PWR_STATE_RF_OFF;
+        SET_H2CCMD_PWRMODE_PARM_PWR_STATE(u1_h2c_set_pwrmode, power_state);
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                      "rtl92c_set_fw_pwrmode(): u1_h2c_set_pwrmode\n",
+                      u1_h2c_set_pwrmode, H2C_92E_PWEMODE_LENGTH);
+        rtl92ee_fill_h2c_cmd(hw, H2C_92E_SETPWRMODE, H2C_92E_PWEMODE_LENGTH,
+                             u1_h2c_set_pwrmode);
+}
+
+void rtl92ee_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw, u8 mstatus)
+{
+        u8 parm[3] = { 0 , 0 , 0 };
+        /* parm[0]: bit0=0-->Disconnect, bit0=1-->Connect
+         *          bit1=0-->update Media Status to MACID
+         *          bit1=1-->update Media Status from MACID to MACID_End
+         * parm[1]: MACID, if this is INFRA_STA, MacID = 0
+         * parm[2]: MACID_End
+         */
+
+        SET_H2CCMD_MSRRPT_PARM_OPMODE(parm, mstatus);
+        SET_H2CCMD_MSRRPT_PARM_MACID_IND(parm, 0);
+
+        rtl92ee_fill_h2c_cmd(hw, H2C_92E_MSRRPT, 3, parm);
+}
+
+#define BEACON_PG               0 /* ->1 */
+#define PSPOLL_PG               2
+#define NULL_PG                 3
+#define PROBERSP_PG             4 /* ->5 */
+
+#define TOTAL_RESERVED_PKT_LEN  768
+
+static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = {
+        /* page 0 beacon */
+        0x80, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0x00, 0xE0, 0x4C, 0x02, 0xB1, 0x78,
+        0xEC, 0x1A, 0x59, 0x0B, 0xAD, 0xD4, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x64, 0x00, 0x10, 0x04, 0x00, 0x05, 0x54, 0x65,
+        0x73, 0x74, 0x32, 0x01, 0x08, 0x82, 0x84, 0x0B,
+        0x16, 0x24, 0x30, 0x48, 0x6C, 0x03, 0x01, 0x06,
+        0x06, 0x02, 0x00, 0x00, 0x2A, 0x01, 0x02, 0x32,
+        0x04, 0x0C, 0x12, 0x18, 0x60, 0x2D, 0x1A, 0x6C,
+        0x09, 0x03, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x3D, 0x00, 0xDD, 0x07, 0x00, 0xE0, 0x4C,
+        0x02, 0x02, 0x00, 0x00, 0xDD, 0x18, 0x00, 0x50,
+        0xF2, 0x01, 0x01, 0x00, 0x00, 0x50, 0xF2, 0x04,
+        0x01, 0x00, 0x00, 0x50, 0xF2, 0x04, 0x01, 0x00,
+
+        /* page 1 beacon */
+        0x00, 0x50, 0xF2, 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, 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, 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,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x10, 0x00, 0x28, 0x8C, 0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 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,
+
+        /* page 2  ps-poll */
+        0xA4, 0x10, 0x01, 0xC0, 0xEC, 0x1A, 0x59, 0x0B,
+        0xAD, 0xD4, 0x00, 0xE0, 0x4C, 0x02, 0xB1, 0x78,
+        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, 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, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x18, 0x00, 0x28, 0x8C, 0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+        /* page 3  null */
+        0x48, 0x01, 0x00, 0x00, 0xEC, 0x1A, 0x59, 0x0B,
+        0xAD, 0xD4, 0x00, 0xE0, 0x4C, 0x02, 0xB1, 0x78,
+        0xEC, 0x1A, 0x59, 0x0B, 0xAD, 0xD4, 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,
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x72, 0x00, 0x28, 0x8C, 0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+        /* page 4  probe_resp */
+        0x50, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x10,
+        0x00, 0x03, 0x00, 0xE0, 0x4C, 0x76, 0x00, 0x42,
+        0x00, 0x40, 0x10, 0x10, 0x00, 0x03, 0x00, 0x00,
+        0x9E, 0x46, 0x15, 0x32, 0x27, 0xF2, 0x2D, 0x00,
+        0x64, 0x00, 0x00, 0x04, 0x00, 0x0C, 0x6C, 0x69,
+        0x6E, 0x6B, 0x73, 0x79, 0x73, 0x5F, 0x77, 0x6C,
+        0x61, 0x6E, 0x01, 0x04, 0x82, 0x84, 0x8B, 0x96,
+        0x03, 0x01, 0x01, 0x06, 0x02, 0x00, 0x00, 0x2A,
+        0x01, 0x00, 0x32, 0x08, 0x24, 0x30, 0x48, 0x6C,
+        0x0C, 0x12, 0x18, 0x60, 0x2D, 0x1A, 0x6C, 0x18,
+        0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x3D, 0x00, 0xDD, 0x06, 0x00, 0xE0, 0x4C, 0x02,
+        0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+        /* page 5  probe_resp */
+        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, 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, 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, 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,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct sk_buff *skb = NULL;
+
+        u32 totalpacketlen;
+        bool rtstatus;
+        u8 u1rsvdpageloc[5] = { 0 };
+        bool b_dlok = false;
+
+        u8 *beacon;
+        u8 *p_pspoll;
+        u8 *nullfunc;
+        u8 *p_probersp;
+        /*---------------------------------------------------------
+         *                      (1) beacon
+         *---------------------------------------------------------
+         */
+        beacon = &reserved_page_packet[BEACON_PG * 128];
+        SET_80211_HDR_ADDRESS2(beacon, mac->mac_addr);
+        SET_80211_HDR_ADDRESS3(beacon, mac->bssid);
+
+        /*-------------------------------------------------------
+         *                      (2) ps-poll
+         *--------------------------------------------------------
+         */
+        p_pspoll = &reserved_page_packet[PSPOLL_PG * 128];
+        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);
+
+        /*--------------------------------------------------------
+         *                      (3) null data
+         *---------------------------------------------------------
+         */
+        nullfunc = &reserved_page_packet[NULL_PG * 128];
+        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);
+
+        /*---------------------------------------------------------
+         *                      (4) probe response
+         *----------------------------------------------------------
+         */
+        p_probersp = &reserved_page_packet[PROBERSP_PG * 128];
+        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);
+
+        totalpacketlen = TOTAL_RESERVED_PKT_LEN;
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD ,
+                      "rtl92ee_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      &reserved_page_packet[0], totalpacketlen);
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD ,
+                      "rtl92ee_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      u1rsvdpageloc, 3);
+
+        skb = dev_alloc_skb(totalpacketlen);
+        memcpy((u8 *)skb_put(skb, totalpacketlen),
+               &reserved_page_packet, totalpacketlen);
+
+        rtstatus = rtl_cmd_send_packet(hw, skb);
+
+        if (rtstatus)
+                b_dlok = true;
+
+        if (b_dlok) {
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD ,
+                         "Set RSVD page location to Fw.\n");
+                RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD ,
+                              "H2C_RSVDPAGE:\n", u1rsvdpageloc, 3);
+                rtl92ee_fill_h2c_cmd(hw, H2C_92E_RSVDPAGE,
+                                     sizeof(u1rsvdpageloc), u1rsvdpageloc);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set RSVD page location to Fw FAIL!!!!!!.\n");
+        }
+}
+
+/*Shoud check FW support p2p or not.*/
+static void rtl92ee_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw, u8 ctwindow)
+{
+        u8 u1_ctwindow_period[1] = {ctwindow};
+
+        rtl92ee_fill_h2c_cmd(hw, H2C_92E_P2P_PS_CTW_CMD, 1, u1_ctwindow_period);
+}
+
+void rtl92ee_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_p2p_ps_info *p2pinfo = &rtlps->p2p_ps_info;
+        struct p2p_ps_offload_t *p2p_ps_offload = &rtlhal->p2p_ps_offload;
+        u8 i;
+        u16 ctwindow;
+        u32 start_time, tsf_low;
+
+        switch (p2p_ps_state) {
+        case P2P_PS_DISABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD , "P2P_PS_DISABLE\n");
+                memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));
+                break;
+        case P2P_PS_ENABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD , "P2P_PS_ENABLE\n");
+                /* update CTWindow value. */
+                if (p2pinfo->ctwindow > 0) {
+                        p2p_ps_offload->ctwindow_en = 1;
+                        ctwindow = p2pinfo->ctwindow;
+                        rtl92ee_set_p2p_ctw_period_cmd(hw, ctwindow);
+                }
+                /* hw only support 2 set of NoA */
+                for (i = 0 ; i < p2pinfo->noa_num ; i++) {
+                        /* To control the register setting for which NOA*/
+                        rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
+                        if (i == 0)
+                                p2p_ps_offload->noa0_en = 1;
+                        else
+                                p2p_ps_offload->noa1_en = 1;
+                        /* config P2P NoA Descriptor Register */
+                        rtl_write_dword(rtlpriv, 0x5E0,
+                                        p2pinfo->noa_duration[i]);
+                        rtl_write_dword(rtlpriv, 0x5E4,
+                                        p2pinfo->noa_interval[i]);
+
+                        /*Get Current TSF value */
+                        tsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                        start_time = p2pinfo->noa_start_time[i];
+                        if (p2pinfo->noa_count_type[i] != 1) {
+                                while (start_time <= (tsf_low + (50 * 1024))) {
+                                        start_time += p2pinfo->noa_interval[i];
+                                        if (p2pinfo->noa_count_type[i] != 255)
+                                                p2pinfo->noa_count_type[i]--;
+                                }
+                        }
+                        rtl_write_dword(rtlpriv, 0x5E8, start_time);
+                        rtl_write_dword(rtlpriv, 0x5EC,
+                                        p2pinfo->noa_count_type[i]);
+                }
+                if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
+                        /* rst p2p circuit */
+                        rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, BIT(4));
+                        p2p_ps_offload->offload_en = 1;
+
+                        if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
+                                p2p_ps_offload->role = 1;
+                                p2p_ps_offload->allstasleep = 0;
+                        } else {
+                                p2p_ps_offload->role = 0;
+                        }
+                        p2p_ps_offload->discovery = 0;
+                }
+                break;
+        case P2P_PS_SCAN:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD , "P2P_PS_SCAN\n");
+                p2p_ps_offload->discovery = 1;
+                break;
+        case P2P_PS_SCAN_DONE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD , "P2P_PS_SCAN_DONE\n");
+                p2p_ps_offload->discovery = 0;
+                p2pinfo->p2p_ps_state = P2P_PS_ENABLE;
+                break;
+        default:
+                break;
+        }
+        rtl92ee_fill_h2c_cmd(hw, H2C_92E_P2P_PS_OFFLOAD, 1,
+                             (u8 *)p2p_ps_offload);
+}
+
+static void _rtl92ee_c2h_ra_report_handler(struct ieee80211_hw *hw,
+                                           u8 *cmd_buf, u8 cmd_len)
+{
+        u8 rate = cmd_buf[0] & 0x3F;
+        bool collision_state = cmd_buf[3] & BIT(0);
+
+        rtl92ee_dm_dynamic_arfb_select(hw, rate, collision_state);
+}
+
+static void _rtl92ee_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id,
+                                         u8 c2h_cmd_len, u8 *tmp_buf)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        switch (c2h_cmd_id) {
+        case C2H_8192E_DBG:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], C2H_8723BE_DBG!!\n");
+                break;
+        case C2H_8192E_TXBF:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], C2H_8192E_TXBF!!\n");
+                break;
+        case C2H_8192E_TX_REPORT:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE ,
+                         "[C2H], C2H_8723BE_TX_REPORT!\n");
+                break;
+        case C2H_8192E_BT_INFO:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], C2H_8723BE_BT_INFO!!\n");
+                rtlpriv->btcoexist.btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,
+                                                              c2h_cmd_len);
+                break;
+        case C2H_8192E_BT_MP:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], C2H_8723BE_BT_MP!!\n");
+                break;
+        case C2H_8192E_RA_RPT:
+                _rtl92ee_c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], Unkown packet!! CmdId(%#X)!\n", c2h_cmd_id);
+                break;
+        }
+}
+
+void rtl92ee_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 c2h_cmd_id = 0, c2h_cmd_seq = 0, c2h_cmd_len = 0;
+        u8 *tmp_buf = NULL;
+
+        c2h_cmd_id = buffer[0];
+        c2h_cmd_seq = buffer[1];
+        c2h_cmd_len = len - 2;
+        tmp_buf = buffer + 2;
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                 "[C2H packet], c2hCmdId=0x%x, c2hCmdSeq=0x%x, c2hCmdLen=%d\n",
+                 c2h_cmd_id, c2h_cmd_seq, c2h_cmd_len);
+
+        RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_TRACE,
+                      "[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);
+
+        _rtl92ee_c2h_content_parsing(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/fw.h b/drivers/net/wireless/rtlwifi/rtl8192ee/fw.h
new file mode 100644
index 000000000000..3e2a48e5fb4d
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/fw.h
@@ -0,0 +1,208 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E__FW__H__
+#define __RTL92E__FW__H__
+
+#define FW_8192C_SIZE                           0x8000
+#define FW_8192C_START_ADDRESS                  0x1000
+#define FW_8192C_END_ADDRESS                    0x5FFF
+#define FW_8192C_PAGE_SIZE                      4096
+#define FW_8192C_POLLING_DELAY                  5
+#define FW_8192C_POLLING_TIMEOUT_COUNT          3000
+
+#define IS_FW_HEADER_EXIST(_pfwhdr)     \
+        ((_pfwhdr->signature&0xFFF0) == 0x92E0)
+#define USE_OLD_WOWLAN_DEBUG_FW 0
+
+#define H2C_92E_RSVDPAGE_LOC_LEN                5
+#define H2C_92E_PWEMODE_LENGTH                  5
+#define H2C_92E_JOINBSSRPT_LENGTH               1
+#define H2C_92E_AP_OFFLOAD_LENGTH               3
+#define H2C_92E_WOWLAN_LENGTH                   3
+#define H2C_92E_KEEP_ALIVE_CTRL_LENGTH          3
+#if (USE_OLD_WOWLAN_DEBUG_FW == 0)
+#define H2C_92E_REMOTE_WAKE_CTRL_LEN            1
+#else
+#define H2C_92E_REMOTE_WAKE_CTRL_LEN            3
+#endif
+#define H2C_92E_AOAC_GLOBAL_INFO_LEN            2
+#define H2C_92E_AOAC_RSVDPAGE_LOC_LEN           7
+
+/* Fw PS state for RPWM.
+*BIT[2:0] = HW state
+*BIT[3] = Protocol PS state,  1: register active state, 0: register sleep state
+*BIT[4] = sub-state
+*/
+#define FW_PS_RF_ON             BIT(2)
+#define FW_PS_REGISTER_ACTIVE   BIT(3)
+
+#define FW_PS_ACK               BIT(6)
+#define FW_PS_TOGGLE            BIT(7)
+
+ /* 92E RPWM value*/
+ /* BIT[0] = 1: 32k, 0: 40M*/
+#define FW_PS_CLOCK_OFF         BIT(0)          /* 32k */
+#define FW_PS_CLOCK_ON          0               /* 40M */
+
+#define FW_PS_STATE_MASK                (0x0F)
+#define FW_PS_STATE_HW_MASK             (0x07)
+#define FW_PS_STATE_INT_MASK            (0x3F)
+
+#define FW_PS_STATE(x)                  (FW_PS_STATE_MASK & (x))
+
+#define FW_PS_STATE_ALL_ON_92E          (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_RF_ON_92E           (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_RF_OFF_92E          (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_RF_OFF_LOW_PWR      (FW_PS_CLOCK_OFF)
+
+/* For 92E H2C PwrMode Cmd ID 5.*/
+#define FW_PWR_STATE_ACTIVE     ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
+#define FW_PWR_STATE_RF_OFF     0
+
+#define FW_PS_IS_ACK(x)         ((x) & FW_PS_ACK)
+
+#define IS_IN_LOW_POWER_STATE_92E(__state)              \
+        (FW_PS_STATE(__state) == FW_PS_CLOCK_OFF)
+
+#define FW_PWR_STATE_ACTIVE     ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
+#define FW_PWR_STATE_RF_OFF     0
+
+struct rtl92c_firmware_header {
+        u16 signature;
+        u8 category;
+        u8 function;
+        u16 version;
+        u8 subversion;
+        u8 rsvd1;
+        u8 month;
+        u8 date;
+        u8 hour;
+        u8 minute;
+        u16 ramcodesize;
+        u16 rsvd2;
+        u32 svnindex;
+        u32 rsvd3;
+        u32 rsvd4;
+        u32 rsvd5;
+};
+
+enum rtl8192e_h2c_cmd {
+        H2C_92E_RSVDPAGE = 0,
+        H2C_92E_MSRRPT = 1,
+        H2C_92E_SCAN = 2,
+        H2C_92E_KEEP_ALIVE_CTRL = 3,
+        H2C_92E_DISCONNECT_DECISION = 4,
+#if (USE_OLD_WOWLAN_DEBUG_FW == 1)
+        H2C_92E_WO_WLAN = 5,
+#endif
+        H2C_92E_INIT_OFFLOAD = 6,
+#if (USE_OLD_WOWLAN_DEBUG_FW == 1)
+        H2C_92E_REMOTE_WAKE_CTRL = 7,
+#endif
+        H2C_92E_AP_OFFLOAD = 8,
+        H2C_92E_BCN_RSVDPAGE = 9,
+        H2C_92E_PROBERSP_RSVDPAGE = 10,
+
+        H2C_92E_SETPWRMODE = 0x20,
+        H2C_92E_PS_TUNING_PARA = 0x21,
+        H2C_92E_PS_TUNING_PARA2 = 0x22,
+        H2C_92E_PS_LPS_PARA = 0x23,
+        H2C_92E_P2P_PS_OFFLOAD = 024,
+
+#if (USE_OLD_WOWLAN_DEBUG_FW == 0)
+        H2C_92E_WO_WLAN = 0x80,
+        H2C_92E_REMOTE_WAKE_CTRL = 0x81,
+        H2C_92E_AOAC_GLOBAL_INFO = 0x82,
+        H2C_92E_AOAC_RSVDPAGE = 0x83,
+#endif
+        H2C_92E_RA_MASK = 0x40,
+        H2C_92E_RSSI_REPORT = 0x42,
+        H2C_92E_SELECTIVE_SUSPEND_ROF_CMD,
+        H2C_92E_P2P_PS_MODE,
+        H2C_92E_PSD_RESULT,
+        /*Not defined CTW CMD for P2P yet*/
+        H2C_92E_P2P_PS_CTW_CMD,
+        MAX_92E_H2CCMD
+};
+
+enum rtl8192e_c2h_evt {
+        C2H_8192E_DBG = 0,
+        C2H_8192E_LB = 1,
+        C2H_8192E_TXBF = 2,
+        C2H_8192E_TX_REPORT = 3,
+        C2H_8192E_BT_INFO = 9,
+        C2H_8192E_BT_MP = 11,
+        C2H_8192E_RA_RPT = 12,
+        MAX_8192E_C2HEVENT
+};
+
+#define pagenum_128(_len)       \
+        (u32)(((_len) >> 7) + ((_len) & 0x7F ? 1 : 0))
+
+#define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val)                  \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_PWRMODE_PARM_RLBM(__cmd, __val)                      \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 4, __val)
+#define SET_H2CCMD_PWRMODE_PARM_SMART_PS(__cmd, __val)          \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 4, 4, __val)
+#define SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(__cmd, __val)    \
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __val)
+#define SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(__cmd, __val)   \
+        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __val)
+#define SET_H2CCMD_PWRMODE_PARM_PWR_STATE(__cmd, __val)         \
+        SET_BITS_TO_LE_1BYTE((__cmd)+4, 0, 8, __val)
+#define GET_92E_H2CCMD_PWRMODE_PARM_MODE(__cmd)                 \
+        LE_BITS_TO_1BYTE(__cmd, 0, 8)
+
+#define SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(__ph2ccmd, __val)             \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(__ph2ccmd, __val)             \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(__ph2ccmd, __val)                \
+        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val)             \
+        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
+
+/* _MEDIA_STATUS_RPT_PARM_CMD1 */
+#define SET_H2CCMD_MSRRPT_PARM_OPMODE(__cmd, __val)             \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __val)
+#define SET_H2CCMD_MSRRPT_PARM_MACID_IND(__cmd, __val)          \
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __val)
+#define SET_H2CCMD_MSRRPT_PARM_MACID(__cmd, __val)              \
+        SET_BITS_TO_LE_1BYTE(__cmd+1, 0, 8, __val)
+#define SET_H2CCMD_MSRRPT_PARM_MACID_END(__cmd, __val)          \
+        SET_BITS_TO_LE_1BYTE(__cmd+2, 0, 8, __val)
+
+int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw);
+void rtl92ee_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
+                          u32 cmd_len, u8 *cmdbuffer);
+void rtl92ee_firmware_selfreset(struct ieee80211_hw *hw);
+void rtl92ee_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
+void rtl92ee_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw, u8 mstatus);
+void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
+void rtl92ee_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
+void rtl92ee_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
new file mode 100644
index 000000000000..dfdc9b20e4ad
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
@@ -0,0 +1,2569 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../efuse.h"
+#include "../base.h"
+#include "../regd.h"
+#include "../cam.h"
+#include "../ps.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "fw.h"
+#include "led.h"
+#include "hw.h"
+#include "../pwrseqcmd.h"
+#include "pwrseq.h"
+
+#define LLT_CONFIG      5
+
+static void _rtl92ee_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
+                                      u8 set_bits, u8 clear_bits)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpci->reg_bcn_ctrl_val |= set_bits;
+        rtlpci->reg_bcn_ctrl_val &= ~clear_bits;
+
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8)rtlpci->reg_bcn_ctrl_val);
+}
+
+static void _rtl92ee_stop_tx_beacon(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp;
+
+        tmp = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp & (~BIT(6)));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0x64);
+        tmp = rtl_read_byte(rtlpriv, REG_TBTT_PROHIBIT + 2);
+        tmp &= ~(BIT(0));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 2, tmp);
+}
+
+static void _rtl92ee_resume_tx_beacon(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp;
+
+        tmp = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp | BIT(6));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0xff);
+        tmp = rtl_read_byte(rtlpriv, REG_TBTT_PROHIBIT + 2);
+        tmp |= BIT(0);
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 2, tmp);
+}
+
+static void _rtl92ee_enable_bcn_sub_func(struct ieee80211_hw *hw)
+{
+        _rtl92ee_set_bcn_ctrl_reg(hw, 0, BIT(1));
+}
+
+static void _rtl92ee_return_beacon_queue_skb(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE];
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
+        while (skb_queue_len(&ring->queue)) {
+                struct rtl_tx_buffer_desc *entry =
+                                                &ring->buffer_desc[ring->idx];
+                struct sk_buff *skb = __skb_dequeue(&ring->queue);
+
+                pci_unmap_single(rtlpci->pdev,
+                                 rtlpriv->cfg->ops->get_desc(
+                                 (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
+                                 skb->len, PCI_DMA_TODEVICE);
+                kfree_skb(skb);
+                ring->idx = (ring->idx + 1) % ring->entries;
+        }
+        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
+}
+
+static void _rtl92ee_disable_bcn_sub_func(struct ieee80211_hw *hw)
+{
+        _rtl92ee_set_bcn_ctrl_reg(hw, BIT(1), 0);
+}
+
+static void _rtl92ee_set_fw_clock_on(struct ieee80211_hw *hw,
+                                     u8 rpwm_val, bool b_need_turn_off_ckk)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool b_support_remote_wake_up;
+        u32 count = 0, isr_regaddr, content;
+        bool b_schedule_timer = b_need_turn_off_ckk;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
+                                      (u8 *)(&b_support_remote_wake_up));
+
+        if (!rtlhal->fw_ready)
+                return;
+        if (!rtlpriv->psc.fw_current_inpsmode)
+                return;
+
+        while (1) {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (rtlhal->fw_clk_change_in_progress) {
+                        while (rtlhal->fw_clk_change_in_progress) {
+                                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                                count++;
+                                udelay(100);
+                                if (count > 1000)
+                                        return;
+                                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                        }
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                } else {
+                        rtlhal->fw_clk_change_in_progress = false;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                        break;
+                }
+        }
+
+        if (IS_IN_LOW_POWER_STATE_92E(rtlhal->fw_ps_state)) {
+                rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM,
+                                              (u8 *)(&rpwm_val));
+                if (FW_PS_IS_ACK(rpwm_val)) {
+                        isr_regaddr = REG_HISR;
+                        content = rtl_read_dword(rtlpriv, isr_regaddr);
+                        while (!(content & IMR_CPWM) && (count < 500)) {
+                                udelay(50);
+                                count++;
+                                content = rtl_read_dword(rtlpriv, isr_regaddr);
+                        }
+
+                        if (content & IMR_CPWM) {
+                                rtl_write_word(rtlpriv, isr_regaddr, 0x0100);
+                                rtlhal->fw_ps_state = FW_PS_STATE_RF_ON_92E;
+                                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                         "Receive CPWM INT!!! PSState = %X\n",
+                                         rtlhal->fw_ps_state);
+                        }
+                }
+
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                rtlhal->fw_clk_change_in_progress = false;
+                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (b_schedule_timer) {
+                        mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                                  jiffies + MSECS(10));
+                }
+        } else  {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                rtlhal->fw_clk_change_in_progress = false;
+                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+        }
+}
+
+static void _rtl92ee_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring;
+        enum rf_pwrstate rtstate;
+        bool b_schedule_timer = false;
+        u8 queue;
+
+        if (!rtlhal->fw_ready)
+                return;
+        if (!rtlpriv->psc.fw_current_inpsmode)
+                return;
+        if (!rtlhal->allow_sw_to_change_hwclc)
+                return;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE, (u8 *)(&rtstate));
+        if (rtstate == ERFOFF || rtlpriv->psc.inactive_pwrstate == ERFOFF)
+                return;
+
+        for (queue = 0; queue < RTL_PCI_MAX_TX_QUEUE_COUNT; queue++) {
+                ring = &rtlpci->tx_ring[queue];
+                if (skb_queue_len(&ring->queue)) {
+                        b_schedule_timer = true;
+                        break;
+                }
+        }
+
+        if (b_schedule_timer) {
+                mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                          jiffies + MSECS(10));
+                return;
+        }
+
+        if (FW_PS_STATE(rtlhal->fw_ps_state) != FW_PS_STATE_RF_OFF_LOW_PWR) {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (!rtlhal->fw_clk_change_in_progress) {
+                        rtlhal->fw_clk_change_in_progress = true;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                        rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val);
+                        rtl_write_word(rtlpriv, REG_HISR, 0x0100);
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                                      (u8 *)(&rpwm_val));
+                        spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                        rtlhal->fw_clk_change_in_progress = false;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                } else {
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                        mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                                  jiffies + MSECS(10));
+                }
+        }
+}
+
+static void _rtl92ee_set_fw_ps_rf_on(struct ieee80211_hw *hw)
+{
+        u8 rpwm_val = 0;
+
+        rpwm_val |= (FW_PS_STATE_RF_OFF_92E | FW_PS_ACK);
+        _rtl92ee_set_fw_clock_on(hw, rpwm_val, true);
+}
+
+static void _rtl92ee_set_fw_ps_rf_off_low_power(struct ieee80211_hw *hw)
+{
+        u8 rpwm_val = 0;
+
+        rpwm_val |= FW_PS_STATE_RF_OFF_LOW_PWR;
+        _rtl92ee_set_fw_clock_off(hw, rpwm_val);
+}
+
+void rtl92ee_fw_clk_off_timer_callback(unsigned long data)
+{
+        struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
+
+        _rtl92ee_set_fw_ps_rf_off_low_power(hw);
+}
+
+static void _rtl92ee_fwlps_leave(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool fw_current_inps = false;
+        u8 rpwm_val = 0, fw_pwrmode = FW_PS_ACTIVE_MODE;
+
+        if (ppsc->low_power_enable) {
+                rpwm_val = (FW_PS_STATE_ALL_ON_92E | FW_PS_ACK);/* RF on */
+                _rtl92ee_set_fw_clock_on(hw, rpwm_val, false);
+                rtlhal->allow_sw_to_change_hwclc = false;
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                              (u8 *)(&fw_pwrmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                              (u8 *)(&fw_current_inps));
+        } else {
+                rpwm_val = FW_PS_STATE_ALL_ON_92E;      /* RF on */
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                              (u8 *)(&rpwm_val));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                              (u8 *)(&fw_pwrmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                              (u8 *)(&fw_current_inps));
+        }
+}
+
+static void _rtl92ee_fwlps_enter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool fw_current_inps = true;
+        u8 rpwm_val;
+
+        if (ppsc->low_power_enable) {
+                rpwm_val = FW_PS_STATE_RF_OFF_LOW_PWR;  /* RF off */
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                              (u8 *)(&fw_current_inps));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                              (u8 *)(&ppsc->fwctrl_psmode));
+                rtlhal->allow_sw_to_change_hwclc = true;
+                _rtl92ee_set_fw_clock_off(hw, rpwm_val);
+        } else {
+                rpwm_val = FW_PS_STATE_RF_OFF_92E;      /* RF off */
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                              (u8 *)(&fw_current_inps));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                              (u8 *)(&ppsc->fwctrl_psmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                              (u8 *)(&rpwm_val));
+        }
+}
+
+void rtl92ee_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        switch (variable) {
+        case HW_VAR_RCR:
+                *((u32 *)(val)) = rtlpci->receive_config;
+                break;
+        case HW_VAR_RF_STATE:
+                *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
+                break;
+        case HW_VAR_FWLPS_RF_ON:{
+                        enum rf_pwrstate rfstate;
+                        u32 val_rcr;
+
+                        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE,
+                                                      (u8 *)(&rfstate));
+                        if (rfstate == ERFOFF) {
+                                *((bool *)(val)) = true;
+                        } else {
+                                val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
+                                val_rcr &= 0x00070000;
+                                if (val_rcr)
+                                        *((bool *)(val)) = false;
+                                else
+                                        *((bool *)(val)) = true;
+                        }
+                }
+                break;
+        case HW_VAR_FW_PSMODE_STATUS:
+                *((bool *)(val)) = ppsc->fw_current_inpsmode;
+                break;
+        case HW_VAR_CORRECT_TSF:{
+                u64 tsf;
+                u32 *ptsf_low = (u32 *)&tsf;
+                u32 *ptsf_high = ((u32 *)&tsf) + 1;
+
+                *ptsf_high = rtl_read_dword(rtlpriv, (REG_TSFTR + 4));
+                *ptsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                *((u64 *)(val)) = tsf;
+                }
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process %x\n", variable);
+                break;
+        }
+}
+
+static void _rtl92ee_download_rsvd_page(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp_regcr, tmp_reg422;
+        u8 bcnvalid_reg, txbc_reg;
+        u8 count = 0, dlbcn_count = 0;
+        bool b_recover = false;
+
+        /*Set REG_CR bit 8. DMA beacon by SW.*/
+        tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
+        rtl_write_byte(rtlpriv, REG_CR + 1, tmp_regcr | BIT(0));
+
+        /* Disable Hw protection for a time which revserd for Hw sending beacon.
+         * Fix download reserved page packet fail
+         * that access collision with the protection time.
+         * 2010.05.11. Added by tynli.
+         */
+        _rtl92ee_set_bcn_ctrl_reg(hw, 0, BIT(3));
+        _rtl92ee_set_bcn_ctrl_reg(hw, BIT(4), 0);
+
+        /* Set FWHW_TXQ_CTRL 0x422[6]=0 to
+         * tell Hw the packet is not a real beacon frame.
+         */
+        tmp_reg422 = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp_reg422 & (~BIT(6)));
+
+        if (tmp_reg422 & BIT(6))
+                b_recover = true;
+
+        do {
+                /* Clear beacon valid check bit */
+                bcnvalid_reg = rtl_read_byte(rtlpriv, REG_DWBCN0_CTRL + 2);
+                rtl_write_byte(rtlpriv, REG_DWBCN0_CTRL + 2,
+                               bcnvalid_reg | BIT(0));
+
+                /* Return Beacon TCB */
+                _rtl92ee_return_beacon_queue_skb(hw);
+
+                /* download rsvd page */
+                rtl92ee_set_fw_rsvdpagepkt(hw, false);
+
+                txbc_reg = rtl_read_byte(rtlpriv, REG_MGQ_TXBD_NUM + 3);
+                count = 0;
+                while ((txbc_reg & BIT(4)) && count < 20) {
+                        count++;
+                        udelay(10);
+                        txbc_reg = rtl_read_byte(rtlpriv, REG_MGQ_TXBD_NUM + 3);
+                }
+                rtl_write_byte(rtlpriv, REG_MGQ_TXBD_NUM + 3,
+                               txbc_reg | BIT(4));
+
+                /* check rsvd page download OK. */
+                bcnvalid_reg = rtl_read_byte(rtlpriv, REG_DWBCN0_CTRL + 2);
+                count = 0;
+                while (!(bcnvalid_reg & BIT(0)) && count < 20) {
+                        count++;
+                        udelay(50);
+                        bcnvalid_reg = rtl_read_byte(rtlpriv,
+                                                     REG_DWBCN0_CTRL + 2);
+                }
+
+                if (bcnvalid_reg & BIT(0))
+                        rtl_write_byte(rtlpriv, REG_DWBCN0_CTRL + 2, BIT(0));
+
+                dlbcn_count++;
+        } while (!(bcnvalid_reg & BIT(0)) && dlbcn_count < 5);
+
+        if (!(bcnvalid_reg & BIT(0)))
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Download RSVD page failed!\n");
+
+        /* Enable Bcn */
+        _rtl92ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
+        _rtl92ee_set_bcn_ctrl_reg(hw, 0, BIT(4));
+
+        if (b_recover)
+                rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp_reg422);
+
+        tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
+        rtl_write_byte(rtlpriv, REG_CR + 1, tmp_regcr & (~BIT(0)));
+}
+
+void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *efuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 idx;
+
+        switch (variable) {
+        case HW_VAR_ETHER_ADDR:
+                for (idx = 0; idx < ETH_ALEN; idx++)
+                        rtl_write_byte(rtlpriv, (REG_MACID + idx), val[idx]);
+                break;
+        case HW_VAR_BASIC_RATE:{
+                u16 b_rate_cfg = ((u16 *)val)[0];
+
+                b_rate_cfg = b_rate_cfg & 0x15f;
+                b_rate_cfg |= 0x01;
+                b_rate_cfg = (b_rate_cfg | 0xd) & (~BIT(1));
+                rtl_write_byte(rtlpriv, REG_RRSR, b_rate_cfg & 0xff);
+                rtl_write_byte(rtlpriv, REG_RRSR + 1, (b_rate_cfg >> 8) & 0xff);
+                break; }
+        case HW_VAR_BSSID:
+                for (idx = 0; idx < ETH_ALEN; idx++)
+                        rtl_write_byte(rtlpriv, (REG_BSSID + idx), val[idx]);
+                break;
+        case HW_VAR_SIFS:
+                rtl_write_byte(rtlpriv, REG_SIFS_CTX + 1, val[0]);
+                rtl_write_byte(rtlpriv, REG_SIFS_TRX + 1, val[1]);
+
+                rtl_write_byte(rtlpriv, REG_SPEC_SIFS + 1, val[0]);
+                rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
+
+                if (!mac->ht_enable)
+                        rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM, 0x0e0e);
+                else
+                        rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
+                                       *((u16 *)val));
+                break;
+        case HW_VAR_SLOT_TIME:{
+                u8 e_aci;
+
+                RT_TRACE(rtlpriv, COMP_MLME, DBG_TRACE,
+                         "HW_VAR_SLOT_TIME %x\n", val[0]);
+
+                rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
+
+                for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
+                                                      (u8 *)(&e_aci));
+                }
+                break; }
+        case HW_VAR_ACK_PREAMBLE:{
+                u8 reg_tmp;
+                u8 short_preamble = (bool)(*(u8 *)val);
+
+                reg_tmp = (rtlpriv->mac80211.cur_40_prime_sc) << 5;
+                if (short_preamble)
+                        reg_tmp |= 0x80;
+                rtl_write_byte(rtlpriv, REG_RRSR + 2, reg_tmp);
+                rtlpriv->mac80211.short_preamble = short_preamble;
+                }
+                break;
+        case HW_VAR_WPA_CONFIG:
+                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val));
+                break;
+        case HW_VAR_AMPDU_FACTOR:{
+                u8 regtoset_normal[4] = { 0x41, 0xa8, 0x72, 0xb9 };
+                u8 fac;
+                u8 *reg = NULL;
+                u8 i = 0;
+
+                reg = regtoset_normal;
+
+                fac = *((u8 *)val);
+                if (fac <= 3) {
+                        fac = (1 << (fac + 2));
+                        if (fac > 0xf)
+                                fac = 0xf;
+                        for (i = 0; i < 4; i++) {
+                                if ((reg[i] & 0xf0) > (fac << 4))
+                                        reg[i] = (reg[i] & 0x0f) |
+                                                (fac << 4);
+                                if ((reg[i] & 0x0f) > fac)
+                                        reg[i] = (reg[i] & 0xf0) | fac;
+                                rtl_write_byte(rtlpriv,
+                                               (REG_AGGLEN_LMT + i),
+                                               reg[i]);
+                        }
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                 "Set HW_VAR_AMPDU_FACTOR:%#x\n", fac);
+                }
+                }
+                break;
+        case HW_VAR_AC_PARAM:{
+                u8 e_aci = *((u8 *)val);
+
+                if (rtlpci->acm_method != EACMWAY2_SW)
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL,
+                                                      (u8 *)(&e_aci));
+                }
+                break;
+        case HW_VAR_ACM_CTRL:{
+                u8 e_aci = *((u8 *)val);
+                union aci_aifsn *aifs = (union aci_aifsn *)(&mac->ac[0].aifs);
+
+                u8 acm = aifs->f.acm;
+                u8 acm_ctrl = rtl_read_byte(rtlpriv, REG_ACMHWCTRL);
+
+                acm_ctrl = acm_ctrl | ((rtlpci->acm_method == 2) ? 0x0 : 0x1);
+
+                if (acm) {
+                        switch (e_aci) {
+                        case AC0_BE:
+                                acm_ctrl |= ACMHW_BEQEN;
+                                break;
+                        case AC2_VI:
+                                acm_ctrl |= ACMHW_VIQEN;
+                                break;
+                        case AC3_VO:
+                                acm_ctrl |= ACMHW_VOQEN;
+                                break;
+                        default:
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                         acm);
+                                break;
+                        }
+                } else {
+                        switch (e_aci) {
+                        case AC0_BE:
+                                acm_ctrl &= (~ACMHW_BEQEN);
+                                break;
+                        case AC2_VI:
+                                acm_ctrl &= (~ACMHW_VIQEN);
+                                break;
+                        case AC3_VO:
+                                acm_ctrl &= (~ACMHW_BEQEN);
+                                break;
+                        default:
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                         "switch case not process\n");
+                                break;
+                        }
+                }
+
+                RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
+                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                          acm_ctrl);
+                rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
+                }
+                break;
+        case HW_VAR_RCR:{
+                rtl_write_dword(rtlpriv, REG_RCR, ((u32 *)(val))[0]);
+                rtlpci->receive_config = ((u32 *)(val))[0];
+                }
+                break;
+        case HW_VAR_RETRY_LIMIT:{
+                u8 retry_limit = ((u8 *)(val))[0];
+
+                rtl_write_word(rtlpriv, REG_RETRY_LIMIT,
+                               retry_limit << RETRY_LIMIT_SHORT_SHIFT |
+                               retry_limit << RETRY_LIMIT_LONG_SHIFT);
+                }
+                break;
+        case HW_VAR_DUAL_TSF_RST:
+                rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, (BIT(0) | BIT(1)));
+                break;
+        case HW_VAR_EFUSE_BYTES:
+                efuse->efuse_usedbytes = *((u16 *)val);
+                break;
+        case HW_VAR_EFUSE_USAGE:
+                efuse->efuse_usedpercentage = *((u8 *)val);
+                break;
+        case HW_VAR_IO_CMD:
+                rtl92ee_phy_set_io_cmd(hw, (*(enum io_type *)val));
+                break;
+        case HW_VAR_SET_RPWM:{
+                u8 rpwm_val;
+
+                rpwm_val = rtl_read_byte(rtlpriv, REG_PCIE_HRPWM);
+                udelay(1);
+
+                if (rpwm_val & BIT(7)) {
+                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, (*(u8 *)val));
+                } else {
+                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
+                                       ((*(u8 *)val) | BIT(7)));
+                }
+                }
+                break;
+        case HW_VAR_H2C_FW_PWRMODE:
+                rtl92ee_set_fw_pwrmode_cmd(hw, (*(u8 *)val));
+                break;
+        case HW_VAR_FW_PSMODE_STATUS:
+                ppsc->fw_current_inpsmode = *((bool *)val);
+                break;
+        case HW_VAR_RESUME_CLK_ON:
+                _rtl92ee_set_fw_ps_rf_on(hw);
+                break;
+        case HW_VAR_FW_LPS_ACTION:{
+                bool b_enter_fwlps = *((bool *)val);
+
+                if (b_enter_fwlps)
+                        _rtl92ee_fwlps_enter(hw);
+                else
+                        _rtl92ee_fwlps_leave(hw);
+                }
+                break;
+        case HW_VAR_H2C_FW_JOINBSSRPT:{
+                u8 mstatus = (*(u8 *)val);
+
+                if (mstatus == RT_MEDIA_CONNECT) {
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID, NULL);
+                        _rtl92ee_download_rsvd_page(hw);
+                }
+                rtl92ee_set_fw_media_status_rpt_cmd(hw, mstatus);
+                }
+                break;
+        case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
+                rtl92ee_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));
+                break;
+        case HW_VAR_AID:{
+                u16 u2btmp;
+
+                u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
+                u2btmp &= 0xC000;
+                rtl_write_word(rtlpriv, REG_BCN_PSR_RPT,
+                               (u2btmp | mac->assoc_id));
+                }
+                break;
+        case HW_VAR_CORRECT_TSF:{
+                u8 btype_ibss = ((u8 *)(val))[0];
+
+                if (btype_ibss)
+                        _rtl92ee_stop_tx_beacon(hw);
+
+                _rtl92ee_set_bcn_ctrl_reg(hw, 0, BIT(3));
+
+                rtl_write_dword(rtlpriv, REG_TSFTR,
+                                (u32)(mac->tsf & 0xffffffff));
+                rtl_write_dword(rtlpriv, REG_TSFTR + 4,
+                                (u32)((mac->tsf >> 32) & 0xffffffff));
+
+                _rtl92ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
+
+                if (btype_ibss)
+                        _rtl92ee_resume_tx_beacon(hw);
+                }
+                break;
+        case HW_VAR_KEEP_ALIVE: {
+                u8 array[2];
+
+                array[0] = 0xff;
+                array[1] = *((u8 *)val);
+                rtl92ee_fill_h2c_cmd(hw, H2C_92E_KEEP_ALIVE_CTRL, 2, array);
+                }
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process %x\n", variable);
+                break;
+        }
+}
+
+static bool _rtl92ee_llt_table_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 txpktbuf_bndy;
+        u8 u8tmp, testcnt = 0;
+
+        txpktbuf_bndy = 0xFA;
+
+        rtl_write_dword(rtlpriv, REG_RQPN, 0x80E90808);
+
+        rtl_write_byte(rtlpriv, REG_TRXFF_BNDY, txpktbuf_bndy);
+        rtl_write_word(rtlpriv, REG_TRXFF_BNDY + 2, 0x3d00 - 1);
+
+        rtl_write_byte(rtlpriv, REG_DWBCN0_CTRL + 1, txpktbuf_bndy);
+        rtl_write_byte(rtlpriv, REG_DWBCN1_CTRL + 1, txpktbuf_bndy);
+
+        rtl_write_byte(rtlpriv, REG_BCNQ_BDNY, txpktbuf_bndy);
+        rtl_write_byte(rtlpriv, REG_BCNQ1_BDNY, txpktbuf_bndy);
+
+        rtl_write_byte(rtlpriv, REG_MGQ_BDNY, txpktbuf_bndy);
+        rtl_write_byte(rtlpriv, 0x45D, txpktbuf_bndy);
+
+        rtl_write_byte(rtlpriv, REG_PBP, 0x31);
+        rtl_write_byte(rtlpriv, REG_RX_DRVINFO_SZ, 0x4);
+
+        u8tmp = rtl_read_byte(rtlpriv, REG_AUTO_LLT + 2);
+        rtl_write_byte(rtlpriv, REG_AUTO_LLT + 2, u8tmp | BIT(0));
+
+        while (u8tmp & BIT(0)) {
+                u8tmp = rtl_read_byte(rtlpriv, REG_AUTO_LLT + 2);
+                udelay(10);
+                testcnt++;
+                if (testcnt > 10)
+                        break;
+        }
+
+        return true;
+}
+
+static void _rtl92ee_gen_refresh_led_state(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_led *pled0 = &pcipriv->ledctl.sw_led0;
+
+        if (rtlpriv->rtlhal.up_first_time)
+                return;
+
+        if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS)
+                rtl92ee_sw_led_on(hw, pled0);
+        else if (ppsc->rfoff_reason == RF_CHANGE_BY_INIT)
+                rtl92ee_sw_led_on(hw, pled0);
+        else
+                rtl92ee_sw_led_off(hw, pled0);
+}
+
+static bool _rtl92ee_init_mac(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        u8 bytetmp;
+        u16 wordtmp;
+        u32 dwordtmp;
+
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x0);
+
+        dwordtmp = rtl_read_dword(rtlpriv, REG_SYS_CFG1);
+        if (dwordtmp & BIT(24)) {
+                rtl_write_byte(rtlpriv, 0x7c, 0xc3);
+        } else {
+                bytetmp = rtl_read_byte(rtlpriv, 0x16);
+                rtl_write_byte(rtlpriv, 0x16, bytetmp | BIT(4) | BIT(6));
+                rtl_write_byte(rtlpriv, 0x7c, 0x83);
+        }
+        /* 1. 40Mhz crystal source*/
+        bytetmp = rtl_read_byte(rtlpriv, REG_AFE_CTRL2);
+        bytetmp &= 0xfb;
+        rtl_write_byte(rtlpriv, REG_AFE_CTRL2, bytetmp);
+
+        dwordtmp = rtl_read_dword(rtlpriv, REG_AFE_CTRL4);
+        dwordtmp &= 0xfffffc7f;
+        rtl_write_dword(rtlpriv, REG_AFE_CTRL4, dwordtmp);
+
+        /* 2. 92E AFE parameter
+         * MP chip then check version
+         */
+        bytetmp = rtl_read_byte(rtlpriv, REG_AFE_CTRL2);
+        bytetmp &= 0xbf;
+        rtl_write_byte(rtlpriv, REG_AFE_CTRL2, bytetmp);
+
+        dwordtmp = rtl_read_dword(rtlpriv, REG_AFE_CTRL4);
+        dwordtmp &= 0xffdfffff;
+        rtl_write_dword(rtlpriv, REG_AFE_CTRL4, dwordtmp);
+
+        /* HW Power on sequence */
+        if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                                      PWR_INTF_PCI_MSK,
+                                      RTL8192E_NIC_ENABLE_FLOW)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "init MAC Fail as rtl_hal_pwrseqcmdparsing\n");
+                return false;
+        }
+
+        /* Release MAC IO register reset */
+        bytetmp = rtl_read_byte(rtlpriv, REG_CR);
+        bytetmp = 0xff;
+        rtl_write_byte(rtlpriv, REG_CR, bytetmp);
+        mdelay(2);
+        bytetmp = 0x7f;
+        rtl_write_byte(rtlpriv, REG_HWSEQ_CTRL, bytetmp);
+        mdelay(2);
+
+        /* Add for wakeup online */
+        bytetmp = rtl_read_byte(rtlpriv, REG_SYS_CLKR);
+        rtl_write_byte(rtlpriv, REG_SYS_CLKR, bytetmp | BIT(3));
+        bytetmp = rtl_read_byte(rtlpriv, REG_GPIO_MUXCFG + 1);
+        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG + 1, bytetmp & (~BIT(4)));
+        /* Release MAC IO register reset */
+        rtl_write_word(rtlpriv, REG_CR, 0x2ff);
+
+        if (!rtlhal->mac_func_enable) {
+                if (_rtl92ee_llt_table_init(hw) == false) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "LLT table init fail\n");
+                        return false;
+                }
+        }
+
+        rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff);
+        rtl_write_dword(rtlpriv, REG_HISRE, 0xffffffff);
+
+        wordtmp = rtl_read_word(rtlpriv, REG_TRXDMA_CTRL);
+        wordtmp &= 0xf;
+        wordtmp |= 0xF5B1;
+        rtl_write_word(rtlpriv, REG_TRXDMA_CTRL, wordtmp);
+        /* Reported Tx status from HW for rate adaptive.*/
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 1, 0x1F);
+
+        /* Set RCR register */
+        rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
+        rtl_write_word(rtlpriv, REG_RXFLTMAP2, 0xffff);
+
+        /* Set TCR register */
+        rtl_write_dword(rtlpriv, REG_TCR, rtlpci->transmit_config);
+
+        /* Set TX/RX descriptor physical address(from OS API). */
+        rtl_write_dword(rtlpriv, REG_BCNQ_DESA,
+                        ((u64)rtlpci->tx_ring[BEACON_QUEUE].buffer_desc_dma) &
+                        DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_MGQ_DESA,
+                        (u64)rtlpci->tx_ring[MGNT_QUEUE].buffer_desc_dma &
+                        DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_VOQ_DESA,
+                        (u64)rtlpci->tx_ring[VO_QUEUE].buffer_desc_dma &
+                        DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_VIQ_DESA,
+                        (u64)rtlpci->tx_ring[VI_QUEUE].buffer_desc_dma &
+                        DMA_BIT_MASK(32));
+
+        rtl_write_dword(rtlpriv, REG_BEQ_DESA,
+                        (u64)rtlpci->tx_ring[BE_QUEUE].buffer_desc_dma &
+                        DMA_BIT_MASK(32));
+
+        dwordtmp = rtl_read_dword(rtlpriv, REG_BEQ_DESA);
+
+        rtl_write_dword(rtlpriv, REG_BKQ_DESA,
+                        (u64)rtlpci->tx_ring[BK_QUEUE].buffer_desc_dma &
+                        DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_HQ0_DESA,
+                        (u64)rtlpci->tx_ring[HIGH_QUEUE].buffer_desc_dma &
+                        DMA_BIT_MASK(32));
+
+        rtl_write_dword(rtlpriv, REG_RX_DESA,
+                        (u64)rtlpci->rx_ring[RX_MPDU_QUEUE].dma &
+                        DMA_BIT_MASK(32));
+
+        /* if we want to support 64 bit DMA, we should set it here,
+         * but now we do not support 64 bit DMA
+         */
+
+        rtl_write_dword(rtlpriv, REG_TSFTIMER_HCI, 0x3fffffff);
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG + 3);
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 3, bytetmp | 0xF7);
+
+        rtl_write_dword(rtlpriv, REG_INT_MIG, 0);
+
+        rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0);
+
+        rtl_write_word(rtlpriv, REG_MGQ_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_VOQ_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_VIQ_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_BEQ_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_VOQ_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_BKQ_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_HI0Q_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_HI1Q_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_HI2Q_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_HI3Q_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_HI4Q_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_HI5Q_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_HI6Q_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        rtl_write_word(rtlpriv, REG_HI7Q_TXBD_NUM,
+                       TX_DESC_NUM_92E | ((RTL8192EE_SEG_NUM << 12) & 0x3000));
+        /*Rx*/
+#if (DMA_IS_64BIT == 1)
+        rtl_write_word(rtlpriv, REG_RX_RXBD_NUM,
+                       RX_DESC_NUM_92E |
+                       ((RTL8192EE_SEG_NUM << 13) & 0x6000) | 0x8000);
+#else
+        rtl_write_word(rtlpriv, REG_RX_RXBD_NUM,
+                       RX_DESC_NUM_92E |
+                       ((RTL8192EE_SEG_NUM << 13) & 0x6000) | 0x0000);
+#endif
+
+        rtl_write_dword(rtlpriv, REG_TSFTIMER_HCI, 0XFFFFFFFF);
+
+        _rtl92ee_gen_refresh_led_state(hw);
+        return true;
+}
+
+static void _rtl92ee_hw_configure(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 reg_rrsr;
+
+        reg_rrsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+        /* Init value for RRSR. */
+        rtl_write_dword(rtlpriv, REG_RRSR, reg_rrsr);
+
+        /* ARFB table 9 for 11ac 5G 2SS */
+        rtl_write_dword(rtlpriv, REG_ARFR0, 0x00000010);
+        rtl_write_dword(rtlpriv, REG_ARFR0 + 4, 0x3e0ff000);
+
+        /* ARFB table 10 for 11ac 5G 1SS */
+        rtl_write_dword(rtlpriv, REG_ARFR1, 0x00000010);
+        rtl_write_dword(rtlpriv, REG_ARFR1 + 4, 0x000ff000);
+
+        /* Set SLOT time */
+        rtl_write_byte(rtlpriv, REG_SLOT, 0x09);
+
+        /* CF-End setting. */
+        rtl_write_word(rtlpriv, REG_FWHW_TXQ_CTRL, 0x1F80);
+
+        /* Set retry limit */
+        rtl_write_word(rtlpriv, REG_RETRY_LIMIT, 0x0707);
+
+        /* BAR settings */
+        rtl_write_dword(rtlpriv, REG_BAR_MODE_CTRL, 0x0201ffff);
+
+        /* Set Data / Response auto rate fallack retry count */
+        rtl_write_dword(rtlpriv, REG_DARFRC, 0x01000000);
+        rtl_write_dword(rtlpriv, REG_DARFRC + 4, 0x07060504);
+        rtl_write_dword(rtlpriv, REG_RARFRC, 0x01000000);
+        rtl_write_dword(rtlpriv, REG_RARFRC + 4, 0x07060504);
+
+        /* Beacon related, for rate adaptive */
+        rtl_write_byte(rtlpriv, REG_ATIMWND, 0x2);
+        rtl_write_byte(rtlpriv, REG_BCN_MAX_ERR, 0xff);
+
+        rtlpci->reg_bcn_ctrl_val = 0x1d;
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, rtlpci->reg_bcn_ctrl_val);
+
+        /* Marked out by Bruce, 2010-09-09.
+         * This register is configured for the 2nd Beacon (multiple BSSID).
+         * We shall disable this register if we only support 1 BSSID.
+         * vivi guess 92d also need this, also 92d now doesnot set this reg
+         */
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL_1, 0);
+
+        /* TBTT prohibit hold time. Suggested by designer TimChen. */
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0xff); /* 8 ms */
+
+        rtl_write_byte(rtlpriv, REG_PIFS, 0);
+        rtl_write_byte(rtlpriv, REG_AGGR_BREAK_TIME, 0x16);
+
+        rtl_write_word(rtlpriv, REG_NAV_PROT_LEN, 0x0040);
+        rtl_write_word(rtlpriv, REG_PROT_MODE_CTRL, 0x08ff);
+
+        /* For Rx TP. Suggested by SD1 Richard. Added by tynli. 2010.04.12.*/
+        rtl_write_dword(rtlpriv, REG_FAST_EDCA_CTRL, 0x03086666);
+
+        /* ACKTO for IOT issue. */
+        rtl_write_byte(rtlpriv, REG_ACKTO, 0x40);
+
+        /* Set Spec SIFS (used in NAV) */
+        rtl_write_word(rtlpriv, REG_SPEC_SIFS, 0x100a);
+        rtl_write_word(rtlpriv, REG_MAC_SPEC_SIFS, 0x100a);
+
+        /* Set SIFS for CCK */
+        rtl_write_word(rtlpriv, REG_SIFS_CTX, 0x100a);
+
+        /* Set SIFS for OFDM */
+        rtl_write_word(rtlpriv, REG_SIFS_TRX, 0x100a);
+
+        /* Note Data sheet don't define */
+        rtl_write_word(rtlpriv, 0x4C7, 0x80);
+
+        rtl_write_byte(rtlpriv, REG_RX_PKT_LIMIT, 0x20);
+
+        rtl_write_word(rtlpriv, REG_MAX_AGGR_NUM, 0x1717);
+
+        /* Set Multicast Address. 2009.01.07. by tynli. */
+        rtl_write_dword(rtlpriv, REG_MAR, 0xffffffff);
+        rtl_write_dword(rtlpriv, REG_MAR + 4, 0xffffffff);
+}
+
+static void _rtl92ee_enable_aspm_back_door(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u32 tmp32 = 0, count = 0;
+        u8 tmp8 = 0;
+
+        rtl_write_word(rtlpriv, REG_BACKDOOR_DBI_DATA, 0x78);
+        rtl_write_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2, 0x2);
+        tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+        count = 0;
+        while (tmp8 && count < 20) {
+                udelay(10);
+                tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+                count++;
+        }
+
+        if (0 == tmp8) {
+                tmp32 = rtl_read_dword(rtlpriv, REG_BACKDOOR_DBI_RDATA);
+                if ((tmp32 & 0xff00) != 0x2000) {
+                        tmp32 &= 0xffff00ff;
+                        rtl_write_dword(rtlpriv, REG_BACKDOOR_DBI_WDATA,
+                                        tmp32 | BIT(13));
+                        rtl_write_word(rtlpriv, REG_BACKDOOR_DBI_DATA, 0xf078);
+                        rtl_write_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2, 0x1);
+
+                        tmp8 = rtl_read_byte(rtlpriv,
+                                             REG_BACKDOOR_DBI_DATA + 2);
+                        count = 0;
+                        while (tmp8 && count < 20) {
+                                udelay(10);
+                                tmp8 = rtl_read_byte(rtlpriv,
+                                                     REG_BACKDOOR_DBI_DATA + 2);
+                                count++;
+                        }
+                }
+        }
+
+        rtl_write_word(rtlpriv, REG_BACKDOOR_DBI_DATA, 0x70c);
+        rtl_write_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2, 0x2);
+        tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+        count = 0;
+        while (tmp8 && count < 20) {
+                udelay(10);
+                tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+                count++;
+        }
+        if (0 == tmp8) {
+                tmp32 = rtl_read_dword(rtlpriv, REG_BACKDOOR_DBI_RDATA);
+                rtl_write_dword(rtlpriv, REG_BACKDOOR_DBI_WDATA,
+                                tmp32 | BIT(31));
+                rtl_write_word(rtlpriv, REG_BACKDOOR_DBI_DATA, 0xf70c);
+                rtl_write_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2, 0x1);
+        }
+
+        tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+        count = 0;
+        while (tmp8 && count < 20) {
+                udelay(10);
+                tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+                count++;
+        }
+
+        rtl_write_word(rtlpriv, REG_BACKDOOR_DBI_DATA, 0x718);
+        rtl_write_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2, 0x2);
+        tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+        count = 0;
+        while (tmp8 && count < 20) {
+                udelay(10);
+                tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+                count++;
+        }
+        if (ppsc->support_backdoor || (0 == tmp8)) {
+                tmp32 = rtl_read_dword(rtlpriv, REG_BACKDOOR_DBI_RDATA);
+                rtl_write_dword(rtlpriv, REG_BACKDOOR_DBI_WDATA,
+                                tmp32 | BIT(11) | BIT(12));
+                rtl_write_word(rtlpriv, REG_BACKDOOR_DBI_DATA, 0xf718);
+                rtl_write_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2, 0x1);
+        }
+        tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+        count = 0;
+        while (tmp8 && count < 20) {
+                udelay(10);
+                tmp8 = rtl_read_byte(rtlpriv, REG_BACKDOOR_DBI_DATA + 2);
+                count++;
+        }
+}
+
+void rtl92ee_enable_hw_security_config(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 sec_reg_value;
+        u8 tmp;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                  rtlpriv->sec.pairwise_enc_algorithm,
+                  rtlpriv->sec.group_enc_algorithm);
+
+        if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                         "not open hw encryption\n");
+                return;
+        }
+
+        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_RXBCUSEDK | SCR_TXBCUSEDK);
+
+        tmp = rtl_read_byte(rtlpriv, REG_CR + 1);
+        rtl_write_byte(rtlpriv, REG_CR + 1, tmp | BIT(1));
+
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                 "The SECR-value %x\n", sec_reg_value);
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
+}
+
+int rtl92ee_hw_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        bool rtstatus = true;
+        int err = 0;
+        u8 tmp_u1b, u1byte;
+        u32 tmp_u4b;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, " Rtl8192EE hw init\n");
+        rtlpriv->rtlhal.being_init_adapter = true;
+        rtlpriv->intf_ops->disable_aspm(hw);
+
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_SYS_CLKR+1);
+        u1byte = rtl_read_byte(rtlpriv, REG_CR);
+        if ((tmp_u1b & BIT(3)) && (u1byte != 0 && u1byte != 0xEA)) {
+                rtlhal->mac_func_enable = true;
+        } else {
+                rtlhal->mac_func_enable = false;
+                rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON_92E;
+        }
+
+        rtstatus = _rtl92ee_init_mac(hw);
+
+        rtl_write_byte(rtlpriv, 0x577, 0x03);
+
+        /*for Crystal 40 Mhz setting */
+        rtl_write_byte(rtlpriv, REG_AFE_CTRL4, 0x2A);
+        rtl_write_byte(rtlpriv, REG_AFE_CTRL4 + 1, 0x00);
+        rtl_write_byte(rtlpriv, REG_AFE_CTRL2, 0x83);
+
+        /*Forced the antenna b to wifi */
+        if (rtlpriv->btcoexist.btc_info.btcoexist == 1) {
+                rtl_write_byte(rtlpriv, 0x64, 0);
+                rtl_write_byte(rtlpriv, 0x65, 1);
+        }
+        if (!rtstatus) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
+                err = 1;
+                return err;
+        }
+        rtlhal->rx_tag = 0;
+        rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, 0x8000);
+        err = rtl92ee_download_fw(hw, false);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Failed to download FW. Init HW without FW now..\n");
+                err = 1;
+                rtlhal->fw_ready = false;
+                return err;
+        }
+        rtlhal->fw_ready = true;
+        /*fw related variable initialize */
+        ppsc->fw_current_inpsmode = false;
+        rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON_92E;
+        rtlhal->fw_clk_change_in_progress = false;
+        rtlhal->allow_sw_to_change_hwclc = false;
+        rtlhal->last_hmeboxnum = 0;
+
+        rtl92ee_phy_mac_config(hw);
+
+        rtl92ee_phy_bb_config(hw);
+
+        rtl92ee_phy_rf_config(hw);
+
+        rtlphy->rfreg_chnlval[0] = rtl_get_rfreg(hw, RF90_PATH_A,
+                                                 RF_CHNLBW, RFREG_OFFSET_MASK);
+        rtlphy->rfreg_chnlval[1] = rtl_get_rfreg(hw, RF90_PATH_B,
+                                                 RF_CHNLBW, RFREG_OFFSET_MASK);
+        rtlphy->backup_rf_0x1a = (u32)rtl_get_rfreg(hw, RF90_PATH_A, RF_RX_G1,
+                                                    RFREG_OFFSET_MASK);
+        rtlphy->rfreg_chnlval[0] = (rtlphy->rfreg_chnlval[0] & 0xfffff3ff) |
+                                   BIT(10) | BIT(11);
+
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, RFREG_OFFSET_MASK,
+                      rtlphy->rfreg_chnlval[0]);
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_CHNLBW, RFREG_OFFSET_MASK,
+                      rtlphy->rfreg_chnlval[0]);
+
+        /*---- Set CCK and OFDM Block "ON"----*/
+        rtl_set_bbreg(hw, RFPGA0_RFMOD, BCCKEN, 0x1);
+        rtl_set_bbreg(hw, RFPGA0_RFMOD, BOFDMEN, 0x1);
+
+        /* Must set this,
+         * otherwise the rx sensitivity will be very pool. Maddest
+         */
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xB1, RFREG_OFFSET_MASK, 0x54418);
+
+        /*Set Hardware(MAC default setting.)*/
+        _rtl92ee_hw_configure(hw);
+
+        rtlhal->mac_func_enable = true;
+
+        rtl_cam_reset_all_entry(hw);
+        rtl92ee_enable_hw_security_config(hw);
+
+        ppsc->rfpwr_state = ERFON;
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ETHER_ADDR, mac->mac_addr);
+        _rtl92ee_enable_aspm_back_door(hw);
+        rtlpriv->intf_ops->enable_aspm(hw);
+
+        rtl92ee_bt_hw_init(hw);
+
+        rtlpriv->rtlhal.being_init_adapter = false;
+
+        if (ppsc->rfpwr_state == ERFON) {
+                if (rtlphy->iqk_initialized) {
+                        rtl92ee_phy_iq_calibrate(hw, true);
+                } else {
+                        rtl92ee_phy_iq_calibrate(hw, false);
+                        rtlphy->iqk_initialized = true;
+                }
+        }
+
+        rtlphy->rfpath_rx_enable[0] = true;
+        if (rtlphy->rf_type == RF_2T2R)
+                rtlphy->rfpath_rx_enable[1] = true;
+
+        efuse_one_byte_read(hw, 0x1FA, &tmp_u1b);
+        if (!(tmp_u1b & BIT(0))) {
+                rtl_set_rfreg(hw, RF90_PATH_A, 0x15, 0x0F, 0x05);
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path A\n");
+        }
+
+        if ((!(tmp_u1b & BIT(1))) && (rtlphy->rf_type == RF_2T2R)) {
+                rtl_set_rfreg(hw, RF90_PATH_B, 0x15, 0x0F, 0x05);
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path B\n");
+        }
+
+        rtl_write_byte(rtlpriv, REG_NAV_UPPER, ((30000 + 127) / 128));
+
+        /*Fixed LDPC rx hang issue. */
+        tmp_u4b = rtl_read_dword(rtlpriv, REG_SYS_SWR_CTRL1);
+        rtl_write_byte(rtlpriv, REG_SYS_SWR_CTRL2, 0x75);
+        tmp_u4b =  (tmp_u4b & 0xfff00fff) | (0x7E << 12);
+        rtl_write_dword(rtlpriv, REG_SYS_SWR_CTRL1, tmp_u4b);
+
+        rtl92ee_dm_init(hw);
+
+        rtl_write_dword(rtlpriv, 0x4fc, 0);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "end of Rtl8192EE hw init %x\n", err);
+        return 0;
+}
+
+static enum version_8192e _rtl92ee_read_chip_version(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        enum version_8192e version = VERSION_UNKNOWN;
+        u32 value32;
+
+        rtlphy->rf_type = RF_2T2R;
+
+        value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG1);
+        if (value32 & TRP_VAUX_EN)
+                version = (enum version_8192e)VERSION_TEST_CHIP_2T2R_8192E;
+        else
+                version = (enum version_8192e)VERSION_NORMAL_CHIP_2T2R_8192E;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
+                  "RF_2T2R" : "RF_1T1R");
+
+        return version;
+}
+
+static int _rtl92ee_set_media_status(struct ieee80211_hw *hw,
+                                     enum nl80211_iftype type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 bt_msr = rtl_read_byte(rtlpriv, MSR) & 0xfc;
+        enum led_ctl_mode ledaction = LED_CTL_NO_LINK;
+        u8 mode = MSR_NOLINK;
+
+        switch (type) {
+        case NL80211_IFTYPE_UNSPECIFIED:
+                mode = MSR_NOLINK;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to NO LINK!\n");
+                break;
+        case NL80211_IFTYPE_ADHOC:
+        case NL80211_IFTYPE_MESH_POINT:
+                mode = MSR_ADHOC;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to Ad Hoc!\n");
+                break;
+        case NL80211_IFTYPE_STATION:
+                mode = MSR_INFRA;
+                ledaction = LED_CTL_LINK;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to STA!\n");
+                break;
+        case NL80211_IFTYPE_AP:
+                mode = MSR_AP;
+                ledaction = LED_CTL_LINK;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to AP!\n");
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Network type %d not support!\n", type);
+                return 1;
+        }
+
+        /* MSR_INFRA == Link in infrastructure network;
+         * MSR_ADHOC == Link in ad hoc network;
+         * Therefore, check link state is necessary.
+         *
+         * MSR_AP == AP mode; link state is not cared here.
+         */
+        if (mode != MSR_AP && rtlpriv->mac80211.link_state < MAC80211_LINKED) {
+                mode = MSR_NOLINK;
+                ledaction = LED_CTL_NO_LINK;
+        }
+
+        if (mode == MSR_NOLINK || mode == MSR_INFRA) {
+                _rtl92ee_stop_tx_beacon(hw);
+                _rtl92ee_enable_bcn_sub_func(hw);
+        } else if (mode == MSR_ADHOC || mode == MSR_AP) {
+                _rtl92ee_resume_tx_beacon(hw);
+                _rtl92ee_disable_bcn_sub_func(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
+                         mode);
+        }
+
+        rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);
+        rtlpriv->cfg->ops->led_control(hw, ledaction);
+        if (mode == MSR_AP)
+                rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
+        else
+                rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);
+        return 0;
+}
+
+void rtl92ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 reg_rcr = rtlpci->receive_config;
+
+        if (rtlpriv->psc.rfpwr_state != ERFON)
+                return;
+
+        if (check_bssid) {
+                reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
+                                              (u8 *)(&reg_rcr));
+                _rtl92ee_set_bcn_ctrl_reg(hw, 0, BIT(4));
+        } else {
+                reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN));
+                _rtl92ee_set_bcn_ctrl_reg(hw, BIT(4), 0);
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
+                                              (u8 *)(&reg_rcr));
+        }
+}
+
+int rtl92ee_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (_rtl92ee_set_media_status(hw, type))
+                return -EOPNOTSUPP;
+
+        if (rtlpriv->mac80211.link_state == MAC80211_LINKED) {
+                if (type != NL80211_IFTYPE_AP &&
+                    type != NL80211_IFTYPE_MESH_POINT)
+                        rtl92ee_set_check_bssid(hw, true);
+        } else {
+                rtl92ee_set_check_bssid(hw, false);
+        }
+
+        return 0;
+}
+
+/* don't set REG_EDCA_BE_PARAM here because mac80211 will send pkt when scan */
+void rtl92ee_set_qos(struct ieee80211_hw *hw, int aci)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl92ee_dm_init_edca_turbo(hw);
+        switch (aci) {
+        case AC1_BK:
+                rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, 0xa44f);
+                break;
+        case AC0_BE:
+                /* rtl_write_dword(rtlpriv, REG_EDCA_BE_PARAM, u4b_ac_param); */
+                break;
+        case AC2_VI:
+                rtl_write_dword(rtlpriv, REG_EDCA_VI_PARAM, 0x5e4322);
+                break;
+        case AC3_VO:
+                rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, 0x2f3222);
+                break;
+        default:
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
+                break;
+        }
+}
+
+static void rtl92ee_clear_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 tmp;
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISR);
+        rtl_write_dword(rtlpriv, REG_HISR, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISRE);
+        rtl_write_dword(rtlpriv, REG_HISRE, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HSISR);
+        rtl_write_dword(rtlpriv, REG_HSISR, tmp);
+}
+
+void rtl92ee_enable_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        rtl92ee_clear_interrupt(hw);/*clear it here first*/
+
+        rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
+        rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
+        rtlpci->irq_enabled = true;
+}
+
+void rtl92ee_disable_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        rtl_write_dword(rtlpriv, REG_HIMR, IMR_DISABLED);
+        rtl_write_dword(rtlpriv, REG_HIMRE, IMR_DISABLED);
+        rtlpci->irq_enabled = false;
+        /*synchronize_irq(rtlpci->pdev->irq);*/
+}
+
+static void _rtl92ee_poweroff_adapter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 u1b_tmp;
+
+        rtlhal->mac_func_enable = false;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "POWER OFF adapter\n");
+
+        /* Run LPS WL RFOFF flow */
+        rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                                 PWR_INTF_PCI_MSK, RTL8192E_NIC_LPS_ENTER_FLOW);
+        /* turn off RF */
+        rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x00);
+
+        /* ==== Reset digital sequence   ======  */
+        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready)
+                rtl92ee_firmware_selfreset(hw);
+
+        /* Reset MCU  */
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, (u1b_tmp & (~BIT(2))));
+
+        /* reset MCU ready status */
+        rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
+
+        /* HW card disable configuration. */
+        rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                                 PWR_INTF_PCI_MSK, RTL8192E_NIC_DISABLE_FLOW);
+
+        /* Reset MCU IO Wrapper */
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1b_tmp & (~BIT(0))));
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1b_tmp | BIT(0)));
+
+        /* lock ISO/CLK/Power control register */
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x0E);
+}
+
+void rtl92ee_card_disable(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        enum nl80211_iftype opmode;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "RTL8192ee card disable\n");
+
+        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+
+        mac->link_state = MAC80211_NOLINK;
+        opmode = NL80211_IFTYPE_UNSPECIFIED;
+
+        _rtl92ee_set_media_status(hw, opmode);
+
+        if (rtlpriv->rtlhal.driver_is_goingto_unload ||
+            ppsc->rfoff_reason > RF_CHANGE_BY_PS)
+                rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
+
+        _rtl92ee_poweroff_adapter(hw);
+
+        /* after power off we should do iqk again */
+        rtlpriv->phy.iqk_initialized = false;
+}
+
+void rtl92ee_interrupt_recognized(struct ieee80211_hw *hw,
+                                  u32 *p_inta, u32 *p_intb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        *p_inta = rtl_read_dword(rtlpriv, ISR) & rtlpci->irq_mask[0];
+        rtl_write_dword(rtlpriv, ISR, *p_inta);
+
+        *p_intb = rtl_read_dword(rtlpriv, REG_HISRE) & rtlpci->irq_mask[1];
+        rtl_write_dword(rtlpriv, REG_HISRE, *p_intb);
+}
+
+void rtl92ee_set_beacon_related_registers(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u16 bcn_interval, atim_window;
+
+        bcn_interval = mac->beacon_interval;
+        atim_window = 2;        /*FIX MERGE */
+        rtl92ee_disable_interrupt(hw);
+        rtl_write_word(rtlpriv, REG_ATIMWND, atim_window);
+        rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
+        rtl_write_word(rtlpriv, REG_BCNTCFG, 0x660f);
+        rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_CCK, 0x18);
+        rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_OFDM, 0x18);
+        rtl_write_byte(rtlpriv, 0x606, 0x30);
+        rtlpci->reg_bcn_ctrl_val |= BIT(3);
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8)rtlpci->reg_bcn_ctrl_val);
+}
+
+void rtl92ee_set_beacon_interval(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u16 bcn_interval = mac->beacon_interval;
+
+        RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
+                 "beacon_interval:%d\n", bcn_interval);
+        rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
+}
+
+void rtl92ee_update_interrupt_mask(struct ieee80211_hw *hw,
+                                   u32 add_msr, u32 rm_msr)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
+                 "add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);
+
+        if (add_msr)
+                rtlpci->irq_mask[0] |= add_msr;
+        if (rm_msr)
+                rtlpci->irq_mask[0] &= (~rm_msr);
+        rtl92ee_disable_interrupt(hw);
+        rtl92ee_enable_interrupt(hw);
+}
+
+static u8 _rtl92ee_get_chnl_group(u8 chnl)
+{
+        u8 group = 0;
+
+        if (chnl <= 14) {
+                if (1 <= chnl && chnl <= 2)
+                        group = 0;
+                else if (3 <= chnl && chnl <= 5)
+                        group = 1;
+                else if (6 <= chnl && chnl <= 8)
+                        group = 2;
+                else if (9 <= chnl && chnl <= 11)
+                        group = 3;
+                else if (12 <= chnl && chnl <= 14)
+                        group = 4;
+        } else {
+                if (36 <= chnl && chnl <= 42)
+                        group = 0;
+                else if (44 <= chnl && chnl <= 48)
+                        group = 1;
+                else if (50 <= chnl && chnl <= 58)
+                        group = 2;
+                else if (60 <= chnl && chnl <= 64)
+                        group = 3;
+                else if (100 <= chnl && chnl <= 106)
+                        group = 4;
+                else if (108 <= chnl && chnl <= 114)
+                        group = 5;
+                else if (116 <= chnl && chnl <= 122)
+                        group = 6;
+                else if (124 <= chnl && chnl <= 130)
+                        group = 7;
+                else if (132 <= chnl && chnl <= 138)
+                        group = 8;
+                else if (140 <= chnl && chnl <= 144)
+                        group = 9;
+                else if (149 <= chnl && chnl <= 155)
+                        group = 10;
+                else if (157 <= chnl && chnl <= 161)
+                        group = 11;
+                else if (165 <= chnl && chnl <= 171)
+                        group = 12;
+                else if (173 <= chnl && chnl <= 177)
+                        group = 13;
+        }
+        return group;
+}
+
+static void _rtl8192ee_read_power_value_fromprom(struct ieee80211_hw *hw,
+                                                 struct txpower_info_2g *pwr2g,
+                                                 struct txpower_info_5g *pwr5g,
+                                                 bool autoload_fail, u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 rf, addr = EEPROM_TX_PWR_INX, group, i = 0;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "hal_ReadPowerValueFromPROM92E(): PROMContent[0x%x]=0x%x\n",
+                 (addr + 1), hwinfo[addr + 1]);
+        if (0xFF == hwinfo[addr+1])  /*YJ,add,120316*/
+                autoload_fail = true;
+
+        if (autoload_fail) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "auto load fail : Use Default value!\n");
+                for (rf = 0 ; rf < MAX_RF_PATH ; rf++) {
+                        /* 2.4G default value */
+                        for (group = 0 ; group < MAX_CHNL_GROUP_24G; group++) {
+                                pwr2g->index_cck_base[rf][group] = 0x2D;
+                                pwr2g->index_bw40_base[rf][group] = 0x2D;
+                        }
+                        for (i = 0; i < MAX_TX_COUNT; i++) {
+                                if (i == 0) {
+                                        pwr2g->bw20_diff[rf][0] = 0x02;
+                                        pwr2g->ofdm_diff[rf][0] = 0x04;
+                                } else {
+                                        pwr2g->bw20_diff[rf][i] = 0xFE;
+                                        pwr2g->bw40_diff[rf][i] = 0xFE;
+                                        pwr2g->cck_diff[rf][i] = 0xFE;
+                                        pwr2g->ofdm_diff[rf][i] = 0xFE;
+                                }
+                        }
+
+                        /*5G default value*/
+                        for (group = 0 ; group < MAX_CHNL_GROUP_5G; group++)
+                                pwr5g->index_bw40_base[rf][group] = 0x2A;
+
+                        for (i = 0; i < MAX_TX_COUNT; i++) {
+                                if (i == 0) {
+                                        pwr5g->ofdm_diff[rf][0] = 0x04;
+                                        pwr5g->bw20_diff[rf][0] = 0x00;
+                                        pwr5g->bw80_diff[rf][0] = 0xFE;
+                                        pwr5g->bw160_diff[rf][0] = 0xFE;
+                                } else {
+                                        pwr5g->ofdm_diff[rf][0] = 0xFE;
+                                        pwr5g->bw20_diff[rf][0] = 0xFE;
+                                        pwr5g->bw40_diff[rf][0] = 0xFE;
+                                        pwr5g->bw80_diff[rf][0] = 0xFE;
+                                        pwr5g->bw160_diff[rf][0] = 0xFE;
+                                }
+                        }
+                }
+                return;
+        }
+
+        rtl_priv(hw)->efuse.txpwr_fromeprom = true;
+
+        for (rf = 0 ; rf < MAX_RF_PATH ; rf++) {
+                /*2.4G default value*/
+                for (group = 0 ; group < MAX_CHNL_GROUP_24G; group++) {
+                        pwr2g->index_cck_base[rf][group] = hwinfo[addr++];
+                        if (pwr2g->index_cck_base[rf][group] == 0xFF)
+                                pwr2g->index_cck_base[rf][group] = 0x2D;
+                }
+                for (group = 0 ; group < MAX_CHNL_GROUP_24G - 1; group++) {
+                        pwr2g->index_bw40_base[rf][group] = hwinfo[addr++];
+                        if (pwr2g->index_bw40_base[rf][group] == 0xFF)
+                                pwr2g->index_bw40_base[rf][group] = 0x2D;
+                }
+                for (i = 0; i < MAX_TX_COUNT; i++) {
+                        if (i == 0) {
+                                pwr2g->bw40_diff[rf][i] = 0;
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr2g->bw20_diff[rf][i] = 0x02;
+                                } else {
+                                        pwr2g->bw20_diff[rf][i] = (hwinfo[addr]
+                                                                   & 0xf0) >> 4;
+                                        if (pwr2g->bw20_diff[rf][i] & BIT(3))
+                                                pwr2g->bw20_diff[rf][i] |= 0xF0;
+                                }
+
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr2g->ofdm_diff[rf][i] = 0x04;
+                                } else {
+                                        pwr2g->ofdm_diff[rf][i] = (hwinfo[addr]
+                                                                   & 0x0f);
+                                        if (pwr2g->ofdm_diff[rf][i] & BIT(3))
+                                                pwr2g->ofdm_diff[rf][i] |= 0xF0;
+                                }
+                                pwr2g->cck_diff[rf][i] = 0;
+                                addr++;
+                        } else {
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr2g->bw40_diff[rf][i] = 0xFE;
+                                } else {
+                                        pwr2g->bw40_diff[rf][i] = (hwinfo[addr]
+                                                                   & 0xf0) >> 4;
+                                        if (pwr2g->bw40_diff[rf][i] & BIT(3))
+                                                pwr2g->bw40_diff[rf][i] |= 0xF0;
+                                }
+
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr2g->bw20_diff[rf][i] = 0xFE;
+                                } else {
+                                        pwr2g->bw20_diff[rf][i] = (hwinfo[addr]
+                                                                   & 0x0f);
+                                        if (pwr2g->bw20_diff[rf][i] & BIT(3))
+                                                pwr2g->bw20_diff[rf][i] |= 0xF0;
+                                }
+                                addr++;
+
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr2g->ofdm_diff[rf][i] = 0xFE;
+                                } else {
+                                        pwr2g->ofdm_diff[rf][i] = (hwinfo[addr]
+                                                                   & 0xf0) >> 4;
+                                        if (pwr2g->ofdm_diff[rf][i] & BIT(3))
+                                                pwr2g->ofdm_diff[rf][i] |= 0xF0;
+                                }
+
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr2g->cck_diff[rf][i] = 0xFE;
+                                } else {
+                                        pwr2g->cck_diff[rf][i] = (hwinfo[addr]
+                                                                  & 0x0f);
+                                        if (pwr2g->cck_diff[rf][i] & BIT(3))
+                                                pwr2g->cck_diff[rf][i] |= 0xF0;
+                                }
+                                addr++;
+                        }
+                }
+
+                /*5G default value*/
+                for (group = 0 ; group < MAX_CHNL_GROUP_5G; group++) {
+                        pwr5g->index_bw40_base[rf][group] = hwinfo[addr++];
+                        if (pwr5g->index_bw40_base[rf][group] == 0xFF)
+                                pwr5g->index_bw40_base[rf][group] = 0xFE;
+                }
+
+                for (i = 0; i < MAX_TX_COUNT; i++) {
+                        if (i == 0) {
+                                pwr5g->bw40_diff[rf][i] = 0;
+
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr5g->bw20_diff[rf][i] = 0;
+                                } else {
+                                        pwr5g->bw20_diff[rf][0] = (hwinfo[addr]
+                                                                   & 0xf0) >> 4;
+                                        if (pwr5g->bw20_diff[rf][i] & BIT(3))
+                                                pwr5g->bw20_diff[rf][i] |= 0xF0;
+                                }
+
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr5g->ofdm_diff[rf][i] = 0x04;
+                                } else {
+                                        pwr5g->ofdm_diff[rf][0] = (hwinfo[addr]
+                                                                   & 0x0f);
+                                        if (pwr5g->ofdm_diff[rf][i] & BIT(3))
+                                                pwr5g->ofdm_diff[rf][i] |= 0xF0;
+                                }
+                                addr++;
+                        } else {
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr5g->bw40_diff[rf][i] = 0xFE;
+                                } else {
+                                        pwr5g->bw40_diff[rf][i] = (hwinfo[addr]
+                                                                  & 0xf0) >> 4;
+                                        if (pwr5g->bw40_diff[rf][i] & BIT(3))
+                                                pwr5g->bw40_diff[rf][i] |= 0xF0;
+                                }
+
+                                if (hwinfo[addr] == 0xFF) {
+                                        pwr5g->bw20_diff[rf][i] = 0xFE;
+                                } else {
+                                        pwr5g->bw20_diff[rf][i] = (hwinfo[addr]
+                                                                   & 0x0f);
+                                        if (pwr5g->bw20_diff[rf][i] & BIT(3))
+                                                pwr5g->bw20_diff[rf][i] |= 0xF0;
+                                }
+                                addr++;
+                        }
+                }
+
+                if (hwinfo[addr] == 0xFF) {
+                        pwr5g->ofdm_diff[rf][1] = 0xFE;
+                        pwr5g->ofdm_diff[rf][2] = 0xFE;
+                } else {
+                        pwr5g->ofdm_diff[rf][1] = (hwinfo[addr] & 0xf0) >> 4;
+                        pwr5g->ofdm_diff[rf][2] = (hwinfo[addr] & 0x0f);
+                }
+                addr++;
+
+                if (hwinfo[addr] == 0xFF)
+                        pwr5g->ofdm_diff[rf][3] = 0xFE;
+                else
+                        pwr5g->ofdm_diff[rf][3] = (hwinfo[addr] & 0x0f);
+                addr++;
+
+                for (i = 1; i < MAX_TX_COUNT; i++) {
+                        if (pwr5g->ofdm_diff[rf][i] == 0xFF)
+                                pwr5g->ofdm_diff[rf][i] = 0xFE;
+                        else if (pwr5g->ofdm_diff[rf][i] & BIT(3))
+                                pwr5g->ofdm_diff[rf][i] |= 0xF0;
+                }
+
+                for (i = 0; i < MAX_TX_COUNT; i++) {
+                        if (hwinfo[addr] == 0xFF) {
+                                pwr5g->bw80_diff[rf][i] = 0xFE;
+                        } else {
+                                pwr5g->bw80_diff[rf][i] = (hwinfo[addr] & 0xf0)
+                                                          >> 4;
+                                if (pwr5g->bw80_diff[rf][i] & BIT(3))
+                                        pwr5g->bw80_diff[rf][i] |= 0xF0;
+                        }
+
+                        if (hwinfo[addr] == 0xFF) {
+                                pwr5g->bw160_diff[rf][i] = 0xFE;
+                        } else {
+                                pwr5g->bw160_diff[rf][i] =
+                                  (hwinfo[addr] & 0x0f);
+                                if (pwr5g->bw160_diff[rf][i] & BIT(3))
+                                        pwr5g->bw160_diff[rf][i] |= 0xF0;
+                        }
+                        addr++;
+                }
+        }
+}
+
+static void _rtl92ee_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
+                                                 bool autoload_fail, u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *efu = rtl_efuse(rtl_priv(hw));
+        struct txpower_info_2g pwr2g;
+        struct txpower_info_5g pwr5g;
+        u8 channel5g[CHANNEL_MAX_NUMBER_5G] = {
+                36, 38, 40, 42, 44, 46, 48, 50, 52, 54,
+                56, 58, 60, 62, 64, 100, 102, 104, 106,
+                108, 110, 112, 114, 116, 118, 120, 122,
+                124, 126, 128, 130, 132, 134, 136, 138,
+                140, 142, 144, 149, 151, 153, 155, 157,
+                159, 161, 163, 165, 167, 168, 169, 171,
+                173, 175, 177
+        };
+        u8 channel5g_80m[CHANNEL_MAX_NUMBER_5G_80M] = {
+                42, 58, 106, 122, 138, 155, 171
+        };
+        u8 rf, idx;
+        u8 i;
+
+        _rtl8192ee_read_power_value_fromprom(hw, &pwr2g, &pwr5g,
+                                             autoload_fail, hwinfo);
+
+        for (rf = 0; rf < MAX_RF_PATH; rf++) {
+                for (i = 0; i < 14; i++) {
+                        idx = _rtl92ee_get_chnl_group(i + 1);
+
+                        if (i == CHANNEL_MAX_NUMBER_2G - 1) {
+                                efu->txpwrlevel_cck[rf][i] =
+                                                pwr2g.index_cck_base[rf][5];
+                                efu->txpwrlevel_ht40_1s[rf][i] =
+                                                pwr2g.index_bw40_base[rf][idx];
+                        } else {
+                                efu->txpwrlevel_cck[rf][i] =
+                                                pwr2g.index_cck_base[rf][idx];
+                                efu->txpwrlevel_ht40_1s[rf][i] =
+                                                pwr2g.index_bw40_base[rf][idx];
+                        }
+                }
+                for (i = 0; i < CHANNEL_MAX_NUMBER_5G; i++) {
+                        idx = _rtl92ee_get_chnl_group(channel5g[i]);
+                        efu->txpwr_5g_bw40base[rf][i] =
+                                        pwr5g.index_bw40_base[rf][idx];
+                }
+                for (i = 0; i < CHANNEL_MAX_NUMBER_5G_80M; i++) {
+                        u8 upper, lower;
+
+                        idx = _rtl92ee_get_chnl_group(channel5g_80m[i]);
+                        upper = pwr5g.index_bw40_base[rf][idx];
+                        lower = pwr5g.index_bw40_base[rf][idx + 1];
+
+                        efu->txpwr_5g_bw80base[rf][i] = (upper + lower) / 2;
+                }
+                for (i = 0; i < MAX_TX_COUNT; i++) {
+                        efu->txpwr_cckdiff[rf][i] = pwr2g.cck_diff[rf][i];
+                        efu->txpwr_legacyhtdiff[rf][i] = pwr2g.ofdm_diff[rf][i];
+                        efu->txpwr_ht20diff[rf][i] = pwr2g.bw20_diff[rf][i];
+                        efu->txpwr_ht40diff[rf][i] = pwr2g.bw40_diff[rf][i];
+
+                        efu->txpwr_5g_ofdmdiff[rf][i] = pwr5g.ofdm_diff[rf][i];
+                        efu->txpwr_5g_bw20diff[rf][i] = pwr5g.bw20_diff[rf][i];
+                        efu->txpwr_5g_bw40diff[rf][i] = pwr5g.bw40_diff[rf][i];
+                        efu->txpwr_5g_bw80diff[rf][i] = pwr5g.bw80_diff[rf][i];
+                }
+        }
+
+        if (!autoload_fail)
+                efu->eeprom_thermalmeter = hwinfo[EEPROM_THERMAL_METER_92E];
+        else
+                efu->eeprom_thermalmeter = EEPROM_DEFAULT_THERMALMETER;
+
+        if (efu->eeprom_thermalmeter == 0xff || autoload_fail) {
+                efu->apk_thermalmeterignore = true;
+                efu->eeprom_thermalmeter = EEPROM_DEFAULT_THERMALMETER;
+        }
+
+        efu->thermalmeter[0] = efu->eeprom_thermalmeter;
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
+                "thermalmeter = 0x%x\n", efu->eeprom_thermalmeter);
+
+        if (!autoload_fail) {
+                efu->eeprom_regulatory = hwinfo[EEPROM_RF_BOARD_OPTION_92E]
+                                         & 0x07;
+                if (hwinfo[EEPROM_RF_BOARD_OPTION_92E] == 0xFF)
+                        efu->eeprom_regulatory = 0;
+        } else {
+                efu->eeprom_regulatory = 0;
+        }
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
+                "eeprom_regulatory = 0x%x\n", efu->eeprom_regulatory);
+}
+
+static void _rtl92ee_read_adapter_info(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u16 i, usvalue;
+        u8 hwinfo[HWSET_MAX_SIZE];
+        u16 eeprom_id;
+
+        if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {
+                rtl_efuse_shadow_map_update(hw);
+
+                memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
+                       HWSET_MAX_SIZE);
+        } else if (rtlefuse->epromtype == EEPROM_93C46) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "RTL819X Not boot from eeprom, check it !!");
+                return;
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "boot from neither eeprom nor efuse, check it !!");
+                return;
+        }
+
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP\n",
+                      hwinfo, HWSET_MAX_SIZE);
+
+        eeprom_id = *((u16 *)&hwinfo[0]);
+        if (eeprom_id != RTL8192E_EEPROM_ID) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
+                rtlefuse->autoload_failflag = true;
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
+                rtlefuse->autoload_failflag = false;
+        }
+
+        if (rtlefuse->autoload_failflag)
+                return;
+        /*VID DID SVID SDID*/
+        rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
+        rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
+        rtlefuse->eeprom_svid = *(u16 *)&hwinfo[EEPROM_SVID];
+        rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROMId = 0x%4x\n", eeprom_id);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
+        /*customer ID*/
+        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        if (rtlefuse->eeprom_oemid == 0xFF)
+                rtlefuse->eeprom_oemid = 0;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
+        /*EEPROM version*/
+        rtlefuse->eeprom_version = *(u8 *)&hwinfo[EEPROM_VERSION];
+        /*mac address*/
+        for (i = 0; i < 6; i += 2) {
+                usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
+                *((u16 *)(&rtlefuse->dev_addr[i])) = usvalue;
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "dev_addr: %pM\n", rtlefuse->dev_addr);
+        /*channel plan */
+        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        /* set channel paln to world wide 13 */
+        rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
+        /*tx power*/
+        _rtl92ee_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag,
+                                             hwinfo);
+
+        rtl92ee_read_bt_coexist_info_from_hwpg(hw, rtlefuse->autoload_failflag,
+                                               hwinfo);
+
+        /*board type*/
+        rtlefuse->board_type = (((*(u8 *)&hwinfo[EEPROM_RF_BOARD_OPTION_92E])
+                                & 0xE0) >> 5);
+        if ((*(u8 *)&hwinfo[EEPROM_RF_BOARD_OPTION_92E]) == 0xFF)
+                rtlefuse->board_type = 0;
+
+        rtlhal->board_type = rtlefuse->board_type;
+        /*parse xtal*/
+        rtlefuse->crystalcap = hwinfo[EEPROM_XTAL_92E];
+        if (hwinfo[EEPROM_XTAL_92E] == 0xFF)
+                rtlefuse->crystalcap = 0x20;
+
+        /*antenna diversity*/
+        rtlefuse->antenna_div_type = NO_ANTDIV;
+        rtlefuse->antenna_div_cfg = 0;
+
+        if (rtlhal->oem_id == RT_CID_DEFAULT) {
+                switch (rtlefuse->eeprom_oemid) {
+                case EEPROM_CID_DEFAULT:
+                        if (rtlefuse->eeprom_did == 0x818B) {
+                                if ((rtlefuse->eeprom_svid == 0x10EC) &&
+                                    (rtlefuse->eeprom_smid == 0x001B))
+                                        rtlhal->oem_id = RT_CID_819X_LENOVO;
+                        } else {
+                                rtlhal->oem_id = RT_CID_DEFAULT;
+                        }
+                        break;
+                default:
+                        rtlhal->oem_id = RT_CID_DEFAULT;
+                        break;
+                }
+        }
+}
+
+static void _rtl92ee_hal_customized_behavior(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        pcipriv->ledctl.led_opendrain = true;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
+}
+
+void rtl92ee_read_eeprom_info(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp_u1b;
+
+        rtlhal->version = _rtl92ee_read_chip_version(hw);
+        if (get_rf_type(rtlphy) == RF_1T1R) {
+                rtlpriv->dm.rfpath_rxenable[0] = true;
+        } else {
+                rtlpriv->dm.rfpath_rxenable[0] = true;
+                rtlpriv->dm.rfpath_rxenable[1] = true;
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
+                 rtlhal->version);
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
+        if (tmp_u1b & BIT(4)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
+                rtlefuse->epromtype = EEPROM_93C46;
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
+                rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
+        }
+        if (tmp_u1b & BIT(5)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
+                rtlefuse->autoload_failflag = false;
+                _rtl92ee_read_adapter_info(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
+        }
+        _rtl92ee_hal_customized_behavior(hw);
+
+        rtlphy->rfpath_rx_enable[0] = true;
+        if (rtlphy->rf_type == RF_2T2R)
+                rtlphy->rfpath_rx_enable[1] = true;
+}
+
+static u8 _rtl92ee_mrate_idx_to_arfr_id(struct ieee80211_hw *hw, u8 rate_index)
+{
+        u8 ret = 0;
+
+        switch (rate_index) {
+        case RATR_INX_WIRELESS_NGB:
+                ret = 0;
+                break;
+        case RATR_INX_WIRELESS_N:
+        case RATR_INX_WIRELESS_NG:
+                ret = 4;
+                break;
+        case RATR_INX_WIRELESS_NB:
+                ret = 2;
+                break;
+        case RATR_INX_WIRELESS_GB:
+                ret = 6;
+                break;
+        case RATR_INX_WIRELESS_G:
+                ret = 7;
+                break;
+        case RATR_INX_WIRELESS_B:
+                ret = 8;
+                break;
+        default:
+                ret = 0;
+                break;
+        }
+        return ret;
+}
+
+static void rtl92ee_update_hal_rate_mask(struct ieee80211_hw *hw,
+                                         struct ieee80211_sta *sta,
+                                         u8 rssi_level)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_sta_info *sta_entry = NULL;
+        u32 ratr_bitmap;
+        u8 ratr_index;
+        u8 curtxbw_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
+                             ? 1 : 0;
+        u8 b_curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
+                                1 : 0;
+        u8 b_curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
+                                1 : 0;
+        enum wireless_mode wirelessmode = 0;
+        bool b_shortgi = false;
+        u8 rate_mask[7] = {0};
+        u8 macid = 0;
+        /*u8 mimo_ps = IEEE80211_SMPS_OFF;*/
+        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+        wirelessmode = sta_entry->wireless_mode;
+        if (mac->opmode == NL80211_IFTYPE_STATION ||
+            mac->opmode == NL80211_IFTYPE_MESH_POINT)
+                curtxbw_40mhz = mac->bw_40;
+        else if (mac->opmode == NL80211_IFTYPE_AP ||
+                 mac->opmode == NL80211_IFTYPE_ADHOC)
+                macid = sta->aid + 1;
+
+        ratr_bitmap = sta->supp_rates[0];
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_bitmap = 0xfff;
+
+        ratr_bitmap |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
+                        sta->ht_cap.mcs.rx_mask[0] << 12);
+
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                ratr_index = RATR_INX_WIRELESS_B;
+                if (ratr_bitmap & 0x0000000c)
+                        ratr_bitmap &= 0x0000000d;
+                else
+                        ratr_bitmap &= 0x0000000f;
+                break;
+        case WIRELESS_MODE_G:
+                ratr_index = RATR_INX_WIRELESS_GB;
+
+                if (rssi_level == 1)
+                        ratr_bitmap &= 0x00000f00;
+                else if (rssi_level == 2)
+                        ratr_bitmap &= 0x00000ff0;
+                else
+                        ratr_bitmap &= 0x00000ff5;
+                break;
+        case WIRELESS_MODE_N_24G:
+                if (curtxbw_40mhz)
+                        ratr_index = RATR_INX_WIRELESS_NGB;
+                else
+                        ratr_index = RATR_INX_WIRELESS_NB;
+
+                if (rtlphy->rf_type == RF_1T1R) {
+                        if (curtxbw_40mhz) {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x000f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x000ff000;
+                                else
+                                        ratr_bitmap &= 0x000ff015;
+                        } else {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x000f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x000ff000;
+                                else
+                                        ratr_bitmap &= 0x000ff005;
+                        }
+                } else {
+                        if (curtxbw_40mhz) {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x0f8f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x0ffff000;
+                                else
+                                        ratr_bitmap &= 0x0ffff015;
+                        } else {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x0f8f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x0ffff000;
+                                else
+                                        ratr_bitmap &= 0x0ffff005;
+                        }
+                }
+
+                if ((curtxbw_40mhz && b_curshortgi_40mhz) ||
+                    (!curtxbw_40mhz && b_curshortgi_20mhz)) {
+                        if (macid == 0)
+                                b_shortgi = true;
+                        else if (macid == 1)
+                                b_shortgi = false;
+                }
+                break;
+        default:
+                ratr_index = RATR_INX_WIRELESS_NGB;
+
+                if (rtlphy->rf_type == RF_1T1R)
+                        ratr_bitmap &= 0x000ff0ff;
+                else
+                        ratr_bitmap &= 0x0f8ff0ff;
+                break;
+        }
+        ratr_index = _rtl92ee_mrate_idx_to_arfr_id(hw, ratr_index);
+        sta_entry->ratr_index = ratr_index;
+
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "ratr_bitmap :%x\n", ratr_bitmap);
+        *(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |
+                                       (ratr_index << 28);
+        rate_mask[0] = macid;
+        rate_mask[1] = ratr_index | (b_shortgi ? 0x80 : 0x00);
+        rate_mask[2] = curtxbw_40mhz;
+        rate_mask[3] = (u8)(ratr_bitmap & 0x000000ff);
+        rate_mask[4] = (u8)((ratr_bitmap & 0x0000ff00) >> 8);
+        rate_mask[5] = (u8)((ratr_bitmap & 0x00ff0000) >> 16);
+        rate_mask[6] = (u8)((ratr_bitmap & 0xff000000) >> 24);
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x:%x:%x\n",
+                  ratr_index, ratr_bitmap, rate_mask[0], rate_mask[1],
+                  rate_mask[2], rate_mask[3], rate_mask[4],
+                  rate_mask[5], rate_mask[6]);
+        rtl92ee_fill_h2c_cmd(hw, H2C_92E_RA_MASK, 7, rate_mask);
+        _rtl92ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
+}
+
+void rtl92ee_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                                 struct ieee80211_sta *sta, u8 rssi_level)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->dm.useramask)
+                rtl92ee_update_hal_rate_mask(hw, sta, rssi_level);
+}
+
+void rtl92ee_update_channel_access_setting(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u16 sifs_timer;
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
+                                      (u8 *)&mac->slot_time);
+        if (!mac->ht_enable)
+                sifs_timer = 0x0a0a;
+        else
+                sifs_timer = 0x0e0e;
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SIFS, (u8 *)&sifs_timer);
+}
+
+bool rtl92ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
+{
+        *valid = 1;
+        return true;
+}
+
+void rtl92ee_set_key(struct ieee80211_hw *hw, u32 key_index,
+                     u8 *p_macaddr, bool is_group, u8 enc_algo,
+                     bool is_wepkey, bool clear_all)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 *macaddr = p_macaddr;
+        u32 entry_id = 0;
+        bool is_pairwise = false;
+
+        static u8 cam_const_addr[4][6] = {
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x02},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x03}
+        };
+        static u8 cam_const_broad[] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
+
+        if (clear_all) {
+                u8 idx = 0;
+                u8 cam_offset = 0;
+                u8 clear_number = 5;
+
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
+
+                for (idx = 0; idx < clear_number; idx++) {
+                        rtl_cam_mark_invalid(hw, cam_offset + idx);
+                        rtl_cam_empty_entry(hw, cam_offset + idx);
+
+                        if (idx < 5) {
+                                memset(rtlpriv->sec.key_buf[idx], 0,
+                                       MAX_KEY_LEN);
+                                rtlpriv->sec.key_len[idx] = 0;
+                        }
+                }
+
+        } else {
+                switch (enc_algo) {
+                case WEP40_ENCRYPTION:
+                        enc_algo = CAM_WEP40;
+                        break;
+                case WEP104_ENCRYPTION:
+                        enc_algo = CAM_WEP104;
+                        break;
+                case TKIP_ENCRYPTION:
+                        enc_algo = CAM_TKIP;
+                        break;
+                case AESCCMP_ENCRYPTION:
+                        enc_algo = CAM_AES;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not process\n");
+                        enc_algo = CAM_TKIP;
+                        break;
+                }
+
+                if (is_wepkey || rtlpriv->sec.use_defaultkey) {
+                        macaddr = cam_const_addr[key_index];
+                        entry_id = key_index;
+                } else {
+                        if (is_group) {
+                                macaddr = cam_const_broad;
+                                entry_id = key_index;
+                        } else {
+                                if (mac->opmode == NL80211_IFTYPE_AP ||
+                                    mac->opmode == NL80211_IFTYPE_MESH_POINT) {
+                                        entry_id = rtl_cam_get_free_entry(hw,
+                                                                     p_macaddr);
+                                        if (entry_id >=  TOTAL_CAM_ENTRY) {
+                                                RT_TRACE(rtlpriv, COMP_SEC,
+                                                         DBG_EMERG,
+                                                         "Can not find free hw security cam entry\n");
+                                                return;
+                                        }
+                                } else {
+                                        entry_id = CAM_PAIRWISE_KEY_POSITION;
+                                }
+
+                                key_index = PAIRWISE_KEYIDX;
+                                is_pairwise = true;
+                        }
+                }
+
+                if (rtlpriv->sec.key_len[key_index] == 0) {
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
+                        if (mac->opmode == NL80211_IFTYPE_AP ||
+                            mac->opmode == NL80211_IFTYPE_MESH_POINT)
+                                rtl_cam_del_entry(hw, p_macaddr);
+                        rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                 "add one entry\n");
+                        if (is_pairwise) {
+                                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                         "set Pairwiase key\n");
+
+                                rtl_cam_add_one_entry(hw, macaddr, key_index,
+                                               entry_id, enc_algo,
+                                               CAM_CONFIG_NO_USEDK,
+                                               rtlpriv->sec.key_buf[key_index]);
+                        } else {
+                                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                         "set group key\n");
+
+                                if (mac->opmode == NL80211_IFTYPE_ADHOC) {
+                                        rtl_cam_add_one_entry(hw,
+                                                rtlefuse->dev_addr,
+                                                PAIRWISE_KEYIDX,
+                                                CAM_PAIRWISE_KEY_POSITION,
+                                                enc_algo, CAM_CONFIG_NO_USEDK,
+                                                rtlpriv->sec.key_buf[entry_id]);
+                                }
+
+                                rtl_cam_add_one_entry(hw, macaddr, key_index,
+                                                entry_id, enc_algo,
+                                                CAM_CONFIG_NO_USEDK,
+                                                rtlpriv->sec.key_buf[entry_id]);
+                        }
+                }
+        }
+}
+
+void rtl92ee_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
+                                            bool auto_load_fail, u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 value;
+
+        if (!auto_load_fail) {
+                value = hwinfo[EEPROM_RF_BOARD_OPTION_92E];
+                if (((value & 0xe0) >> 5) == 0x1)
+                        rtlpriv->btcoexist.btc_info.btcoexist = 1;
+                else
+                        rtlpriv->btcoexist.btc_info.btcoexist = 0;
+
+                rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8192E;
+                rtlpriv->btcoexist.btc_info.ant_num = ANT_TOTAL_X2;
+        } else {
+                rtlpriv->btcoexist.btc_info.btcoexist = 1;
+                rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8192E;
+                rtlpriv->btcoexist.btc_info.ant_num = ANT_TOTAL_X1;
+        }
+}
+
+void rtl92ee_bt_reg_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        /* 0:Low, 1:High, 2:From Efuse. */
+        rtlpriv->btcoexist.reg_bt_iso = 2;
+        /* 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter. */
+        rtlpriv->btcoexist.reg_bt_sco = 3;
+        /* 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. */
+        rtlpriv->btcoexist.reg_bt_sco = 0;
+}
+
+void rtl92ee_bt_hw_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->cfg->ops->get_btc_status())
+                rtlpriv->btcoexist.btc_ops->btc_init_hw_config(rtlpriv);
+}
+
+void rtl92ee_suspend(struct ieee80211_hw *hw)
+{
+}
+
+void rtl92ee_resume(struct ieee80211_hw *hw)
+{
+}
+
+/* Turn on AAP (RCR:bit 0) for promicuous mode. */
+void rtl92ee_allow_all_destaddr(struct ieee80211_hw *hw,
+                                bool allow_all_da, bool write_into_reg)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        if (allow_all_da)       /* Set BIT0 */
+                rtlpci->receive_config |= RCR_AAP;
+        else                    /* Clear BIT0 */
+                rtlpci->receive_config &= ~RCR_AAP;
+
+        if (write_into_reg)
+                rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
+
+        RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
+                 "receive_config=0x%08X, write_into_reg=%d\n",
+                  rtlpci->receive_config, write_into_reg);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.h b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.h
new file mode 100644
index 000000000000..05413f189685
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.h
@@ -0,0 +1,62 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_HW_H__
+#define __RTL92E_HW_H__
+
+void rtl92ee_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
+void rtl92ee_read_eeprom_info(struct ieee80211_hw *hw);
+void rtl92ee_interrupt_recognized(struct ieee80211_hw *hw,
+                                  u32 *p_inta, u32 *p_intb);
+int rtl92ee_hw_init(struct ieee80211_hw *hw);
+void rtl92ee_card_disable(struct ieee80211_hw *hw);
+void rtl92ee_enable_interrupt(struct ieee80211_hw *hw);
+void rtl92ee_disable_interrupt(struct ieee80211_hw *hw);
+int rtl92ee_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type);
+void rtl92ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid);
+void rtl92ee_set_qos(struct ieee80211_hw *hw, int aci);
+void rtl92ee_set_beacon_related_registers(struct ieee80211_hw *hw);
+void rtl92ee_set_beacon_interval(struct ieee80211_hw *hw);
+void rtl92ee_update_interrupt_mask(struct ieee80211_hw *hw,
+                                   u32 add_msr, u32 rm_msr);
+void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
+void rtl92ee_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                                 struct ieee80211_sta *sta, u8 rssi_level);
+void rtl92ee_update_channel_access_setting(struct ieee80211_hw *hw);
+bool rtl92ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid);
+void rtl92ee_enable_hw_security_config(struct ieee80211_hw *hw);
+void rtl92ee_set_key(struct ieee80211_hw *hw, u32 key_index,
+                     u8 *p_macaddr, bool is_group, u8 enc_algo,
+                     bool is_wepkey, bool clear_all);
+void rtl92ee_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
+                                            bool autoload_fail, u8 *hwinfo);
+void rtl92ee_bt_reg_init(struct ieee80211_hw *hw);
+void rtl92ee_bt_hw_init(struct ieee80211_hw *hw);
+void rtl92ee_suspend(struct ieee80211_hw *hw);
+void rtl92ee_resume(struct ieee80211_hw *hw);
+void rtl92ee_allow_all_destaddr(struct ieee80211_hw *hw, bool allow_all_da,
+                                bool write_into_reg);
+void rtl92ee_fw_clk_off_timer_callback(unsigned long data);
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/led.c b/drivers/net/wireless/rtlwifi/rtl8192ee/led.c
new file mode 100644
index 000000000000..8388e371c8e2
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/led.c
@@ -0,0 +1,145 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "reg.h"
+#include "led.h"
+
+static void _rtl92ee_init_led(struct ieee80211_hw *hw,
+                              struct rtl_led *pled, enum rtl_led_pin ledpin)
+{
+        pled->hw = hw;
+        pled->ledpin = ledpin;
+        pled->ledon = false;
+}
+
+void rtl92ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
+{
+        u32 ledcfg;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
+                 "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
+
+        switch (pled->ledpin) {
+        case LED_PIN_GPIO0:
+                break;
+        case LED_PIN_LED0:
+                ledcfg = rtl_read_dword(rtlpriv , REG_GPIO_PIN_CTRL);
+                ledcfg &= ~BIT(13);
+                ledcfg |= BIT(21);
+                ledcfg &= ~BIT(29);
+
+                rtl_write_dword(rtlpriv, REG_GPIO_PIN_CTRL, ledcfg);
+
+                break;
+        case LED_PIN_LED1:
+
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
+                break;
+        }
+        pled->ledon = true;
+}
+
+void rtl92ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 ledcfg;
+
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
+                 "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
+
+        switch (pled->ledpin) {
+        case LED_PIN_GPIO0:
+                break;
+        case LED_PIN_LED0:
+
+                ledcfg = rtl_read_dword(rtlpriv , REG_GPIO_PIN_CTRL);
+                ledcfg |= ~BIT(21);
+                ledcfg &= ~BIT(29);
+                rtl_write_dword(rtlpriv, REG_GPIO_PIN_CTRL, ledcfg);
+
+                break;
+        case LED_PIN_LED1:
+
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
+                break;
+        }
+        pled->ledon = false;
+}
+
+void rtl92ee_init_sw_leds(struct ieee80211_hw *hw)
+{
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+
+        _rtl92ee_init_led(hw, &pcipriv->ledctl.sw_led0, LED_PIN_LED0);
+        _rtl92ee_init_led(hw, &pcipriv->ledctl.sw_led1, LED_PIN_LED1);
+}
+
+static void _rtl92ee_sw_led_control(struct ieee80211_hw *hw,
+                                    enum led_ctl_mode ledaction)
+{
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_led *pLed0 = &pcipriv->ledctl.sw_led0;
+
+        switch (ledaction) {
+        case LED_CTL_POWER_ON:
+        case LED_CTL_LINK:
+        case LED_CTL_NO_LINK:
+                rtl92ee_sw_led_on(hw, pLed0);
+                break;
+        case LED_CTL_POWER_OFF:
+                rtl92ee_sw_led_off(hw, pLed0);
+                break;
+        default:
+                break;
+        }
+}
+
+void rtl92ee_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+
+        if ((ppsc->rfoff_reason > RF_CHANGE_BY_PS) &&
+            (ledaction == LED_CTL_TX ||
+             ledaction == LED_CTL_RX ||
+             ledaction == LED_CTL_SITE_SURVEY ||
+             ledaction == LED_CTL_LINK ||
+             ledaction == LED_CTL_NO_LINK ||
+             ledaction == LED_CTL_START_TO_LINK ||
+             ledaction == LED_CTL_POWER_ON)) {
+                return;
+        }
+        RT_TRACE(rtlpriv, COMP_LED, DBG_TRACE, "ledaction %d,\n", ledaction);
+        _rtl92ee_sw_led_control(hw, ledaction);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/led.h b/drivers/net/wireless/rtlwifi/rtl8192ee/led.h
new file mode 100644
index 000000000000..8ef640a2ef7f
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/led.h
@@ -0,0 +1,34 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_LED_H__
+#define __RTL92E_LED_H__
+
+void rtl92ee_init_sw_leds(struct ieee80211_hw *hw);
+void rtl92ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl92ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl92ee_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ee/phy.c
new file mode 100644
index 000000000000..a863a44f9e16
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/phy.c
@@ -0,0 +1,3219 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../ps.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "rf.h"
+#include "dm.h"
+#include "table.h"
+
+static u32 _rtl92ee_phy_rf_serial_read(struct ieee80211_hw *hw,
+                                       enum radio_path rfpath, u32 offset);
+static void _rtl92ee_phy_rf_serial_write(struct ieee80211_hw *hw,
+                                         enum radio_path rfpath, u32 offset,
+                                         u32 data);
+static u32 _rtl92ee_phy_calculate_bit_shift(u32 bitmask);
+static bool _rtl92ee_phy_bb8192ee_config_parafile(struct ieee80211_hw *hw);
+static bool _rtl92ee_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
+static bool phy_config_bb_with_hdr_file(struct ieee80211_hw *hw,
+                                        u8 configtype);
+static bool phy_config_bb_with_pghdrfile(struct ieee80211_hw *hw,
+                                         u8 configtype);
+static void phy_init_bb_rf_register_def(struct ieee80211_hw *hw);
+static bool _rtl92ee_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
+                                              u32 cmdtableidx, u32 cmdtablesz,
+                                              enum swchnlcmd_id cmdid,
+                                              u32 para1, u32 para2,
+                                              u32 msdelay);
+static bool _rtl92ee_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+                                              u8 channel, u8 *stage,
+                                              u8 *step, u32 *delay);
+static long _rtl92ee_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
+                                          enum wireless_mode wirelessmode,
+                                          u8 txpwridx);
+static void rtl92ee_phy_set_rf_on(struct ieee80211_hw *hw);
+static void rtl92ee_phy_set_io(struct ieee80211_hw *hw);
+
+u32 rtl92ee_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 returnvalue, originalvalue, bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
+        originalvalue = rtl_read_dword(rtlpriv, regaddr);
+        bitshift = _rtl92ee_phy_calculate_bit_shift(bitmask);
+        returnvalue = (originalvalue & bitmask) >> bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
+                  bitmask, regaddr, originalvalue);
+
+        return returnvalue;
+}
+
+void rtl92ee_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr,
+                            u32 bitmask, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 originalvalue, bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                  regaddr, bitmask, data);
+
+        if (bitmask != MASKDWORD) {
+                originalvalue = rtl_read_dword(rtlpriv, regaddr);
+                bitshift = _rtl92ee_phy_calculate_bit_shift(bitmask);
+                data = ((originalvalue & (~bitmask)) | (data << bitshift));
+        }
+
+        rtl_write_dword(rtlpriv, regaddr, data);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                  regaddr, bitmask, data);
+}
+
+u32 rtl92ee_phy_query_rf_reg(struct ieee80211_hw *hw,
+                             enum radio_path rfpath, u32 regaddr, u32 bitmask)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 original_value, readback_value, bitshift;
+        unsigned long flags;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                  regaddr, rfpath, bitmask);
+
+        spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+
+        original_value = _rtl92ee_phy_rf_serial_read(hw , rfpath, regaddr);
+        bitshift = _rtl92ee_phy_calculate_bit_shift(bitmask);
+        readback_value = (original_value & bitmask) >> bitshift;
+
+        spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x),rfpath(%#x),bitmask(%#x),original_value(%#x)\n",
+                  regaddr, rfpath, bitmask, original_value);
+
+        return readback_value;
+}
+
+void rtl92ee_phy_set_rf_reg(struct ieee80211_hw *hw,
+                            enum radio_path rfpath,
+                            u32 addr, u32 bitmask, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 original_value, bitshift;
+        unsigned long flags;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                  addr, bitmask, data, rfpath);
+
+        spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+
+        if (bitmask != RFREG_OFFSET_MASK) {
+                original_value = _rtl92ee_phy_rf_serial_read(hw, rfpath, addr);
+                bitshift = _rtl92ee_phy_calculate_bit_shift(bitmask);
+                data = (original_value & (~bitmask)) | (data << bitshift);
+        }
+
+        _rtl92ee_phy_rf_serial_write(hw, rfpath, addr, data);
+
+        spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                  addr, bitmask, data, rfpath);
+}
+
+static u32 _rtl92ee_phy_rf_serial_read(struct ieee80211_hw *hw,
+                                       enum radio_path rfpath, u32 offset)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
+        u32 newoffset;
+        u32 tmplong, tmplong2;
+        u8 rfpi_enable = 0;
+        u32 retvalue;
+
+        offset &= 0xff;
+        newoffset = offset;
+        if (RT_CANNOT_IO(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "return all one\n");
+                return 0xFFFFFFFF;
+        }
+        tmplong = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD);
+        if (rfpath == RF90_PATH_A)
+                tmplong2 = tmplong;
+        else
+                tmplong2 = rtl_get_bbreg(hw, pphyreg->rfhssi_para2, MASKDWORD);
+        tmplong2 = (tmplong2 & (~BLSSIREADADDRESS)) |
+                   (newoffset << 23) | BLSSIREADEDGE;
+        rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
+                      tmplong & (~BLSSIREADEDGE));
+        mdelay(1);
+        rtl_set_bbreg(hw, pphyreg->rfhssi_para2, MASKDWORD, tmplong2);
+        mdelay(2);
+        if (rfpath == RF90_PATH_A)
+                rfpi_enable = (u8)rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
+                                                BIT(8));
+        else if (rfpath == RF90_PATH_B)
+                rfpi_enable = (u8)rtl_get_bbreg(hw, RFPGA0_XB_HSSIPARAMETER1,
+                                                BIT(8));
+        if (rfpi_enable)
+                retvalue = rtl_get_bbreg(hw, pphyreg->rf_rbpi,
+                                         BLSSIREADBACKDATA);
+        else
+                retvalue = rtl_get_bbreg(hw, pphyreg->rf_rb,
+                                         BLSSIREADBACKDATA);
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "RFR-%d Addr[0x%x]=0x%x\n",
+                  rfpath, pphyreg->rf_rb, retvalue);
+        return retvalue;
+}
+
+static void _rtl92ee_phy_rf_serial_write(struct ieee80211_hw *hw,
+                                         enum radio_path rfpath, u32 offset,
+                                         u32 data)
+{
+        u32 data_and_addr;
+        u32 newoffset;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
+
+        if (RT_CANNOT_IO(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "stop\n");
+                return;
+        }
+        offset &= 0xff;
+        newoffset = offset;
+        data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
+        rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "RFW-%d Addr[0x%x]=0x%x\n", rfpath,
+                 pphyreg->rf3wire_offset, data_and_addr);
+}
+
+static u32 _rtl92ee_phy_calculate_bit_shift(u32 bitmask)
+{
+        u32 i;
+
+        for (i = 0; i <= 31; i++) {
+                if (((bitmask >> i) & 0x1) == 1)
+                        break;
+        }
+        return i;
+}
+
+bool rtl92ee_phy_mac_config(struct ieee80211_hw *hw)
+{
+        return _rtl92ee_phy_config_mac_with_headerfile(hw);
+}
+
+bool rtl92ee_phy_bb_config(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        bool rtstatus = true;
+        u16 regval;
+        u32 tmp;
+        u8 crystal_cap;
+
+        phy_init_bb_rf_register_def(hw);
+        regval = rtl_read_word(rtlpriv, REG_SYS_FUNC_EN);
+        rtl_write_word(rtlpriv, REG_SYS_FUNC_EN,
+                       regval | BIT(13) | BIT(0) | BIT(1));
+
+        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);
+
+        rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80);
+
+        tmp = rtl_read_dword(rtlpriv, 0x4c);
+        rtl_write_dword(rtlpriv, 0x4c, tmp | BIT(23));
+
+        rtstatus = _rtl92ee_phy_bb8192ee_config_parafile(hw);
+
+        crystal_cap = rtlpriv->efuse.eeprom_crystalcap & 0x3F;
+        rtl_set_bbreg(hw, REG_MAC_PHY_CTRL, 0xFFF000,
+                      (crystal_cap | (crystal_cap << 6)));
+        return rtstatus;
+}
+
+bool rtl92ee_phy_rf_config(struct ieee80211_hw *hw)
+{
+        return rtl92ee_phy_rf6052_config(hw);
+}
+
+static bool _check_condition(struct ieee80211_hw *hw,
+                             const u32  condition)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u32 _board = rtlefuse->board_type; /*need efuse define*/
+        u32 _interface = rtlhal->interface;
+        u32 _platform = 0x08;/*SupportPlatform */
+        u32 cond = condition;
+
+        if (condition == 0xCDCDCDCD)
+                return true;
+
+        cond = condition & 0xFF;
+        if ((_board != cond) && (cond != 0xFF))
+                return false;
+
+        cond = condition & 0xFF00;
+        cond = cond >> 8;
+        if ((_interface & cond) == 0 && cond != 0x07)
+                return false;
+
+        cond = condition & 0xFF0000;
+        cond = cond >> 16;
+        if ((_platform & cond) == 0 && cond != 0x0F)
+                return false;
+
+        return true;
+}
+
+static void _rtl92ee_config_rf_reg(struct ieee80211_hw *hw, u32 addr, u32 data,
+                                   enum radio_path rfpath, u32 regaddr)
+{
+        if (addr == 0xfe || addr == 0xffe) {
+                mdelay(50);
+        } else {
+                rtl_set_rfreg(hw, rfpath, regaddr, RFREG_OFFSET_MASK, data);
+                udelay(1);
+
+                if (addr == 0xb6) {
+                        u32 getvalue;
+                        u8 count = 0;
+
+                        getvalue = rtl_get_rfreg(hw, rfpath, addr, MASKDWORD);
+                        udelay(1);
+
+                        while ((getvalue >> 8) != (data >> 8)) {
+                                count++;
+                                rtl_set_rfreg(hw, rfpath, regaddr,
+                                              RFREG_OFFSET_MASK, data);
+                                udelay(1);
+                                getvalue = rtl_get_rfreg(hw, rfpath, addr,
+                                                         MASKDWORD);
+                                if (count > 5)
+                                        break;
+                        }
+                }
+
+                if (addr == 0xb2) {
+                        u32 getvalue;
+                        u8 count = 0;
+
+                        getvalue = rtl_get_rfreg(hw, rfpath, addr, MASKDWORD);
+                        udelay(1);
+
+                        while (getvalue != data) {
+                                count++;
+                                rtl_set_rfreg(hw, rfpath, regaddr,
+                                              RFREG_OFFSET_MASK, data);
+                                udelay(1);
+                                rtl_set_rfreg(hw, rfpath, 0x18,
+                                              RFREG_OFFSET_MASK, 0x0fc07);
+                                udelay(1);
+                                getvalue = rtl_get_rfreg(hw, rfpath, addr,
+                                                         MASKDWORD);
+                                if (count > 5)
+                                        break;
+                        }
+                }
+        }
+}
+
+static void _rtl92ee_config_rf_radio_a(struct ieee80211_hw *hw,
+                                       u32 addr, u32 data)
+{
+        u32 content = 0x1000; /*RF Content: radio_a_txt*/
+        u32 maskforphyset = (u32)(content & 0xE000);
+
+        _rtl92ee_config_rf_reg(hw, addr, data, RF90_PATH_A,
+                               addr | maskforphyset);
+}
+
+static void _rtl92ee_config_rf_radio_b(struct ieee80211_hw *hw,
+                                       u32 addr, u32 data)
+{
+        u32 content = 0x1001; /*RF Content: radio_b_txt*/
+        u32 maskforphyset = (u32)(content & 0xE000);
+
+        _rtl92ee_config_rf_reg(hw, addr, data, RF90_PATH_B,
+                               addr | maskforphyset);
+}
+
+static void _rtl92ee_config_bb_reg(struct ieee80211_hw *hw,
+                                   u32 addr, u32 data)
+{
+        if (addr == 0xfe)
+                mdelay(50);
+        else if (addr == 0xfd)
+                mdelay(5);
+        else if (addr == 0xfc)
+                mdelay(1);
+        else if (addr == 0xfb)
+                udelay(50);
+        else if (addr == 0xfa)
+                udelay(5);
+        else if (addr == 0xf9)
+                udelay(1);
+        else
+                rtl_set_bbreg(hw, addr, MASKDWORD , data);
+
+        udelay(1);
+}
+
+static void _rtl92ee_phy_init_tx_power_by_rate(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        u8 band = BAND_ON_2_4G, rf = 0, txnum = 0, sec = 0;
+
+        for (; band <= BAND_ON_5G; ++band)
+                for (; rf < TX_PWR_BY_RATE_NUM_RF; ++rf)
+                        for (; txnum < TX_PWR_BY_RATE_NUM_RF; ++txnum)
+                                for (; sec < TX_PWR_BY_RATE_NUM_SECTION; ++sec)
+                                        rtlphy->tx_power_by_rate_offset
+                                             [band][rf][txnum][sec] = 0;
+}
+
+static void _rtl92ee_phy_set_txpower_by_rate_base(struct ieee80211_hw *hw,
+                                                  u8 band, u8 path,
+                                                  u8 rate_section, u8 txnum,
+                                                  u8 value)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        if (path > RF90_PATH_D) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Invalid Rf Path %d\n", path);
+                return;
+        }
+
+        if (band == BAND_ON_2_4G) {
+                switch (rate_section) {
+                case CCK:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][0] = value;
+                        break;
+                case OFDM:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][1] = value;
+                        break;
+                case HT_MCS0_MCS7:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][2] = value;
+                        break;
+                case HT_MCS8_MCS15:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][3] = value;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Invalid RateSection %d in 2.4G,Rf %d,%dTx\n",
+                                  rate_section, path, txnum);
+                        break;
+                };
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Invalid Band %d\n", band);
+        }
+}
+
+static u8 _rtl92ee_phy_get_txpower_by_rate_base(struct ieee80211_hw *hw,
+                                                u8 band, u8 path, u8 txnum,
+                                                u8 rate_section)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 value = 0;
+
+        if (path > RF90_PATH_D) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Invalid Rf Path %d\n", path);
+                return 0;
+        }
+
+        if (band == BAND_ON_2_4G) {
+                switch (rate_section) {
+                case CCK:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][0];
+                        break;
+                case OFDM:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][1];
+                        break;
+                case HT_MCS0_MCS7:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][2];
+                        break;
+                case HT_MCS8_MCS15:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][3];
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Invalid RateSection %d in 2.4G,Rf %d,%dTx\n",
+                                  rate_section, path, txnum);
+                        break;
+                };
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Invalid Band %d()\n", band);
+        }
+        return value;
+}
+
+static void _rtl92ee_phy_store_txpower_by_rate_base(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u16 raw = 0;
+        u8 base = 0, path = 0;
+
+        for (path = RF90_PATH_A; path <= RF90_PATH_B; ++path) {
+                if (path == RF90_PATH_A) {
+                        raw = (u16)(rtlphy->tx_power_by_rate_offset
+                                    [BAND_ON_2_4G][path][RF_1TX][3] >> 24) &
+                                    0xFF;
+                        base = (raw >> 4) * 10 + (raw & 0xF);
+                        _rtl92ee_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G,
+                                                              path, CCK, RF_1TX,
+                                                              base);
+                } else if (path == RF90_PATH_B) {
+                        raw = (u16)(rtlphy->tx_power_by_rate_offset
+                                    [BAND_ON_2_4G][path][RF_1TX][3] >> 0) &
+                                    0xFF;
+                        base = (raw >> 4) * 10 + (raw & 0xF);
+                        _rtl92ee_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G,
+                                                              path, CCK, RF_1TX,
+                                                              base);
+                }
+                raw = (u16)(rtlphy->tx_power_by_rate_offset
+                            [BAND_ON_2_4G][path][RF_1TX][1] >> 24) & 0xFF;
+                base = (raw >> 4) * 10 + (raw & 0xF);
+                _rtl92ee_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path,
+                                                      OFDM, RF_1TX, base);
+
+                raw = (u16)(rtlphy->tx_power_by_rate_offset
+                            [BAND_ON_2_4G][path][RF_1TX][5] >> 24) & 0xFF;
+                base = (raw >> 4) * 10 + (raw & 0xF);
+                _rtl92ee_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path,
+                                                      HT_MCS0_MCS7, RF_1TX,
+                                                      base);
+
+                raw = (u16)(rtlphy->tx_power_by_rate_offset
+                            [BAND_ON_2_4G][path][RF_2TX][7] >> 24) & 0xFF;
+                base = (raw >> 4) * 10 + (raw & 0xF);
+                _rtl92ee_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path,
+                                                      HT_MCS8_MCS15, RF_2TX,
+                                                      base);
+        }
+}
+
+static void _phy_convert_txpower_dbm_to_relative_value(u32 *data, u8 start,
+                                                       u8 end, u8 base)
+{
+        char i = 0;
+        u8 tmp = 0;
+        u32 temp_data = 0;
+
+        for (i = 3; i >= 0; --i) {
+                if (i >= start && i <= end) {
+                        /* Get the exact value */
+                        tmp = (u8)(*data >> (i * 8)) & 0xF;
+                        tmp += ((u8)((*data >> (i * 8 + 4)) & 0xF)) * 10;
+
+                        /* Change the value to a relative value */
+                        tmp = (tmp > base) ? tmp - base : base - tmp;
+                } else {
+                        tmp = (u8)(*data >> (i * 8)) & 0xFF;
+                }
+                temp_data <<= 8;
+                temp_data |= tmp;
+        }
+        *data = temp_data;
+}
+
+static void phy_convert_txpwr_dbm_to_rel_val(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 base = 0, rf = 0, band = BAND_ON_2_4G;
+
+        for (rf = RF90_PATH_A; rf <= RF90_PATH_B; ++rf) {
+                if (rf == RF90_PATH_A) {
+                        base = _rtl92ee_phy_get_txpower_by_rate_base(hw, band,
+                                                                     rf, RF_1TX,
+                                                                     CCK);
+                        _phy_convert_txpower_dbm_to_relative_value(
+                                &rtlphy->tx_power_by_rate_offset
+                                [band][rf][RF_1TX][2],
+                                1, 1, base);
+                        _phy_convert_txpower_dbm_to_relative_value(
+                                &rtlphy->tx_power_by_rate_offset
+                                [band][rf][RF_1TX][3],
+                                1, 3, base);
+                } else if (rf == RF90_PATH_B) {
+                        base = _rtl92ee_phy_get_txpower_by_rate_base(hw, band,
+                                                                     rf, RF_1TX,
+                                                                     CCK);
+                        _phy_convert_txpower_dbm_to_relative_value(
+                                &rtlphy->tx_power_by_rate_offset
+                                [band][rf][RF_1TX][3],
+                                0, 0, base);
+                        _phy_convert_txpower_dbm_to_relative_value(
+                                &rtlphy->tx_power_by_rate_offset
+                                [band][rf][RF_1TX][2],
+                                1, 3, base);
+                }
+                base = _rtl92ee_phy_get_txpower_by_rate_base(hw, band, rf,
+                                                             RF_1TX, OFDM);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &rtlphy->tx_power_by_rate_offset[band][rf][RF_1TX][0],
+                        0, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &rtlphy->tx_power_by_rate_offset[band][rf][RF_1TX][1],
+                        0, 3, base);
+
+                base = _rtl92ee_phy_get_txpower_by_rate_base(hw, band, rf,
+                                                             RF_1TX,
+                                                             HT_MCS0_MCS7);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &rtlphy->tx_power_by_rate_offset[band][rf][RF_1TX][4],
+                        0, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &rtlphy->tx_power_by_rate_offset[band][rf][RF_1TX][5],
+                        0, 3, base);
+
+                base = _rtl92ee_phy_get_txpower_by_rate_base(hw, band, rf,
+                                                             RF_2TX,
+                                                             HT_MCS8_MCS15);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &rtlphy->tx_power_by_rate_offset[band][rf][RF_2TX][6],
+                        0, 3, base);
+
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &rtlphy->tx_power_by_rate_offset[band][rf][RF_2TX][7],
+                        0, 3, base);
+        }
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
+                 "<==phy_convert_txpwr_dbm_to_rel_val()\n");
+}
+
+static void _rtl92ee_phy_txpower_by_rate_configuration(struct ieee80211_hw *hw)
+{
+        _rtl92ee_phy_store_txpower_by_rate_base(hw);
+        phy_convert_txpwr_dbm_to_rel_val(hw);
+}
+
+static bool _rtl92ee_phy_bb8192ee_config_parafile(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));
+        bool rtstatus;
+
+        rtstatus = phy_config_bb_with_hdr_file(hw, BASEBAND_CONFIG_PHY_REG);
+        if (!rtstatus) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!");
+                return false;
+        }
+
+        _rtl92ee_phy_init_tx_power_by_rate(hw);
+        if (!rtlefuse->autoload_failflag) {
+                rtlphy->pwrgroup_cnt = 0;
+                rtstatus =
+                  phy_config_bb_with_pghdrfile(hw, BASEBAND_CONFIG_PHY_REG);
+        }
+        _rtl92ee_phy_txpower_by_rate_configuration(hw);
+        if (!rtstatus) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!");
+                return false;
+        }
+        rtstatus = phy_config_bb_with_hdr_file(hw, BASEBAND_CONFIG_AGC_TAB);
+        if (!rtstatus) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
+                return false;
+        }
+        rtlphy->cck_high_power = (bool)(rtl_get_bbreg(hw,
+                                                      RFPGA0_XA_HSSIPARAMETER2,
+                                                      0x200));
+
+        return true;
+}
+
+static bool _rtl92ee_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+        u32 arraylength;
+        u32 *ptrarray;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl8192EMACPHY_Array\n");
+        arraylength = RTL8192EE_MAC_ARRAY_LEN;
+        ptrarray = RTL8192EE_MAC_ARRAY;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Img:RTL8192EE_MAC_ARRAY LEN %d\n" , arraylength);
+        for (i = 0; i < arraylength; i = i + 2)
+                rtl_write_byte(rtlpriv, ptrarray[i], (u8)ptrarray[i + 1]);
+        return true;
+}
+
+#define READ_NEXT_PAIR(v1, v2, i) \
+        do { \
+                i += 2; \
+                v1 = array[i]; \
+                v2 = array[i+1]; \
+        } while (0)
+
+static bool phy_config_bb_with_hdr_file(struct ieee80211_hw *hw,
+                                        u8 configtype)
+{
+        int i;
+        u32 *array;
+        u16 len;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 v1 = 0, v2 = 0;
+
+        if (configtype == BASEBAND_CONFIG_PHY_REG) {
+                len = RTL8192EE_PHY_REG_ARRAY_LEN;
+                array = RTL8192EE_PHY_REG_ARRAY;
+
+                for (i = 0; i < len; i = i + 2) {
+                        v1 = array[i];
+                        v2 = array[i+1];
+                        if (v1 < 0xcdcdcdcd) {
+                                _rtl92ee_config_bb_reg(hw, v1, v2);
+                        } else {/*This line is the start line of branch.*/
+                                /* to protect READ_NEXT_PAIR not overrun */
+                                if (i >= len - 2)
+                                        break;
+
+                                if (!_check_condition(hw , array[i])) {
+                                        /*Discard the following pairs*/
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < len - 2) {
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                        }
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {
+                                        /* Configure matched pairs and
+                                         * skip to end of if-else.
+                                         */
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < len - 2) {
+                                                _rtl92ee_config_bb_reg(hw, v1,
+                                                                       v2);
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < len - 2)
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                }
+                        }
+                }
+        } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
+                len = RTL8192EE_AGC_TAB_ARRAY_LEN;
+                array = RTL8192EE_AGC_TAB_ARRAY;
+
+                for (i = 0; i < len; i = i + 2) {
+                        v1 = array[i];
+                        v2 = array[i+1];
+                        if (v1 < 0xCDCDCDCD) {
+                                rtl_set_bbreg(hw, array[i], MASKDWORD,
+                                              array[i + 1]);
+                                udelay(1);
+                                continue;
+                    } else{/*This line is the start line of branch.*/
+                          /* to protect READ_NEXT_PAIR not overrun */
+                                if (i >= len - 2)
+                                        break;
+
+                                if (!_check_condition(hw , array[i])) {
+                                        /*Discard the following pairs*/
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < len - 2) {
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                        }
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {
+                                        /* Configure matched pairs and
+                                         * skip to end of if-else.
+                                         */
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < len - 2) {
+                                                rtl_set_bbreg(hw,
+                                                              array[i],
+                                                              MASKDWORD,
+                                                              array[i + 1]);
+                                                udelay(1);
+                                                READ_NEXT_PAIR(v1 , v2 , i);
+                                        }
+
+                                        while (v2 != 0xDEAD &&
+                                               i < len - 2) {
+                                                READ_NEXT_PAIR(v1 , v2 , i);
+                                        }
+                                }
+                        }
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                 "The agctab_array_table[0] is %x Rtl818EEPHY_REGArray[1] is %x\n",
+                                 array[i],
+                                 array[i + 1]);
+                }
+        }
+        return true;
+}
+
+static u8 _rtl92ee_get_rate_section_index(u32 regaddr)
+{
+        u8 index = 0;
+
+        switch (regaddr) {
+        case RTXAGC_A_RATE18_06:
+        case RTXAGC_B_RATE18_06:
+                index = 0;
+                break;
+        case RTXAGC_A_RATE54_24:
+        case RTXAGC_B_RATE54_24:
+                index = 1;
+                break;
+        case RTXAGC_A_CCK1_MCS32:
+        case RTXAGC_B_CCK1_55_MCS32:
+                index = 2;
+                break;
+        case RTXAGC_B_CCK11_A_CCK2_11:
+                index = 3;
+                break;
+        case RTXAGC_A_MCS03_MCS00:
+        case RTXAGC_B_MCS03_MCS00:
+                index = 4;
+                break;
+        case RTXAGC_A_MCS07_MCS04:
+        case RTXAGC_B_MCS07_MCS04:
+                index = 5;
+                break;
+        case RTXAGC_A_MCS11_MCS08:
+        case RTXAGC_B_MCS11_MCS08:
+                index = 6;
+                break;
+        case RTXAGC_A_MCS15_MCS12:
+        case RTXAGC_B_MCS15_MCS12:
+                index = 7;
+                break;
+        default:
+                regaddr &= 0xFFF;
+                if (regaddr >= 0xC20 && regaddr <= 0xC4C)
+                        index = (u8)((regaddr - 0xC20) / 4);
+                else if (regaddr >= 0xE20 && regaddr <= 0xE4C)
+                        index = (u8)((regaddr - 0xE20) / 4);
+                break;
+        };
+        return index;
+}
+
+static void _rtl92ee_store_tx_power_by_rate(struct ieee80211_hw *hw,
+                                            enum band_type band,
+                                            enum radio_path rfpath,
+                                            u32 txnum, u32 regaddr,
+                                            u32 bitmask, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 section = _rtl92ee_get_rate_section_index(regaddr);
+
+        if (band != BAND_ON_2_4G && band != BAND_ON_5G) {
+                RT_TRACE(rtlpriv, FPHY, PHY_TXPWR, "Invalid Band %d\n", band);
+                return;
+        }
+
+        if (rfpath > MAX_RF_PATH - 1) {
+                RT_TRACE(rtlpriv, FPHY, PHY_TXPWR,
+                         "Invalid RfPath %d\n", rfpath);
+                return;
+        }
+        if (txnum > MAX_RF_PATH - 1) {
+                RT_TRACE(rtlpriv, FPHY, PHY_TXPWR, "Invalid TxNum %d\n", txnum);
+                return;
+        }
+
+        rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][section] = data;
+}
+
+static bool phy_config_bb_with_pghdrfile(struct ieee80211_hw *hw,
+                                         u8 configtype)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int i;
+        u32 *phy_regarray_table_pg;
+        u16 phy_regarray_pg_len;
+        u32 v1 = 0, v2 = 0, v3 = 0, v4 = 0, v5 = 0, v6 = 0;
+
+        phy_regarray_pg_len = RTL8192EE_PHY_REG_ARRAY_PG_LEN;
+        phy_regarray_table_pg = RTL8192EE_PHY_REG_ARRAY_PG;
+
+        if (configtype == BASEBAND_CONFIG_PHY_REG) {
+                for (i = 0; i < phy_regarray_pg_len; i = i + 6) {
+                        v1 = phy_regarray_table_pg[i];
+                        v2 = phy_regarray_table_pg[i+1];
+                        v3 = phy_regarray_table_pg[i+2];
+                        v4 = phy_regarray_table_pg[i+3];
+                        v5 = phy_regarray_table_pg[i+4];
+                        v6 = phy_regarray_table_pg[i+5];
+
+                        if (v1 < 0xcdcdcdcd) {
+                                _rtl92ee_store_tx_power_by_rate(hw, v1, v2, v3,
+                                                                v4, v5, v6);
+                                continue;
+                        }
+                }
+        } else {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "configtype != BaseBand_Config_PHY_REG\n");
+        }
+        return true;
+}
+
+#define READ_NEXT_RF_PAIR(v1, v2, i) \
+        do { \
+                i += 2; \
+                v1 = array[i]; \
+                v2 = array[i+1]; \
+        } while (0)
+
+bool rtl92ee_phy_config_rf_with_headerfile(struct ieee80211_hw  *hw,
+                                           enum radio_path rfpath)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int i;
+        u32 *array;
+        u16 len;
+        u32 v1 = 0, v2 = 0;
+
+        switch (rfpath) {
+        case RF90_PATH_A:
+                len = RTL8192EE_RADIOA_ARRAY_LEN;
+                array = RTL8192EE_RADIOA_ARRAY;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Radio_A:RTL8192EE_RADIOA_ARRAY %d\n" , len);
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
+                for (i = 0; i < len; i = i + 2) {
+                        v1 = array[i];
+                        v2 = array[i+1];
+                        if (v1 < 0xcdcdcdcd) {
+                                _rtl92ee_config_rf_radio_a(hw, v1, v2);
+                                continue;
+                        } else {/*This line is the start line of branch.*/
+                                /* to protect READ_NEXT_PAIR not overrun */
+                                if (i >= len - 2)
+                                        break;
+
+                                if (!_check_condition(hw , array[i])) {
+                                        /*Discard the following pairs*/
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < len - 2) {
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                        }
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {
+                                        /* Configure matched pairs and
+                                         * skip to end of if-else.
+                                         */
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < len - 2) {
+                                                _rtl92ee_config_rf_radio_a(hw,
+                                                                           v1,
+                                                                           v2);
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < len - 2)
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                }
+                        }
+                }
+                break;
+
+        case RF90_PATH_B:
+                len = RTL8192EE_RADIOB_ARRAY_LEN;
+                array = RTL8192EE_RADIOB_ARRAY;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Radio_A:RTL8192EE_RADIOB_ARRAY %d\n" , len);
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
+                for (i = 0; i < len; i = i + 2) {
+                        v1 = array[i];
+                        v2 = array[i+1];
+                        if (v1 < 0xcdcdcdcd) {
+                                _rtl92ee_config_rf_radio_b(hw, v1, v2);
+                                continue;
+                        } else {/*This line is the start line of branch.*/
+                                /* to protect READ_NEXT_PAIR not overrun */
+                                if (i >= len - 2)
+                                        break;
+
+                                if (!_check_condition(hw , array[i])) {
+                                        /*Discard the following pairs*/
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < len - 2) {
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                        }
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {
+                                        /* Configure matched pairs and
+                                         * skip to end of if-else.
+                                         */
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < len - 2) {
+                                                _rtl92ee_config_rf_radio_b(hw,
+                                                                           v1,
+                                                                           v2);
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < len - 2)
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                }
+                        }
+                }
+                break;
+        case RF90_PATH_C:
+        case RF90_PATH_D:
+                break;
+        }
+        return true;
+}
+
+void rtl92ee_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        rtlphy->default_initialgain[0] =
+                (u8)rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[1] =
+                (u8)rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[2] =
+                (u8)rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[3] =
+                (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+                  rtlphy->default_initialgain[0],
+                  rtlphy->default_initialgain[1],
+                  rtlphy->default_initialgain[2],
+                  rtlphy->default_initialgain[3]);
+
+        rtlphy->framesync = (u8)rtl_get_bbreg(hw,
+                                              ROFDM0_RXDETECTOR3, MASKBYTE0);
+        rtlphy->framesync_c34 = rtl_get_bbreg(hw,
+                                              ROFDM0_RXDETECTOR2, MASKDWORD);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Default framesync (0x%x) = 0x%x\n",
+                  ROFDM0_RXDETECTOR3, rtlphy->framesync);
+}
+
+static void phy_init_bb_rf_register_def(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfs = RFPGA0_XAB_RFINTERFACESW;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfs = RFPGA0_XAB_RFINTERFACESW;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfo = RFPGA0_XA_RFINTERFACEOE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfo = RFPGA0_XB_RFINTERFACEOE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfe = RFPGA0_XA_RFINTERFACEOE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfe = RFPGA0_XB_RFINTERFACEOE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf3wire_offset =
+                                                        RFPGA0_XA_LSSIPARAMETER;
+        rtlphy->phyreg_def[RF90_PATH_B].rf3wire_offset =
+                                                        RFPGA0_XB_LSSIPARAMETER;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfhssi_para2 = RFPGA0_XA_HSSIPARAMETER2;
+        rtlphy->phyreg_def[RF90_PATH_B].rfhssi_para2 = RFPGA0_XB_HSSIPARAMETER2;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf_rb = RFPGA0_XA_LSSIREADBACK;
+        rtlphy->phyreg_def[RF90_PATH_B].rf_rb = RFPGA0_XB_LSSIREADBACK;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf_rbpi = TRANSCEIVEA_HSPI_READBACK;
+        rtlphy->phyreg_def[RF90_PATH_B].rf_rbpi = TRANSCEIVEB_HSPI_READBACK;
+}
+
+void rtl92ee_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 txpwr_level;
+        long txpwr_dbm;
+
+        txpwr_level = rtlphy->cur_cck_txpwridx;
+        txpwr_dbm = _rtl92ee_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_B,
+                                                  txpwr_level);
+        txpwr_level = rtlphy->cur_ofdm24g_txpwridx;
+        if (_rtl92ee_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G, txpwr_level) >
+            txpwr_dbm)
+                txpwr_dbm = _rtl92ee_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G,
+                                                          txpwr_level);
+        txpwr_level = rtlphy->cur_ofdm24g_txpwridx;
+        if (_rtl92ee_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_N_24G,
+                                          txpwr_level) > txpwr_dbm)
+                txpwr_dbm = _rtl92ee_phy_txpwr_idx_to_dbm(hw,
+                                                          WIRELESS_MODE_N_24G,
+                                                          txpwr_level);
+        *powerlevel = txpwr_dbm;
+}
+
+static u8 _rtl92ee_phy_get_ratesection_intxpower_byrate(enum radio_path path,
+                                                        u8 rate)
+{
+        u8 rate_section = 0;
+
+        switch (rate) {
+        case DESC92C_RATE1M:
+                rate_section = 2;
+                break;
+        case DESC92C_RATE2M:
+        case DESC92C_RATE5_5M:
+                if (path == RF90_PATH_A)
+                        rate_section = 3;
+                else if (path == RF90_PATH_B)
+                        rate_section = 2;
+                break;
+        case DESC92C_RATE11M:
+                rate_section = 3;
+                break;
+        case DESC92C_RATE6M:
+        case DESC92C_RATE9M:
+        case DESC92C_RATE12M:
+        case DESC92C_RATE18M:
+                rate_section = 0;
+                break;
+        case DESC92C_RATE24M:
+        case DESC92C_RATE36M:
+        case DESC92C_RATE48M:
+        case DESC92C_RATE54M:
+                rate_section = 1;
+                break;
+        case DESC92C_RATEMCS0:
+        case DESC92C_RATEMCS1:
+        case DESC92C_RATEMCS2:
+        case DESC92C_RATEMCS3:
+                rate_section = 4;
+                break;
+        case DESC92C_RATEMCS4:
+        case DESC92C_RATEMCS5:
+        case DESC92C_RATEMCS6:
+        case DESC92C_RATEMCS7:
+                rate_section = 5;
+                break;
+        case DESC92C_RATEMCS8:
+        case DESC92C_RATEMCS9:
+        case DESC92C_RATEMCS10:
+        case DESC92C_RATEMCS11:
+                rate_section = 6;
+                break;
+        case DESC92C_RATEMCS12:
+        case DESC92C_RATEMCS13:
+        case DESC92C_RATEMCS14:
+        case DESC92C_RATEMCS15:
+                rate_section = 7;
+                break;
+        default:
+                RT_ASSERT(true, "Rate_Section is Illegal\n");
+                break;
+        }
+        return rate_section;
+}
+
+static u8 _rtl92ee_get_txpower_by_rate(struct ieee80211_hw *hw,
+                                       enum band_type band,
+                                       enum radio_path rf, u8 rate)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 shift = 0, sec, tx_num;
+        char diff = 0;
+
+        sec = _rtl92ee_phy_get_ratesection_intxpower_byrate(rf, rate);
+        tx_num = RF_TX_NUM_NONIMPLEMENT;
+
+        if (tx_num == RF_TX_NUM_NONIMPLEMENT) {
+                if ((rate >= DESC92C_RATEMCS8 && rate <= DESC92C_RATEMCS15))
+                        tx_num = RF_2TX;
+                else
+                        tx_num = RF_1TX;
+        }
+
+        switch (rate) {
+        case DESC92C_RATE1M:
+        case DESC92C_RATE6M:
+        case DESC92C_RATE24M:
+        case DESC92C_RATEMCS0:
+        case DESC92C_RATEMCS4:
+        case DESC92C_RATEMCS8:
+        case DESC92C_RATEMCS12:
+                shift = 0;
+                break;
+        case DESC92C_RATE2M:
+        case DESC92C_RATE9M:
+        case DESC92C_RATE36M:
+        case DESC92C_RATEMCS1:
+        case DESC92C_RATEMCS5:
+        case DESC92C_RATEMCS9:
+        case DESC92C_RATEMCS13:
+                shift = 8;
+                break;
+        case DESC92C_RATE5_5M:
+        case DESC92C_RATE12M:
+        case DESC92C_RATE48M:
+        case DESC92C_RATEMCS2:
+        case DESC92C_RATEMCS6:
+        case DESC92C_RATEMCS10:
+        case DESC92C_RATEMCS14:
+                shift = 16;
+                break;
+        case DESC92C_RATE11M:
+        case DESC92C_RATE18M:
+        case DESC92C_RATE54M:
+        case DESC92C_RATEMCS3:
+        case DESC92C_RATEMCS7:
+        case DESC92C_RATEMCS11:
+        case DESC92C_RATEMCS15:
+                shift = 24;
+                break;
+        default:
+                RT_ASSERT(true, "Rate_Section is Illegal\n");
+                break;
+        }
+
+        diff = (u8)(rtlphy->tx_power_by_rate_offset[band][rf][tx_num][sec] >>
+                    shift) & 0xff;
+
+        return  diff;
+}
+
+static u8 _rtl92ee_get_txpower_index(struct ieee80211_hw *hw,
+                                     enum radio_path rfpath, u8 rate,
+                                     u8 bw, u8 channel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv);
+        u8 index = (channel - 1);
+        u8 tx_power = 0;
+        u8 diff = 0;
+
+        if (channel < 1 || channel > 14) {
+                index = 0;
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_DMESG,
+                         "Illegal channel!!\n");
+        }
+
+        if (IS_CCK_RATE(rate))
+                tx_power = rtlefuse->txpwrlevel_cck[rfpath][index];
+        else if (DESC92C_RATE6M <= rate)
+                tx_power = rtlefuse->txpwrlevel_ht40_1s[rfpath][index];
+
+        /* OFDM-1T*/
+        if (DESC92C_RATE6M <= rate && rate <= DESC92C_RATE54M &&
+            !IS_CCK_RATE(rate))
+                tx_power += rtlefuse->txpwr_legacyhtdiff[rfpath][TX_1S];
+
+        /* BW20-1S, BW20-2S */
+        if (bw == HT_CHANNEL_WIDTH_20) {
+                if (DESC92C_RATEMCS0 <= rate && rate <= DESC92C_RATEMCS15)
+                        tx_power += rtlefuse->txpwr_ht20diff[rfpath][TX_1S];
+                if (DESC92C_RATEMCS8 <= rate && rate <= DESC92C_RATEMCS15)
+                        tx_power += rtlefuse->txpwr_ht20diff[rfpath][TX_2S];
+        } else if (bw == HT_CHANNEL_WIDTH_20_40) {/* BW40-1S, BW40-2S */
+                if (DESC92C_RATEMCS0 <= rate && rate <= DESC92C_RATEMCS15)
+                        tx_power += rtlefuse->txpwr_ht40diff[rfpath][TX_1S];
+                if (DESC92C_RATEMCS8 <= rate && rate <= DESC92C_RATEMCS15)
+                        tx_power += rtlefuse->txpwr_ht40diff[rfpath][TX_2S];
+        }
+
+        if (rtlefuse->eeprom_regulatory != 2)
+                diff = _rtl92ee_get_txpower_by_rate(hw, BAND_ON_2_4G,
+                                                    rfpath, rate);
+
+        tx_power += diff;
+
+        if (tx_power > MAX_POWER_INDEX)
+                tx_power = MAX_POWER_INDEX;
+
+        return tx_power;
+}
+
+static void _rtl92ee_set_txpower_index(struct ieee80211_hw *hw, u8 pwr_idx,
+                                       enum radio_path rfpath, u8 rate)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rfpath == RF90_PATH_A) {
+                switch (rate) {
+                case DESC92C_RATE1M:
+                        rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE2M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE5_5M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE11M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE6M:
+                        rtl_set_bbreg(hw, RTXAGC_A_RATE18_06, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE9M:
+                        rtl_set_bbreg(hw, RTXAGC_A_RATE18_06, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE12M:
+                        rtl_set_bbreg(hw, RTXAGC_A_RATE18_06, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE18M:
+                        rtl_set_bbreg(hw, RTXAGC_A_RATE18_06, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE24M:
+                        rtl_set_bbreg(hw, RTXAGC_A_RATE54_24, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE36M:
+                        rtl_set_bbreg(hw, RTXAGC_A_RATE54_24, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE48M:
+                        rtl_set_bbreg(hw, RTXAGC_A_RATE54_24, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE54M:
+                        rtl_set_bbreg(hw, RTXAGC_A_RATE54_24, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS0:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS03_MCS00, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS1:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS03_MCS00, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS2:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS03_MCS00, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS3:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS03_MCS00, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS4:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS07_MCS04, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS5:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS07_MCS04, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS6:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS07_MCS04, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS7:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS07_MCS04, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS8:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS11_MCS08, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS9:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS11_MCS08, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS10:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS11_MCS08, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS11:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS11_MCS08, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS12:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS15_MCS12, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS13:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS15_MCS12, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS14:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS15_MCS12, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS15:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS15_MCS12, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                 "Invalid Rate!!\n");
+                        break;
+                }
+        } else if (rfpath == RF90_PATH_B) {
+                switch (rate) {
+                case DESC92C_RATE1M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE2M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE5_5M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE11M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE6M:
+                        rtl_set_bbreg(hw, RTXAGC_B_RATE18_06, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE9M:
+                        rtl_set_bbreg(hw, RTXAGC_B_RATE18_06, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE12M:
+                        rtl_set_bbreg(hw, RTXAGC_B_RATE18_06, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE18M:
+                        rtl_set_bbreg(hw, RTXAGC_B_RATE18_06, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE24M:
+                        rtl_set_bbreg(hw, RTXAGC_B_RATE54_24, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE36M:
+                        rtl_set_bbreg(hw, RTXAGC_B_RATE54_24, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE48M:
+                        rtl_set_bbreg(hw, RTXAGC_B_RATE54_24, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATE54M:
+                        rtl_set_bbreg(hw, RTXAGC_B_RATE54_24, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS0:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS03_MCS00, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS1:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS03_MCS00, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS2:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS03_MCS00, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS3:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS03_MCS00, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS4:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS07_MCS04, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS5:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS07_MCS04, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS6:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS07_MCS04, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS7:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS07_MCS04, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS8:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS11_MCS08, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS9:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS11_MCS08, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS10:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS11_MCS08, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS11:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS11_MCS08, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS12:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS15_MCS12, MASKBYTE0,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS13:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS15_MCS12, MASKBYTE1,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS14:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS15_MCS12, MASKBYTE2,
+                                      pwr_idx);
+                        break;
+                case DESC92C_RATEMCS15:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS15_MCS12, MASKBYTE3,
+                                      pwr_idx);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                 "Invalid Rate!!\n");
+                        break;
+                }
+        } else {
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Invalid RFPath!!\n");
+        }
+}
+
+static void phy_set_txpower_index_by_rate_array(struct ieee80211_hw *hw,
+                                                enum radio_path rfpath, u8 bw,
+                                                u8 channel, u8 *rates, u8 size)
+{
+        u8 i;
+        u8 power_index;
+
+        for (i = 0; i < size; i++) {
+                power_index = _rtl92ee_get_txpower_index(hw, rfpath, rates[i],
+                                                         bw, channel);
+                _rtl92ee_set_txpower_index(hw, power_index, rfpath, rates[i]);
+        }
+}
+
+static void phy_set_txpower_index_by_rate_section(struct ieee80211_hw *hw,
+                                                  enum radio_path rfpath,
+                                                  u8 channel,
+                                                  enum rate_section section)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        if (section == CCK) {
+                u8 cck_rates[] = {DESC92C_RATE1M, DESC92C_RATE2M,
+                                  DESC92C_RATE5_5M, DESC92C_RATE11M};
+                if (rtlhal->current_bandtype == BAND_ON_2_4G)
+                        phy_set_txpower_index_by_rate_array(hw, rfpath,
+                                                        rtlphy->current_chan_bw,
+                                                        channel, cck_rates, 4);
+        } else if (section == OFDM) {
+                u8 ofdm_rates[] = {DESC92C_RATE6M, DESC92C_RATE9M,
+                                   DESC92C_RATE12M, DESC92C_RATE18M,
+                                   DESC92C_RATE24M, DESC92C_RATE36M,
+                                   DESC92C_RATE48M, DESC92C_RATE54M};
+                phy_set_txpower_index_by_rate_array(hw, rfpath,
+                                                    rtlphy->current_chan_bw,
+                                                    channel, ofdm_rates, 8);
+        } else if (section == HT_MCS0_MCS7) {
+                u8 ht_rates1t[]  = {DESC92C_RATEMCS0, DESC92C_RATEMCS1,
+                                    DESC92C_RATEMCS2, DESC92C_RATEMCS3,
+                                    DESC92C_RATEMCS4, DESC92C_RATEMCS5,
+                                    DESC92C_RATEMCS6, DESC92C_RATEMCS7};
+                phy_set_txpower_index_by_rate_array(hw, rfpath,
+                                                    rtlphy->current_chan_bw,
+                                                    channel, ht_rates1t, 8);
+        } else if (section == HT_MCS8_MCS15) {
+                u8 ht_rates2t[]  = {DESC92C_RATEMCS8, DESC92C_RATEMCS9,
+                                    DESC92C_RATEMCS10, DESC92C_RATEMCS11,
+                                    DESC92C_RATEMCS12, DESC92C_RATEMCS13,
+                                    DESC92C_RATEMCS14, DESC92C_RATEMCS15};
+                phy_set_txpower_index_by_rate_array(hw, rfpath,
+                                                    rtlphy->current_chan_bw,
+                                                    channel, ht_rates2t, 8);
+        } else
+                RT_TRACE(rtlpriv, FPHY, PHY_TXPWR,
+                         "Invalid RateSection %d\n", section);
+}
+
+void rtl92ee_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
+{
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtl_priv(hw)->phy;
+        enum radio_path rfpath;
+
+        if (!rtlefuse->txpwr_fromeprom)
+                return;
+        for (rfpath = RF90_PATH_A; rfpath < rtlphy->num_total_rfpath;
+             rfpath++) {
+                phy_set_txpower_index_by_rate_section(hw, rfpath,
+                                                      channel, CCK);
+                phy_set_txpower_index_by_rate_section(hw, rfpath,
+                                                      channel, OFDM);
+                phy_set_txpower_index_by_rate_section(hw, rfpath,
+                                                      channel,
+                                                      HT_MCS0_MCS7);
+
+                if (rtlphy->num_total_rfpath >= 2)
+                        phy_set_txpower_index_by_rate_section(hw,
+                                                              rfpath, channel,
+                                                              HT_MCS8_MCS15);
+        }
+}
+
+static long _rtl92ee_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
+                                          enum wireless_mode wirelessmode,
+                                          u8 txpwridx)
+{
+        long offset;
+        long pwrout_dbm;
+
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                offset = -7;
+                break;
+        case WIRELESS_MODE_G:
+        case WIRELESS_MODE_N_24G:
+                offset = -8;
+                break;
+        default:
+                offset = -8;
+                break;
+        }
+        pwrout_dbm = txpwridx / 2 + offset;
+        return pwrout_dbm;
+}
+
+void rtl92ee_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        enum io_type iotype;
+
+        if (!is_hal_stop(rtlhal)) {
+                switch (operation) {
+                case SCAN_OPT_BACKUP_BAND0:
+                        iotype = IO_CMD_PAUSE_BAND0_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+
+                        break;
+                case SCAN_OPT_RESTORE:
+                        iotype = IO_CMD_RESUME_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Unknown Scan Backup operation.\n");
+                        break;
+                }
+        }
+}
+
+void rtl92ee_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u8 reg_bw_opmode;
+        u8 reg_prsr_rsc;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
+                 "Switch to %s bandwidth\n",
+                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                  "20MHz" : "40MHz");
+
+        if (is_hal_stop(rtlhal)) {
+                rtlphy->set_bwmode_inprogress = false;
+                return;
+        }
+
+        reg_bw_opmode = rtl_read_byte(rtlpriv, REG_BWOPMODE);
+        reg_prsr_rsc = rtl_read_byte(rtlpriv, REG_RRSR + 2);
+
+        switch (rtlphy->current_chan_bw) {
+        case HT_CHANNEL_WIDTH_20:
+                reg_bw_opmode |= BW_OPMODE_20MHZ;
+                rtl_write_byte(rtlpriv, REG_BWOPMODE, reg_bw_opmode);
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                reg_bw_opmode &= ~BW_OPMODE_20MHZ;
+                rtl_write_byte(rtlpriv, REG_BWOPMODE, reg_bw_opmode);
+                reg_prsr_rsc = (reg_prsr_rsc & 0x90) |
+                               (mac->cur_40_prime_sc << 5);
+                rtl_write_byte(rtlpriv, REG_RRSR + 2, reg_prsr_rsc);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
+                break;
+        }
+
+        switch (rtlphy->current_chan_bw) {
+        case HT_CHANNEL_WIDTH_20:
+                rtl_set_bbreg(hw, RFPGA0_RFMOD, BRFMOD, 0x0);
+                rtl_set_bbreg(hw, RFPGA1_RFMOD, BRFMOD, 0x0);
+                rtl_set_bbreg(hw, ROFDM0_TXPSEUDONOISEWGT,
+                              (BIT(31) | BIT(30)), 0);
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                rtl_set_bbreg(hw, RFPGA0_RFMOD, BRFMOD, 0x1);
+                rtl_set_bbreg(hw, RFPGA1_RFMOD, BRFMOD, 0x1);
+                rtl_set_bbreg(hw, RCCK0_SYSTEM, BCCK_SIDEBAND,
+                              (mac->cur_40_prime_sc >> 1));
+                rtl_set_bbreg(hw, ROFDM1_LSTF, 0xC00,
+                              mac->cur_40_prime_sc);
+
+                rtl_set_bbreg(hw, 0x818, (BIT(26) | BIT(27)),
+                              (mac->cur_40_prime_sc ==
+                               HAL_PRIME_CHNL_OFFSET_LOWER) ? 2 : 1);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
+                break;
+        }
+        rtl92ee_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
+        rtlphy->set_bwmode_inprogress = false;
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
+}
+
+void rtl92ee_phy_set_bw_mode(struct ieee80211_hw *hw,
+                             enum nl80211_channel_type ch_type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp_bw = rtlphy->current_chan_bw;
+
+        if (rtlphy->set_bwmode_inprogress)
+                return;
+        rtlphy->set_bwmode_inprogress = true;
+        if ((!is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
+                rtl92ee_phy_set_bw_mode_callback(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "false driver sleep or unload\n");
+                rtlphy->set_bwmode_inprogress = false;
+                rtlphy->current_chan_bw = tmp_bw;
+        }
+}
+
+void rtl92ee_phy_sw_chnl_callback(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 delay;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
+                 "switch to channel%d\n", rtlphy->current_channel);
+        if (is_hal_stop(rtlhal))
+                return;
+        do {
+                if (!rtlphy->sw_chnl_inprogress)
+                        break;
+                if (!_rtl92ee_phy_sw_chnl_step_by_step
+                    (hw, rtlphy->current_channel, &rtlphy->sw_chnl_stage,
+                     &rtlphy->sw_chnl_step, &delay)) {
+                        if (delay > 0)
+                                mdelay(delay);
+                        else
+                                continue;
+                } else {
+                        rtlphy->sw_chnl_inprogress = false;
+                }
+                break;
+        } while (true);
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
+}
+
+u8 rtl92ee_phy_sw_chnl(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        if (rtlphy->sw_chnl_inprogress)
+                return 0;
+        if (rtlphy->set_bwmode_inprogress)
+                return 0;
+        RT_ASSERT((rtlphy->current_channel <= 14),
+                  "WIRELESS_MODE_G but channel>14");
+        rtlphy->sw_chnl_inprogress = true;
+        rtlphy->sw_chnl_stage = 0;
+        rtlphy->sw_chnl_step = 0;
+        if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
+                rtl92ee_phy_sw_chnl_callback(hw);
+                RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
+                         "sw_chnl_inprogress false schdule workitem current channel %d\n",
+                         rtlphy->current_channel);
+                rtlphy->sw_chnl_inprogress = false;
+        } else {
+                RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
+                         "sw_chnl_inprogress false driver sleep or unload\n");
+                rtlphy->sw_chnl_inprogress = false;
+        }
+        return 1;
+}
+
+static bool _rtl92ee_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+                                              u8 channel, u8 *stage, u8 *step,
+                                              u32 *delay)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct swchnlcmd precommoncmd[MAX_PRECMD_CNT];
+        u32 precommoncmdcnt;
+        struct swchnlcmd postcommoncmd[MAX_POSTCMD_CNT];
+        u32 postcommoncmdcnt;
+        struct swchnlcmd rfdependcmd[MAX_RFDEPENDCMD_CNT];
+        u32 rfdependcmdcnt;
+        struct swchnlcmd *currentcmd = NULL;
+        u8 rfpath;
+        u8 num_total_rfpath = rtlphy->num_total_rfpath;
+
+        precommoncmdcnt = 0;
+        _rtl92ee_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
+                                          MAX_PRECMD_CNT,
+                                          CMDID_SET_TXPOWEROWER_LEVEL, 0, 0, 0);
+        _rtl92ee_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
+                                          MAX_PRECMD_CNT, CMDID_END, 0, 0, 0);
+
+        postcommoncmdcnt = 0;
+
+        _rtl92ee_phy_set_sw_chnl_cmdarray(postcommoncmd, postcommoncmdcnt++,
+                                          MAX_POSTCMD_CNT, CMDID_END, 0, 0, 0);
+
+        rfdependcmdcnt = 0;
+
+        RT_ASSERT((channel >= 1 && channel <= 14),
+                  "illegal channel for Zebra: %d\n", channel);
+
+        _rtl92ee_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
+                                          MAX_RFDEPENDCMD_CNT,
+                                          CMDID_RF_WRITEREG,
+                                          RF_CHNLBW, channel, 10);
+
+        _rtl92ee_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
+                                          MAX_RFDEPENDCMD_CNT, CMDID_END,
+                                          0, 0, 0);
+
+        do {
+                switch (*stage) {
+                case 0:
+                        currentcmd = &precommoncmd[*step];
+                        break;
+                case 1:
+                        currentcmd = &rfdependcmd[*step];
+                        break;
+                case 2:
+                        currentcmd = &postcommoncmd[*step];
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Invalid 'stage' = %d, Check it!\n" , *stage);
+                        return true;
+                }
+
+                if (currentcmd->cmdid == CMDID_END) {
+                        if ((*stage) == 2)
+                                return true;
+                        (*stage)++;
+                        (*step) = 0;
+                        continue;
+                }
+
+                switch (currentcmd->cmdid) {
+                case CMDID_SET_TXPOWEROWER_LEVEL:
+                        rtl92ee_phy_set_txpower_level(hw, channel);
+                        break;
+                case CMDID_WRITEPORT_ULONG:
+                        rtl_write_dword(rtlpriv, currentcmd->para1,
+                                        currentcmd->para2);
+                        break;
+                case CMDID_WRITEPORT_USHORT:
+                        rtl_write_word(rtlpriv, currentcmd->para1,
+                                       (u16)currentcmd->para2);
+                        break;
+                case CMDID_WRITEPORT_UCHAR:
+                        rtl_write_byte(rtlpriv, currentcmd->para1,
+                                       (u8)currentcmd->para2);
+                        break;
+                case CMDID_RF_WRITEREG:
+                        for (rfpath = 0; rfpath < num_total_rfpath; rfpath++) {
+                                rtlphy->rfreg_chnlval[rfpath] =
+                                        ((rtlphy->rfreg_chnlval[rfpath] &
+                                          0xfffff00) | currentcmd->para2);
+
+                                rtl_set_rfreg(hw, (enum radio_path)rfpath,
+                                              currentcmd->para1,
+                                              0x3ff,
+                                              rtlphy->rfreg_chnlval[rfpath]);
+                        }
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
+                        break;
+                }
+
+                break;
+        } while (true);
+
+        (*delay) = currentcmd->msdelay;
+        (*step)++;
+        return false;
+}
+
+static bool _rtl92ee_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
+                                              u32 cmdtableidx, u32 cmdtablesz,
+                                              enum swchnlcmd_id cmdid,
+                                              u32 para1, u32 para2, u32 msdelay)
+{
+        struct swchnlcmd *pcmd;
+
+        if (cmdtable == NULL) {
+                RT_ASSERT(false, "cmdtable cannot be NULL.\n");
+                return false;
+        }
+
+        if (cmdtableidx >= cmdtablesz)
+                return false;
+
+        pcmd = cmdtable + cmdtableidx;
+        pcmd->cmdid = cmdid;
+        pcmd->para1 = para1;
+        pcmd->para2 = para2;
+        pcmd->msdelay = msdelay;
+        return true;
+}
+
+static u8 _rtl92ee_phy_path_a_iqk(struct ieee80211_hw *hw, bool config_pathb)
+{
+        u32 reg_eac, reg_e94, reg_e9c;
+        u8 result = 0x00;
+        /* path-A IQK setting */
+        /* PA/PAD controlled by 0x0 */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xdf, RFREG_OFFSET_MASK, 0x180);
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82140303);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x68160000);
+
+        /*LO calibration setting*/
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x00462911);
+
+        /*One shot, path A LOK & IQK*/
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        reg_eac = rtl_get_bbreg(hw, 0xeac, MASKDWORD);
+        reg_e94 = rtl_get_bbreg(hw, 0xe94, MASKDWORD);
+        reg_e9c = rtl_get_bbreg(hw, 0xe9c, MASKDWORD);
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_e9c & 0x03FF0000) >> 16) != 0x42))
+                result |= 0x01;
+        else
+                return result;
+
+        return result;
+}
+
+static u8 _rtl92ee_phy_path_b_iqk(struct ieee80211_hw *hw)
+{
+        u32 reg_eac, reg_eb4, reg_ebc;
+        u8 result = 0x00;
+
+        /* PA/PAD controlled by 0x0 */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, RF90_PATH_B, 0xdf, RFREG_OFFSET_MASK, 0x180);
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x00000000);
+        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x80800000);
+
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x821403e2);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x68160000);
+
+        /* LO calibration setting */
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x00462911);
+
+        /*One shot, path B LOK & IQK*/
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xfa000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        reg_eac = rtl_get_bbreg(hw, 0xeac, MASKDWORD);
+        reg_eb4 = rtl_get_bbreg(hw, 0xeb4, MASKDWORD);
+        reg_ebc = rtl_get_bbreg(hw, 0xebc, MASKDWORD);
+
+        if (!(reg_eac & BIT(31)) &&
+            (((reg_eb4 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_ebc & 0x03FF0000) >> 16) != 0x42))
+                result |= 0x01;
+        else
+                return result;
+
+        return result;
+}
+
+static u8 _rtl92ee_phy_path_a_rx_iqk(struct ieee80211_hw *hw, bool config_pathb)
+{
+        u32 reg_eac, reg_e94, reg_e9c, reg_ea4 , u32temp;
+        u8 result = 0x00;
+
+        /*Get TXIMR Setting*/
+        /*Modify RX IQK mode table*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf117b);
+
+        /*PA/PAD control by 0x56, and set = 0x0*/
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xdf, RFREG_OFFSET_MASK, 0x980);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x56, RFREG_OFFSET_MASK, 0x51000);
+
+        /*enter IQK mode*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /*IQK Setting*/
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /*path a IQK setting*/
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82160c1f);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x68160c1f);
+
+        /*LO calibration Setting*/
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a911);
+
+        /*one shot,path A LOK & iqk*/
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xfa000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        /* Check failed */
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_e94 = rtl_get_bbreg(hw, RTX_POWER_BEFORE_IQK_A, MASKDWORD);
+        reg_e9c = rtl_get_bbreg(hw, RTX_POWER_AFTER_IQK_A, MASKDWORD);
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_e9c & 0x03FF0000) >> 16) != 0x42)) {
+                result |= 0x01;
+        } else {
+                /*      PA/PAD controlled by 0x0 */
+                rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+                rtl_set_rfreg(hw, RF90_PATH_A, 0xdf, RFREG_OFFSET_MASK, 0x180);
+                return result;
+        }
+
+        u32temp = 0x80007C00 | (reg_e94 & 0x3FF0000)  |
+                  ((reg_e9c & 0x3FF0000) >> 16);
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, u32temp);
+        /*RX IQK*/
+        /*Modify RX IQK mode table*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7ffa);
+
+        /*PA/PAD control by 0x56, and set = 0x0*/
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xdf, RFREG_OFFSET_MASK, 0x980);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x56, RFREG_OFFSET_MASK, 0x51000);
+
+        /*enter IQK mode*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /*IQK Setting*/
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /*path a IQK setting*/
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82160c1f);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x28160c1f);
+
+        /*LO calibration Setting*/
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a891);
+        /*one shot,path A LOK & iqk*/
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xfa000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+        /*Check failed*/
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_ea4 = rtl_get_bbreg(hw, RRX_POWER_BEFORE_IQK_A_2, MASKDWORD);
+
+        /*PA/PAD controlled by 0x0*/
+        /*leave IQK mode*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xdf, RFREG_OFFSET_MASK, 0x180);
+        /*if Tx is OK, check whether Rx is OK*/
+        if (!(reg_eac & BIT(27)) &&
+            (((reg_ea4 & 0x03FF0000) >> 16) != 0x132) &&
+            (((reg_eac & 0x03FF0000) >> 16) != 0x36))
+                result |= 0x02;
+
+        return result;
+}
+
+static u8 _rtl92ee_phy_path_b_rx_iqk(struct ieee80211_hw *hw, bool config_pathb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 reg_eac, reg_eb4, reg_ebc, reg_ecc, reg_ec4, u32temp;
+        u8 result = 0x00;
+
+        /*Get TXIMR Setting*/
+        /*Modify RX IQK mode table*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf117b);
+
+        /*PA/PAD all off*/
+        rtl_set_rfreg(hw, RF90_PATH_B, 0xdf, RFREG_OFFSET_MASK, 0x980);
+        rtl_set_rfreg(hw, RF90_PATH_B, 0x56, RFREG_OFFSET_MASK, 0x51000);
+
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /*IQK Setting*/
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /*path a IQK setting*/
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x82160c1f);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x68160c1f);
+
+        /*LO calibration Setting*/
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a911);
+
+        /*one shot,path A LOK & iqk*/
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xfa000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        /* Check failed */
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_eb4 = rtl_get_bbreg(hw, RTX_POWER_BEFORE_IQK_B, MASKDWORD);
+        reg_ebc = rtl_get_bbreg(hw, RTX_POWER_AFTER_IQK_B, MASKDWORD);
+
+        if (!(reg_eac & BIT(31)) &&
+            (((reg_eb4 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_ebc & 0x03FF0000) >> 16) != 0x42)) {
+                result |= 0x01;
+        } else {
+                /*      PA/PAD controlled by 0x0 */
+                rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+                rtl_set_rfreg(hw, RF90_PATH_B, 0xdf, RFREG_OFFSET_MASK, 0x180);
+                return result;
+        }
+
+        u32temp = 0x80007C00 | (reg_eb4 & 0x3FF0000) |
+                  ((reg_ebc & 0x3FF0000) >> 16);
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, u32temp);
+        /*RX IQK*/
+        /*Modify RX IQK mode table*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0000f);
+        rtl_set_rfreg(hw, RF90_PATH_B, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7ffa);
+
+        /*PA/PAD all off*/
+        rtl_set_rfreg(hw, RF90_PATH_B, 0xdf, RFREG_OFFSET_MASK, 0x980);
+        rtl_set_rfreg(hw, RF90_PATH_B, 0x56, RFREG_OFFSET_MASK, 0x51000);
+
+        /*enter IQK mode*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /*IQK Setting*/
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /*path b IQK setting*/
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x18008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x82160c1f);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x28160c1f);
+
+        /*LO calibration Setting*/
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a891);
+        /*one shot,path A LOK & iqk*/
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xfa000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+        /*Check failed*/
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_ec4 = rtl_get_bbreg(hw, RRX_POWER_BEFORE_IQK_B_2, MASKDWORD);
+        reg_ecc = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_B_2, MASKDWORD);
+        /*PA/PAD controlled by 0x0*/
+        /*leave IQK mode*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, RF90_PATH_B, 0xdf, RFREG_OFFSET_MASK, 0x180);
+        /*if Tx is OK, check whether Rx is OK*/
+        if (!(reg_eac & BIT(30)) &&
+            (((reg_ec4 & 0x03FF0000) >> 16) != 0x132) &&
+            (((reg_ecc & 0x03FF0000) >> 16) != 0x36))
+                result |= 0x02;
+        else
+                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "Path B Rx IQK fail!!\n");
+
+        return result;
+}
+
+static void _rtl92ee_phy_path_a_fill_iqk_matrix(struct ieee80211_hw *hw,
+                                                bool b_iqk_ok, long result[][8],
+                                                u8 final_candidate,
+                                                bool btxonly)
+{
+        u32 oldval_0, x, tx0_a, reg;
+        long y, tx0_c;
+
+        if (final_candidate == 0xFF) {
+                return;
+        } else if (b_iqk_ok) {
+                oldval_0 = (rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
+                                          MASKDWORD) >> 22) & 0x3FF;
+                x = result[final_candidate][0];
+                if ((x & 0x00000200) != 0)
+                        x = x | 0xFFFFFC00;
+                tx0_a = (x * oldval_0) >> 8;
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, 0x3FF, tx0_a);
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(31),
+                              ((x * oldval_0 >> 7) & 0x1));
+                y = result[final_candidate][1];
+                if ((y & 0x00000200) != 0)
+                        y = y | 0xFFFFFC00;
+                tx0_c = (y * oldval_0) >> 8;
+                rtl_set_bbreg(hw, ROFDM0_XCTXAFE, 0xF0000000,
+                              ((tx0_c & 0x3C0) >> 6));
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, 0x003F0000,
+                              (tx0_c & 0x3F));
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(29),
+                              ((y * oldval_0 >> 7) & 0x1));
+
+                if (btxonly)
+                        return;
+
+                reg = result[final_candidate][2];
+                rtl_set_bbreg(hw, ROFDM0_XARXIQIMBALANCE, 0x3FF, reg);
+
+                reg = result[final_candidate][3] & 0x3F;
+                rtl_set_bbreg(hw, ROFDM0_XARXIQIMBALANCE, 0xFC00, reg);
+
+                reg = (result[final_candidate][3] >> 6) & 0xF;
+                rtl_set_bbreg(hw, ROFDM0_RXIQEXTANTA, 0xF0000000, reg);
+        }
+}
+
+static void _rtl92ee_phy_path_b_fill_iqk_matrix(struct ieee80211_hw *hw,
+                                                bool b_iqk_ok, long result[][8],
+                                                u8 final_candidate,
+                                                bool btxonly)
+{
+        u32 oldval_1, x, tx1_a, reg;
+        long y, tx1_c;
+
+        if (final_candidate == 0xFF) {
+                return;
+        } else if (b_iqk_ok) {
+                oldval_1 = (rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
+                                          MASKDWORD) >> 22) & 0x3FF;
+                x = result[final_candidate][4];
+                if ((x & 0x00000200) != 0)
+                        x = x | 0xFFFFFC00;
+                tx1_a = (x * oldval_1) >> 8;
+                rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, 0x3FF, tx1_a);
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(27),
+                              ((x * oldval_1 >> 7) & 0x1));
+                y = result[final_candidate][5];
+                if ((y & 0x00000200) != 0)
+                        y = y | 0xFFFFFC00;
+                tx1_c = (y * oldval_1) >> 8;
+                rtl_set_bbreg(hw, ROFDM0_XDTXAFE, 0xF0000000,
+                              ((tx1_c & 0x3C0) >> 6));
+                rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, 0x003F0000,
+                              (tx1_c & 0x3F));
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(25),
+                              ((y * oldval_1 >> 7) & 0x1));
+
+                if (btxonly)
+                        return;
+
+                reg = result[final_candidate][6];
+                rtl_set_bbreg(hw, ROFDM0_XBRXIQIMBALANCE, 0x3FF, reg);
+
+                reg = result[final_candidate][7] & 0x3F;
+                rtl_set_bbreg(hw, ROFDM0_XBRXIQIMBALANCE, 0xFC00, reg);
+
+                reg = (result[final_candidate][7] >> 6) & 0xF;
+                rtl_set_bbreg(hw, ROFDM0_AGCRSSITABLE, 0xF0000000, reg);
+        }
+}
+
+static void _rtl92ee_phy_save_adda_registers(struct ieee80211_hw *hw,
+                                             u32 *addareg, u32 *addabackup,
+                                             u32 registernum)
+{
+        u32 i;
+
+        for (i = 0; i < registernum; i++)
+                addabackup[i] = rtl_get_bbreg(hw, addareg[i], MASKDWORD);
+}
+
+static void _rtl92ee_phy_save_mac_registers(struct ieee80211_hw *hw,
+                                            u32 *macreg, u32 *macbackup)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+
+        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
+                macbackup[i] = rtl_read_byte(rtlpriv, macreg[i]);
+
+        macbackup[i] = rtl_read_dword(rtlpriv, macreg[i]);
+}
+
+static void _rtl92ee_phy_reload_adda_registers(struct ieee80211_hw *hw,
+                                               u32 *addareg, u32 *addabackup,
+                                               u32 regiesternum)
+{
+        u32 i;
+
+        for (i = 0; i < regiesternum; i++)
+                rtl_set_bbreg(hw, addareg[i], MASKDWORD, addabackup[i]);
+}
+
+static void _rtl92ee_phy_reload_mac_registers(struct ieee80211_hw *hw,
+                                              u32 *macreg, u32 *macbackup)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+
+        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
+                rtl_write_byte(rtlpriv, macreg[i], (u8)macbackup[i]);
+        rtl_write_dword(rtlpriv, macreg[i], macbackup[i]);
+}
+
+static void _rtl92ee_phy_path_adda_on(struct ieee80211_hw *hw, u32 *addareg,
+                                      bool is_patha_on, bool is2t)
+{
+        u32 pathon;
+        u32 i;
+
+        pathon = is_patha_on ? 0x0fc01616 : 0x0fc01616;
+        if (!is2t) {
+                pathon = 0x0fc01616;
+                rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0fc01616);
+        } else {
+                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);
+}
+
+static void _rtl92ee_phy_mac_setting_calibration(struct ieee80211_hw *hw,
+                                                 u32 *macreg, u32 *macbackup)
+{
+        rtl_set_bbreg(hw, 0x520, 0x00ff0000, 0xff);
+}
+
+static void _rtl92ee_phy_path_a_standby(struct ieee80211_hw *hw)
+{
+        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x0);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0, RFREG_OFFSET_MASK, 0x10000);
+        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x80800000);
+}
+
+static bool _rtl92ee_phy_simularity_compare(struct ieee80211_hw *hw,
+                                            long result[][8], u8 c1, u8 c2)
+{
+        u32 i, j, diff, simularity_bitmap, bound;
+
+        u8 final_candidate[2] = { 0xFF, 0xFF };
+        bool bresult = true/*, is2t = true*/;
+        s32 tmp1, tmp2;
+
+        bound = 8;
+
+        simularity_bitmap = 0;
+
+        for (i = 0; i < bound; i++) {
+                if ((i == 1) || (i == 3) || (i == 5) || (i == 7)) {
+                        if ((result[c1][i] & 0x00000200) != 0)
+                                tmp1 = result[c1][i] | 0xFFFFFC00;
+                        else
+                                tmp1 = result[c1][i];
+
+                        if ((result[c2][i] & 0x00000200) != 0)
+                                tmp2 = result[c2][i] | 0xFFFFFC00;
+                        else
+                                tmp2 = result[c2][i];
+                } else {
+                        tmp1 = result[c1][i];
+                        tmp2 = result[c2][i];
+                }
+
+                diff = (tmp1 > tmp2) ? (tmp1 - tmp2) : (tmp2 - tmp1);
+
+                if (diff > MAX_TOLERANCE) {
+                        if ((i == 2 || i == 6) && !simularity_bitmap) {
+                                if (result[c1][i] + result[c1][i + 1] == 0)
+                                        final_candidate[(i / 4)] = c2;
+                                else if (result[c2][i] + result[c2][i + 1] == 0)
+                                        final_candidate[(i / 4)] = c1;
+                                else
+                                        simularity_bitmap |= (1 << i);
+                        } else {
+                                simularity_bitmap |= (1 << i);
+                        }
+                }
+        }
+
+        if (simularity_bitmap == 0) {
+                for (i = 0; i < (bound / 4); i++) {
+                        if (final_candidate[i] != 0xFF) {
+                                for (j = i * 4; j < (i + 1) * 4 - 2; j++)
+                                        result[3][j] =
+                                                result[final_candidate[i]][j];
+                                bresult = false;
+                        }
+                }
+                return bresult;
+        }
+        if (!(simularity_bitmap & 0x03)) {/*path A TX OK*/
+                for (i = 0; i < 2; i++)
+                        result[3][i] = result[c1][i];
+        }
+        if (!(simularity_bitmap & 0x0c)) {/*path A RX OK*/
+                for (i = 2; i < 4; i++)
+                        result[3][i] = result[c1][i];
+        }
+        if (!(simularity_bitmap & 0x30)) {/*path B TX OK*/
+                for (i = 4; i < 6; i++)
+                        result[3][i] = result[c1][i];
+        }
+        if (!(simularity_bitmap & 0xc0)) {/*path B RX OK*/
+                for (i = 6; i < 8; i++)
+                        result[3][i] = result[c1][i];
+        }
+        return false;
+}
+
+static void _rtl92ee_phy_iq_calibrate(struct ieee80211_hw *hw,
+                                      long result[][8], u8 t, bool is2t)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 i;
+        u8 patha_ok, pathb_ok;
+        u8 tmp_0xc50 = (u8)rtl_get_bbreg(hw, 0xc50, MASKBYTE0);
+        u8 tmp_0xc58 = (u8)rtl_get_bbreg(hw, 0xc58, MASKBYTE0);
+        u32 adda_reg[IQK_ADDA_REG_NUM] = {
+                0x85c, 0xe6c, 0xe70, 0xe74,
+                0xe78, 0xe7c, 0xe80, 0xe84,
+                0xe88, 0xe8c, 0xed0, 0xed4,
+                0xed8, 0xedc, 0xee0, 0xeec
+        };
+        u32 iqk_mac_reg[IQK_MAC_REG_NUM] = {
+                0x522, 0x550, 0x551, 0x040
+        };
+        u32 iqk_bb_reg[IQK_BB_REG_NUM] = {
+                ROFDM0_TRXPATHENABLE, ROFDM0_TRMUXPAR,
+                RFPGA0_XCD_RFINTERFACESW, 0xb68, 0xb6c,
+                0x870, 0x860,
+                0x864, 0x800
+        };
+        const u32 retrycount = 2;
+
+        if (t == 0) {
+                _rtl92ee_phy_save_adda_registers(hw, adda_reg,
+                                                 rtlphy->adda_backup,
+                                                 IQK_ADDA_REG_NUM);
+                _rtl92ee_phy_save_mac_registers(hw, iqk_mac_reg,
+                                                rtlphy->iqk_mac_backup);
+                _rtl92ee_phy_save_adda_registers(hw, iqk_bb_reg,
+                                                 rtlphy->iqk_bb_backup,
+                                                 IQK_BB_REG_NUM);
+        }
+
+        _rtl92ee_phy_path_adda_on(hw, adda_reg, true, is2t);
+
+        /*BB setting*/
+        rtl_set_bbreg(hw, RFPGA0_RFMOD, BIT(24), 0x00);
+        rtl_set_bbreg(hw, ROFDM0_TRXPATHENABLE, MASKDWORD, 0x03a05600);
+        rtl_set_bbreg(hw, ROFDM0_TRMUXPAR, MASKDWORD, 0x000800e4);
+        rtl_set_bbreg(hw, RFPGA0_XCD_RFINTERFACESW, MASKDWORD, 0x22208200);
+
+        rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW, BIT(10), 0x01);
+        rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW, BIT(26), 0x01);
+        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, BIT(10), 0x01);
+        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE, BIT(10), 0x01);
+
+        _rtl92ee_phy_mac_setting_calibration(hw, iqk_mac_reg,
+                                             rtlphy->iqk_mac_backup);
+        /* Page B init*/
+        /* IQ calibration setting*/
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        for (i = 0 ; i < retrycount ; i++) {
+                patha_ok = _rtl92ee_phy_path_a_iqk(hw, is2t);
+
+                if (patha_ok == 0x01) {
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                                 "Path A Tx IQK Success!!\n");
+                        result[t][0] = (rtl_get_bbreg(hw,
+                                                      RTX_POWER_BEFORE_IQK_A,
+                                                      MASKDWORD) & 0x3FF0000)
+                                                      >> 16;
+                        result[t][1] = (rtl_get_bbreg(hw, RTX_POWER_AFTER_IQK_A,
+                                                      MASKDWORD) & 0x3FF0000)
+                                                      >> 16;
+                        break;
+                }
+                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                         "Path A Tx IQK Fail!!, ret = 0x%x\n",
+                         patha_ok);
+        }
+
+        for (i = 0 ; i < retrycount ; i++) {
+                patha_ok = _rtl92ee_phy_path_a_rx_iqk(hw, is2t);
+
+                if (patha_ok == 0x03) {
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                                 "Path A Rx IQK Success!!\n");
+                        result[t][2] = (rtl_get_bbreg(hw,
+                                                      RRX_POWER_BEFORE_IQK_A_2,
+                                                      MASKDWORD) & 0x3FF0000)
+                                                      >> 16;
+                        result[t][3] = (rtl_get_bbreg(hw,
+                                                      RRX_POWER_AFTER_IQK_A_2,
+                                                      MASKDWORD) & 0x3FF0000)
+                                                      >> 16;
+                        break;
+                }
+                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                         "Path A Rx IQK Fail!!, ret = 0x%x\n",
+                          patha_ok);
+        }
+
+        if (0x00 == patha_ok)
+                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                         "Path A IQK failed!!, ret = 0\n");
+        if (is2t) {
+                _rtl92ee_phy_path_a_standby(hw);
+                /* Turn Path B ADDA on */
+                _rtl92ee_phy_path_adda_on(hw, adda_reg, false, is2t);
+
+                /* IQ calibration setting */
+                rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+                rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+                rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+                for (i = 0 ; i < retrycount ; i++) {
+                        pathb_ok = _rtl92ee_phy_path_b_iqk(hw);
+                        if (pathb_ok == 0x01) {
+                                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                                         "Path B Tx IQK Success!!\n");
+                                result[t][4] = (rtl_get_bbreg(hw,
+                                                        RTX_POWER_BEFORE_IQK_B,
+                                                        MASKDWORD) & 0x3FF0000)
+                                                        >> 16;
+                                result[t][5] = (rtl_get_bbreg(hw,
+                                                        RTX_POWER_AFTER_IQK_B,
+                                                        MASKDWORD) & 0x3FF0000)
+                                                        >> 16;
+                                break;
+                        }
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                                 "Path B Tx IQK Fail!!, ret = 0x%x\n",
+                                 pathb_ok);
+                }
+
+                for (i = 0 ; i < retrycount ; i++) {
+                        pathb_ok = _rtl92ee_phy_path_b_rx_iqk(hw, is2t);
+                        if (pathb_ok == 0x03) {
+                                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                                         "Path B Rx IQK Success!!\n");
+                                result[t][6] = (rtl_get_bbreg(hw,
+                                                       RRX_POWER_BEFORE_IQK_B_2,
+                                                       MASKDWORD) & 0x3FF0000)
+                                                       >> 16;
+                                result[t][7] = (rtl_get_bbreg(hw,
+                                                       RRX_POWER_AFTER_IQK_B_2,
+                                                       MASKDWORD) & 0x3FF0000)
+                                                       >> 16;
+                                break;
+                        }
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                                 "Path B Rx IQK Fail!!, ret = 0x%x\n",
+                                 pathb_ok);
+                }
+
+                if (0x00 == pathb_ok)
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                                 "Path B IQK failed!!, ret = 0\n");
+        }
+        /* Back to BB mode, load original value */
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
+                 "IQK:Back to BB mode, load original value!\n");
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0);
+
+        if (t != 0) {
+                /* Reload ADDA power saving parameters */
+                _rtl92ee_phy_reload_adda_registers(hw, adda_reg,
+                                                   rtlphy->adda_backup,
+                                                   IQK_ADDA_REG_NUM);
+
+                /* Reload MAC parameters */
+                _rtl92ee_phy_reload_mac_registers(hw, iqk_mac_reg,
+                                                  rtlphy->iqk_mac_backup);
+
+                _rtl92ee_phy_reload_adda_registers(hw, iqk_bb_reg,
+                                                   rtlphy->iqk_bb_backup,
+                                                   IQK_BB_REG_NUM);
+
+                /* Restore RX initial gain */
+                rtl_set_bbreg(hw, 0xc50, MASKBYTE0, 0x50);
+                rtl_set_bbreg(hw, 0xc50, MASKBYTE0, tmp_0xc50);
+                if (is2t) {
+                        rtl_set_bbreg(hw, 0xc50, MASKBYTE0, 0x50);
+                        rtl_set_bbreg(hw, 0xc58, MASKBYTE0, tmp_0xc58);
+                }
+
+                /* load 0xe30 IQC default value */
+                rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x01008c00);
+                rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x01008c00);
+        }
+}
+
+static void _rtl92ee_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
+{
+        u8 tmpreg;
+        u32 rf_a_mode = 0, rf_b_mode = 0, lc_cal;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        tmpreg = rtl_read_byte(rtlpriv, 0xd03);
+
+        if ((tmpreg & 0x70) != 0)
+                rtl_write_byte(rtlpriv, 0xd03, tmpreg & 0x8F);
+        else
+                rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
+
+        if ((tmpreg & 0x70) != 0) {
+                rf_a_mode = rtl_get_rfreg(hw, RF90_PATH_A, 0x00, MASK12BITS);
+
+                if (is2t)
+                        rf_b_mode = rtl_get_rfreg(hw, RF90_PATH_B, 0x00,
+                                                  MASK12BITS);
+
+                rtl_set_rfreg(hw, RF90_PATH_A, 0x00, MASK12BITS,
+                              (rf_a_mode & 0x8FFFF) | 0x10000);
+
+                if (is2t)
+                        rtl_set_rfreg(hw, RF90_PATH_B, 0x00, MASK12BITS,
+                                      (rf_b_mode & 0x8FFFF) | 0x10000);
+        }
+        lc_cal = rtl_get_rfreg(hw, RF90_PATH_A, 0x18, MASK12BITS);
+
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x18, MASK12BITS, lc_cal | 0x08000);
+
+        mdelay(100);
+
+        if ((tmpreg & 0x70) != 0) {
+                rtl_write_byte(rtlpriv, 0xd03, tmpreg);
+                rtl_set_rfreg(hw, RF90_PATH_A, 0x00, MASK12BITS, rf_a_mode);
+
+                if (is2t)
+                        rtl_set_rfreg(hw, RF90_PATH_B, 0x00, MASK12BITS,
+                                      rf_b_mode);
+        } else {
+                rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
+        }
+}
+
+static void _rtl92ee_phy_set_rfpath_switch(struct ieee80211_hw *hw,
+                                           bool bmain, bool is2t)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+
+        RT_TRACE(rtlpriv, COMP_INIT , DBG_LOUD , "\n");
+
+        if (is_hal_stop(rtlhal)) {
+                u8 u1btmp;
+
+                u1btmp = rtl_read_byte(rtlpriv, REG_LEDCFG0);
+                rtl_write_byte(rtlpriv, REG_LEDCFG0, u1btmp | BIT(7));
+                rtl_set_bbreg(hw, RFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
+        }
+        if (is2t) {
+                if (bmain)
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
+                                      BIT(5) | BIT(6), 0x1);
+                else
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
+                                      BIT(5) | BIT(6), 0x2);
+        } else {
+                rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW, BIT(8) | BIT(9), 0);
+                rtl_set_bbreg(hw, 0x914, MASKLWORD, 0x0201);
+
+                /* We use the RF definition of MAIN and AUX,
+                 * left antenna and right antenna repectively.
+                 * Default output at AUX.
+                 */
+                if (bmain) {
+                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE,
+                                      BIT(14) | BIT(13) | BIT(12), 0);
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
+                                      BIT(5) | BIT(4) | BIT(3), 0);
+                        if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                                rtl_set_bbreg(hw, RCONFIG_RAM64x16, BIT(31), 0);
+                } else {
+                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE,
+                                      BIT(14) | BIT(13) | BIT(12), 1);
+                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
+                                      BIT(5) | BIT(4) | BIT(3), 1);
+                        if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
+                                rtl_set_bbreg(hw, RCONFIG_RAM64x16, BIT(31), 1);
+                }
+        }
+}
+
+#undef IQK_ADDA_REG_NUM
+#undef IQK_DELAY_TIME
+
+static u8 rtl92ee_get_rightchnlplace_for_iqk(u8 chnl)
+{
+        u8 channel_all[59] = {
+                1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+                36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58,
+                60, 62, 64, 100, 102, 104, 106, 108, 110, 112,
+                114, 116, 118, 120, 122, 124, 126, 128, 130,
+                132, 134, 136, 138, 140, 149, 151, 153, 155,
+                157, 159, 161, 163, 165
+        };
+        u8 place = chnl;
+
+        if (chnl > 14) {
+                for (place = 14; place < sizeof(channel_all); place++) {
+                        if (channel_all[place] == chnl)
+                                return place - 13;
+                }
+        }
+
+        return 0;
+}
+
+void rtl92ee_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        long result[4][8];
+        u8 i, final_candidate;
+        bool b_patha_ok, b_pathb_ok;
+        long reg_e94, reg_e9c, reg_ea4, reg_eac;
+        long reg_eb4, reg_ebc, reg_ec4, reg_ecc;
+        bool is12simular, is13simular, is23simular;
+        u8 idx;
+        u32 iqk_bb_reg[IQK_BB_REG_NUM] = {
+                ROFDM0_XARXIQIMBALANCE,
+                ROFDM0_XBRXIQIMBALANCE,
+                ROFDM0_ECCATHRESHOLD,
+                ROFDM0_AGCRSSITABLE,
+                ROFDM0_XATXIQIMBALANCE,
+                ROFDM0_XBTXIQIMBALANCE,
+                ROFDM0_XCTXAFE,
+                ROFDM0_XDTXAFE,
+                ROFDM0_RXIQEXTANTA
+        };
+
+        if (b_recovery) {
+                _rtl92ee_phy_reload_adda_registers(hw, iqk_bb_reg,
+                                                   rtlphy->iqk_bb_backup, 9);
+                return;
+        }
+
+        for (i = 0; i < 8; i++) {
+                result[0][i] = 0;
+                result[1][i] = 0;
+                result[2][i] = 0;
+
+                if ((i == 0) || (i == 2) || (i == 4)  || (i == 6))
+                        result[3][i] = 0x100;
+                else
+                        result[3][i] = 0;
+        }
+        final_candidate = 0xff;
+        b_patha_ok = false;
+        b_pathb_ok = false;
+        is12simular = false;
+        is23simular = false;
+        is13simular = false;
+        for (i = 0; i < 3; i++) {
+                _rtl92ee_phy_iq_calibrate(hw, result, i, true);
+                if (i == 1) {
+                        is12simular = _rtl92ee_phy_simularity_compare(hw,
+                                                                      result,
+                                                                      0, 1);
+                        if (is12simular) {
+                                final_candidate = 0;
+                                break;
+                        }
+                }
+
+                if (i == 2) {
+                        is13simular = _rtl92ee_phy_simularity_compare(hw,
+                                                                      result,
+                                                                      0, 2);
+                        if (is13simular) {
+                                final_candidate = 0;
+                                break;
+                        }
+                        is23simular = _rtl92ee_phy_simularity_compare(hw,
+                                                                      result,
+                                                                      1, 2);
+                        if (is23simular)
+                                final_candidate = 1;
+                        else
+                                final_candidate = 3;
+                }
+        }
+
+        for (i = 0; i < 4; i++) {
+                reg_e94 = result[i][0];
+                reg_e9c = result[i][1];
+                reg_ea4 = result[i][2];
+                reg_eac = result[i][3];
+                reg_eb4 = result[i][4];
+                reg_ebc = result[i][5];
+                reg_ec4 = result[i][6];
+                reg_ecc = result[i][7];
+        }
+
+        if (final_candidate != 0xff) {
+                reg_e94 = result[final_candidate][0];
+                rtlphy->reg_e94 = reg_e94;
+                reg_e9c = result[final_candidate][1];
+                rtlphy->reg_e9c = reg_e9c;
+                reg_ea4 = result[final_candidate][2];
+                reg_eac = result[final_candidate][3];
+                reg_eb4 = result[final_candidate][4];
+                rtlphy->reg_eb4 = reg_eb4;
+                reg_ebc = result[final_candidate][5];
+                rtlphy->reg_ebc = reg_ebc;
+                reg_ec4 = result[final_candidate][6];
+                reg_ecc = result[final_candidate][7];
+                b_patha_ok = true;
+                b_pathb_ok = true;
+        } else {
+                rtlphy->reg_e94 = 0x100;
+                rtlphy->reg_eb4 = 0x100;
+                rtlphy->reg_e9c = 0x0;
+                rtlphy->reg_ebc = 0x0;
+        }
+
+        if (reg_e94 != 0)
+                _rtl92ee_phy_path_a_fill_iqk_matrix(hw, b_patha_ok, result,
+                                                    final_candidate,
+                                                    (reg_ea4 == 0));
+
+        _rtl92ee_phy_path_b_fill_iqk_matrix(hw, b_pathb_ok, result,
+                                            final_candidate,
+                                            (reg_ec4 == 0));
+
+        idx = rtl92ee_get_rightchnlplace_for_iqk(rtlphy->current_channel);
+
+        /* To Fix BSOD when final_candidate is 0xff */
+        if (final_candidate < 4) {
+                for (i = 0; i < IQK_MATRIX_REG_NUM; i++)
+                        rtlphy->iqk_matrix[idx].value[0][i] =
+                                result[final_candidate][i];
+
+                rtlphy->iqk_matrix[idx].iqk_done = true;
+        }
+        _rtl92ee_phy_save_adda_registers(hw, iqk_bb_reg,
+                                         rtlphy->iqk_bb_backup, 9);
+}
+
+void rtl92ee_phy_lc_calibrate(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = &rtlpriv->rtlhal;
+        u32 timeout = 2000, timecount = 0;
+
+        while (rtlpriv->mac80211.act_scanning && timecount < timeout) {
+                udelay(50);
+                timecount += 50;
+        }
+
+        rtlphy->lck_inprogress = true;
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                "LCK:Start!!! currentband %x delay %d ms\n",
+                 rtlhal->current_bandtype, timecount);
+
+        _rtl92ee_phy_lc_calibrate(hw, false);
+
+        rtlphy->lck_inprogress = false;
+}
+
+void rtl92ee_phy_ap_calibrate(struct ieee80211_hw *hw, char delta)
+{
+}
+
+void rtl92ee_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain)
+{
+        _rtl92ee_phy_set_rfpath_switch(hw, bmain, false);
+}
+
+bool rtl92ee_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        bool postprocessing = false;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
+                  iotype, rtlphy->set_io_inprogress);
+        do {
+                switch (iotype) {
+                case IO_CMD_RESUME_DM_BY_SCAN:
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                                 "[IO CMD] Resume DM after scan.\n");
+                        postprocessing = true;
+                        break;
+                case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                                 "[IO CMD] Pause DM before scan.\n");
+                        postprocessing = true;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
+                        break;
+                }
+        } while (false);
+        if (postprocessing && !rtlphy->set_io_inprogress) {
+                rtlphy->set_io_inprogress = true;
+                rtlphy->current_io_type = iotype;
+        } else {
+                return false;
+        }
+        rtl92ee_phy_set_io(hw);
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
+        return true;
+}
+
+static void rtl92ee_phy_set_io(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct dig_t *dm_dig = &rtlpriv->dm_digtable;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                  rtlphy->current_io_type, rtlphy->set_io_inprogress);
+        switch (rtlphy->current_io_type) {
+        case IO_CMD_RESUME_DM_BY_SCAN:
+                rtl92ee_dm_write_dig(hw, rtlphy->initgain_backup.xaagccore1);
+                rtl92ee_dm_write_cck_cca_thres(hw, rtlphy->initgain_backup.cca);
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE , "no set txpower\n");
+                rtl92ee_phy_set_txpower_level(hw, rtlphy->current_channel);
+                break;
+        case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
+                /* 8192eebt */
+                rtlphy->initgain_backup.xaagccore1 = dm_dig->cur_igvalue;
+                rtl92ee_dm_write_dig(hw, 0x17);
+                rtlphy->initgain_backup.cca = dm_dig->cur_cck_cca_thres;
+                rtl92ee_dm_write_cck_cca_thres(hw, 0x40);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
+                break;
+        }
+        rtlphy->set_io_inprogress = false;
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "(%#x)\n", rtlphy->current_io_type);
+}
+
+static void rtl92ee_phy_set_rf_on(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl_write_byte(rtlpriv, REG_SPS0_CTRL, 0x2b);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
+        /*rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x00);*/
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
+        rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
+}
+
+static void _rtl92ee_phy_set_rf_sleep(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x00, RFREG_OFFSET_MASK, 0x00);
+
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
+        rtl_write_byte(rtlpriv, REG_SPS0_CTRL, 0x22);
+}
+
+static bool _rtl92ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                            enum rf_pwrstate rfpwr_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        bool bresult = true;
+        u8 i, queue_id;
+        struct rtl8192_tx_ring *ring = NULL;
+
+        switch (rfpwr_state) {
+        case ERFON:
+                if ((ppsc->rfpwr_state == ERFOFF) &&
+                    RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
+                        bool rtstatus;
+                        u32 initializecount = 0;
+
+                        do {
+                                initializecount++;
+                                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                         "IPS Set eRf nic enable\n");
+                                rtstatus = rtl_ps_enable_nic(hw);
+                        } while (!rtstatus && (initializecount < 10));
+                        RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                 "Set ERFON sleeping:%d ms\n",
+                                  jiffies_to_msecs(jiffies -
+                                                   ppsc->last_sleep_jiffies));
+                        ppsc->last_awake_jiffies = jiffies;
+                        rtl92ee_phy_set_rf_on(hw);
+                }
+                if (mac->link_state == MAC80211_LINKED)
+                        rtlpriv->cfg->ops->led_control(hw, LED_CTL_LINK);
+                else
+                        rtlpriv->cfg->ops->led_control(hw, LED_CTL_NO_LINK);
+                break;
+        case ERFOFF:
+                for (queue_id = 0, i = 0;
+                     queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
+                        ring = &pcipriv->dev.tx_ring[queue_id];
+                        if (queue_id == BEACON_QUEUE ||
+                            skb_queue_len(&ring->queue) == 0) {
+                                queue_id++;
+                                continue;
+                        } else {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         (i + 1), queue_id,
+                                         skb_queue_len(&ring->queue));
+
+                                udelay(10);
+                                i++;
+                        }
+                        if (i >= MAX_DOZE_WAITING_TIMES_9x) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                          MAX_DOZE_WAITING_TIMES_9x,
+                                          queue_id,
+                                          skb_queue_len(&ring->queue));
+                                break;
+                        }
+                }
+
+                if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                 "IPS Set eRf nic disable\n");
+                        rtl_ps_disable_nic(hw);
+                        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+                } else {
+                        if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS) {
+                                rtlpriv->cfg->ops->led_control(hw,
+                                                        LED_CTL_NO_LINK);
+                        } else {
+                                rtlpriv->cfg->ops->led_control(hw,
+                                                        LED_CTL_POWER_OFF);
+                        }
+                }
+                break;
+        case ERFSLEEP:
+                if (ppsc->rfpwr_state == ERFOFF)
+                        break;
+                for (queue_id = 0, i = 0;
+                     queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
+                        ring = &pcipriv->dev.tx_ring[queue_id];
+                        if (skb_queue_len(&ring->queue) == 0) {
+                                queue_id++;
+                                continue;
+                        } else {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         (i + 1), queue_id,
+                                         skb_queue_len(&ring->queue));
+                                udelay(10);
+                                i++;
+                        }
+                        if (i >= MAX_DOZE_WAITING_TIMES_9x) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                          MAX_DOZE_WAITING_TIMES_9x,
+                                          queue_id,
+                                          skb_queue_len(&ring->queue));
+                                break;
+                        }
+                }
+                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                         "Set ERFSLEEP awaked:%d ms\n",
+                          jiffies_to_msecs(jiffies -
+                                           ppsc->last_awake_jiffies));
+                ppsc->last_sleep_jiffies = jiffies;
+                _rtl92ee_phy_set_rf_sleep(hw);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
+                bresult = false;
+                break;
+        }
+        if (bresult)
+                ppsc->rfpwr_state = rfpwr_state;
+        return bresult;
+}
+
+bool rtl92ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                    enum rf_pwrstate rfpwr_state)
+{
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+
+        bool bresult = false;
+
+        if (rfpwr_state == ppsc->rfpwr_state)
+                return bresult;
+        bresult = _rtl92ee_phy_set_rf_power_state(hw, rfpwr_state);
+        return bresult;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/phy.h b/drivers/net/wireless/rtlwifi/rtl8192ee/phy.h
new file mode 100644
index 000000000000..c6e97c8df54c
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/phy.h
@@ -0,0 +1,153 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_PHY_H__
+#define __RTL92E_PHY_H__
+
+/* MAX_TX_COUNT must always set to 4, otherwise read efuse table sequence
+ * will be wrong.
+ */
+#define MAX_TX_COUNT                            4
+#define TX_1S                                   0
+#define TX_2S                                   1
+#define TX_3S                                   2
+#define TX_4S                                   3
+
+#define MAX_POWER_INDEX                         0x3f
+
+#define MAX_PRECMD_CNT                          16
+#define MAX_RFDEPENDCMD_CNT                     16
+#define MAX_POSTCMD_CNT                         16
+
+#define MAX_DOZE_WAITING_TIMES_9x               64
+
+#define RT_CANNOT_IO(hw)                        false
+#define HIGHPOWER_RADIOA_ARRAYLEN               22
+
+#define IQK_ADDA_REG_NUM                        16
+#define IQK_MAC_REG_NUM                         4
+#define IQK_BB_REG_NUM                          9
+#define MAX_TOLERANCE                           5
+#define IQK_DELAY_TIME                          10
+#define index_mapping_NUM                       15
+
+#define APK_BB_REG_NUM                          5
+#define APK_AFE_REG_NUM                         16
+#define APK_CURVE_REG_NUM                       4
+#define PATH_NUM                                2
+
+#define LOOP_LIMIT                              5
+#define MAX_STALL_TIME                          50
+#define ANTENNADIVERSITYVALUE                   0x80
+#define MAX_TXPWR_IDX_NMODE_92S                 63
+#define RESET_CNT_LIMIT                         3
+
+#define RF6052_MAX_PATH                         2
+
+#define CT_OFFSET_MAC_ADDR                      0X16
+
+#define CT_OFFSET_CCK_TX_PWR_IDX                0x5A
+#define CT_OFFSET_HT401S_TX_PWR_IDX             0x60
+#define CT_OFFSET_HT402S_TX_PWR_IDX_DIFF        0x66
+#define CT_OFFSET_HT20_TX_PWR_IDX_DIFF          0x69
+#define CT_OFFSET_OFDM_TX_PWR_IDX_DIFF          0x6C
+
+#define CT_OFFSET_HT40_MAX_PWR_OFFSET           0x6F
+#define CT_OFFSET_HT20_MAX_PWR_OFFSET           0x72
+
+#define CT_OFFSET_CHANNEL_PLAH                  0x75
+#define CT_OFFSET_THERMAL_METER                 0x78
+#define CT_OFFSET_RF_OPTION                     0x79
+#define CT_OFFSET_VERSION                       0x7E
+#define CT_OFFSET_CUSTOMER_ID                   0x7F
+
+#define RTL92C_MAX_PATH_NUM                     2
+
+enum swchnlcmd_id {
+        CMDID_END,
+        CMDID_SET_TXPOWEROWER_LEVEL,
+        CMDID_BBREGWRITE10,
+        CMDID_WRITEPORT_ULONG,
+        CMDID_WRITEPORT_USHORT,
+        CMDID_WRITEPORT_UCHAR,
+        CMDID_RF_WRITEREG,
+};
+
+struct swchnlcmd {
+        enum swchnlcmd_id cmdid;
+        u32 para1;
+        u32 para2;
+        u32 msdelay;
+};
+
+enum baseband_config_type {
+        BASEBAND_CONFIG_PHY_REG = 0,
+        BASEBAND_CONFIG_AGC_TAB = 1,
+};
+
+enum ant_div_type {
+        NO_ANTDIV = 0xFF,
+        CG_TRX_HW_ANTDIV = 0x01,
+        CGCS_RX_HW_ANTDIV = 0x02,
+        FIXED_HW_ANTDIV = 0x03,
+        CG_TRX_SMART_ANTDIV = 0x04,
+        CGCS_RX_SW_ANTDIV = 0x05,
+};
+
+u32 rtl92ee_phy_query_bb_reg(struct ieee80211_hw *hw,
+                             u32 regaddr, u32 bitmask);
+void rtl92ee_phy_set_bb_reg(struct ieee80211_hw *hw,
+                            u32 regaddr, u32 bitmask, u32 data);
+u32 rtl92ee_phy_query_rf_reg(struct ieee80211_hw *hw,
+                             enum radio_path rfpath, u32 regaddr,
+                             u32 bitmask);
+void rtl92ee_phy_set_rf_reg(struct ieee80211_hw *hw,
+                            enum radio_path rfpath, u32 regaddr,
+                            u32 bitmask, u32 data);
+bool rtl92ee_phy_mac_config(struct ieee80211_hw *hw);
+bool rtl92ee_phy_bb_config(struct ieee80211_hw *hw);
+bool rtl92ee_phy_rf_config(struct ieee80211_hw *hw);
+void rtl92ee_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw);
+void rtl92ee_phy_get_txpower_level(struct ieee80211_hw *hw,
+                                   long *powerlevel);
+void rtl92ee_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel);
+void rtl92ee_phy_scan_operation_backup(struct ieee80211_hw *hw,
+                                       u8 operation);
+void rtl92ee_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
+void rtl92ee_phy_set_bw_mode(struct ieee80211_hw *hw,
+                             enum nl80211_channel_type ch_type);
+void rtl92ee_phy_sw_chnl_callback(struct ieee80211_hw *hw);
+u8 rtl92ee_phy_sw_chnl(struct ieee80211_hw *hw);
+void rtl92ee_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery);
+void rtl92ee_phy_ap_calibrate(struct ieee80211_hw *hw, char delta);
+void rtl92ee_phy_lc_calibrate(struct ieee80211_hw *hw);
+void rtl92ee_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain);
+bool rtl92ee_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                           enum radio_path rfpath);
+bool rtl92ee_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype);
+bool rtl92ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                    enum rf_pwrstate rfpwr_state);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.c b/drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.c
new file mode 100644
index 000000000000..1a701d007f0c
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.c
@@ -0,0 +1,112 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "pwrseq.h"
+
+/* drivers should parse below arrays and do the corresponding actions */
+
+/*3 Power on  Array*/
+struct wlan_pwr_cfg rtl8192E_power_on_flow
+                [RTL8192E_TRANS_CARDEMU_TO_ACT_STEPS +
+                 RTL8192E_TRANS_END_STEPS] = {
+        RTL8192E_TRANS_CARDEMU_TO_ACT
+        RTL8192E_TRANS_END
+};
+
+/*3Radio off GPIO Array */
+struct wlan_pwr_cfg rtl8192E_radio_off_flow
+                [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS
+                + RTL8192E_TRANS_END_STEPS] = {
+        RTL8192E_TRANS_ACT_TO_CARDEMU
+        RTL8192E_TRANS_END
+};
+
+/*3Card Disable Array*/
+struct wlan_pwr_cfg rtl8192E_card_disable_flow
+                [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8192E_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8192E_TRANS_END_STEPS] = {
+        RTL8192E_TRANS_ACT_TO_CARDEMU
+        RTL8192E_TRANS_CARDEMU_TO_CARDDIS
+        RTL8192E_TRANS_END
+};
+
+/*3 Card Enable Array*/
+struct wlan_pwr_cfg rtl8192E_card_enable_flow
+                [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8192E_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8192E_TRANS_END_STEPS] = {
+        RTL8192E_TRANS_CARDDIS_TO_CARDEMU
+        RTL8192E_TRANS_CARDEMU_TO_ACT
+        RTL8192E_TRANS_END
+};
+
+/*3Suspend Array*/
+struct wlan_pwr_cfg rtl8192E_suspend_flow
+                [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8192E_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8192E_TRANS_END_STEPS] = {
+        RTL8192E_TRANS_ACT_TO_CARDEMU
+        RTL8192E_TRANS_CARDEMU_TO_SUS
+        RTL8192E_TRANS_END
+};
+
+/*3 Resume Array*/
+struct wlan_pwr_cfg rtl8192E_resume_flow
+                [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8192E_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8192E_TRANS_END_STEPS] = {
+        RTL8192E_TRANS_SUS_TO_CARDEMU
+        RTL8192E_TRANS_CARDEMU_TO_ACT
+        RTL8192E_TRANS_END
+};
+
+/*3HWPDN Array*/
+struct wlan_pwr_cfg rtl8192E_hwpdn_flow
+                [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8192E_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8192E_TRANS_END_STEPS] = {
+        RTL8192E_TRANS_ACT_TO_CARDEMU
+        RTL8192E_TRANS_CARDEMU_TO_PDN
+        RTL8192E_TRANS_END
+};
+
+/*3 Enter LPS */
+struct wlan_pwr_cfg rtl8192E_enter_lps_flow
+                [RTL8192E_TRANS_ACT_TO_LPS_STEPS +
+                 RTL8192E_TRANS_END_STEPS] = {
+        /*FW behavior*/
+        RTL8192E_TRANS_ACT_TO_LPS
+        RTL8192E_TRANS_END
+};
+
+/*3 Leave LPS */
+struct wlan_pwr_cfg rtl8192E_leave_lps_flow
+                [RTL8192E_TRANS_LPS_TO_ACT_STEPS +
+                 RTL8192E_TRANS_END_STEPS] = {
+        /*FW behavior*/
+        RTL8192E_TRANS_LPS_TO_ACT
+        RTL8192E_TRANS_END
+};
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.h b/drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.h
new file mode 100644
index 000000000000..781eeaa6af49
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.h
@@ -0,0 +1,340 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_PWRSEQ_H__
+#define __RTL92E_PWRSEQ_H__
+
+#include "../pwrseqcmd.h"
+/**
+ *      Check document WM-20110607-Paul-RTL8192E_Power_Architecture-R02.vsd
+ *      There are 6 HW Power States:
+ *      0: POFF--Power Off
+ *      1: PDN--Power Down
+ *      2: CARDEMU--Card Emulation
+ *      3: ACT--Active Mode
+ *      4: LPS--Low Power State
+ *      5: SUS--Suspend
+ *
+ *      The transision from different states are defined below
+ *      TRANS_CARDEMU_TO_ACT
+ *      TRANS_ACT_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_SUS
+ *      TRANS_SUS_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_PDN
+ *      TRANS_ACT_TO_LPS
+ *      TRANS_LPS_TO_ACT
+ *
+ *      TRANS_END
+ *      PWR SEQ Version: rtl8192E_PwrSeq_V09.h
+ */
+
+#define RTL8192E_TRANS_CARDEMU_TO_ACT_STEPS     18
+#define RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS     18
+#define RTL8192E_TRANS_CARDEMU_TO_SUS_STEPS     18
+#define RTL8192E_TRANS_SUS_TO_CARDEMU_STEPS     18
+#define RTL8192E_TRANS_CARDEMU_TO_PDN_STEPS     18
+#define RTL8192E_TRANS_PDN_TO_CARDEMU_STEPS     18
+#define RTL8192E_TRANS_ACT_TO_LPS_STEPS         23
+#define RTL8192E_TRANS_LPS_TO_ACT_STEPS         23
+#define RTL8192E_TRANS_END_STEPS                1
+
+#define RTL8192E_TRANS_CARDEMU_TO_ACT                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /* disable HWPDN 0x04[15]=0*/                                   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(7), 0},                  \
+        /* disable SW LPS 0x04[10]=0*/                                  \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(2), 0},                  \
+        /* disable WL suspend*/                                         \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, (BIT(4)|BIT(3)), 0},         \
+        /* wait till 0x04[17] = 1    power ready*/                      \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_POLLING, BIT(1), BIT(1)},           \
+        /* release WLON reset  0x04[16]=1*/                             \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(0), BIT(0)},             \
+        /* polling until return 0*/                                     \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(0), BIT(0)},             \
+        /**/                                                            \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_POLLING, BIT(0), 0},
+
+#define RTL8192E_TRANS_ACT_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /*0x1F[7:0] = 0 turn off RF*/                                   \
+        {0x001F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0},                    \
+        /*0x4C[23]=0x4E[7]=0, switch DPDT_SEL_P output from register 0x65[2] */\
+        {0x004E, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(7), 0},                  \
+        /*0x04[9] = 1 turn off MAC by HW state machine*/                \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(1), BIT(1)},             \
+        /*wait till 0x04[9] = 0 polling until return 0 to disable*/     \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_POLLING, BIT(1), 0},
+
+#define RTL8192E_TRANS_CARDEMU_TO_SUS                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/              \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(4) | BIT(3), (BIT(4) | BIT(3))},\
+        /*0x04[12:11] = 2b'01 enable WL suspend*/                       \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+         PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK, PWR_BASEADDR_MAC,        \
+         PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},                         \
+        /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/              \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(3) | BIT(4), BIT(3) | BIT(4)},\
+        /*Set SDIO suspend local register*/                             \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_WRITE, BIT(0), BIT(0)},            \
+         /*wait power state to suspend*/                                \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_POLLING, BIT(1), 0},
+
+#define RTL8192E_TRANS_SUS_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /*Set SDIO suspend local register*/                             \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_WRITE, BIT(0), 0},                 \
+        /*wait power state to suspend*/                                 \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_POLLING, BIT(1), BIT(1)},          \
+        /*0x04[12:11] = 2b'01enable WL suspend*/                        \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(3) | BIT(4), 0},
+
+#define RTL8192E_TRANS_CARDEMU_TO_CARDDIS                               \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /*0x07=0x20 , SOP option to disable BG/MB*/                     \
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0x20},                 \
+        /*Unlock small LDO Register*/                                   \
+        {0x00CC, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(2), BIT(2)},             \
+        /*Disable small LDO*/                                           \
+        {0x0011, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(0), 0},                  \
+        /*0x04[12:11] = 2b'01 enable WL suspend*/                       \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK, PWR_BASEADDR_MAC,          \
+         PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},                         \
+        /*0x04[10] = 1, enable SW LPS*/                                 \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(2), BIT(2)},             \
+        /*Set SDIO suspend local register*/                             \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_WRITE, BIT(0), BIT(0)},            \
+        /*wait power state to suspend*/                                 \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_POLLING, BIT(1), 0},
+
+#define RTL8192E_TRANS_CARDDIS_TO_CARDEMU                               \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /*Set SDIO suspend local register*/                             \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_WRITE, BIT(0), 0},                 \
+        /*wait power state to suspend*/                                 \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_POLLING, BIT(1), BIT(1)},          \
+        /*Enable small LDO*/                                            \
+        {0x0011, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(0), BIT(0)},             \
+        /*Lock small LDO Register*/                                     \
+        {0x00CC, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(2), 0},                  \
+        /*0x04[12:11] = 2b'01enable WL suspend*/                        \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(3) | BIT(4), 0},
+
+#define RTL8192E_TRANS_CARDEMU_TO_PDN                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /* 0x04[16] = 0*/                                               \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(0), 0},                  \
+        /* 0x04[15] = 1*/                                               \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(7), BIT(7)},
+
+#define RTL8192E_TRANS_PDN_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /* 0x04[15] = 0*/                                               \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(7), 0},
+
+#define RTL8192E_TRANS_ACT_TO_LPS                                       \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /*PCIe DMA stop*/                                               \
+        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0xFF},                 \
+        /*Tx Pause*/                                                    \
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0xFF},                 \
+        /*Should be zero if no packet is transmitting*/                 \
+        {0x05F8, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_POLLING, 0xFF, 0},                  \
+        /*Should be zero if no packet is transmitting*/                 \
+        {0x05F9, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_POLLING, 0xFF, 0},                  \
+        /*Should be zero if no packet is transmitting*/                 \
+        {0x05FA, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_POLLING, 0xFF, 0},                  \
+        /*Should be zero if no packet is transmitting*/                 \
+        {0x05FB, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_POLLING, 0xFF, 0},                  \
+        /*CCK and OFDM are disabled,and clock are gated*/               \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(0), 0},                  \
+        /*Delay 1us*/                                                   \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US},         \
+        /*Whole BB is reset*/                                           \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(1), 0},                  \
+        /*Reset MAC TRX*/                                               \
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0x03},                 \
+        /*check if removed later*/                                      \
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(1), 0},                  \
+        /*When driver enter Sus/ Disable, enable LOP for BT*/           \
+        {0x0093, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0x00},                 \
+        /*Respond TxOK to scheduler*/                                   \
+        {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(5), BIT(5)},
+
+#define RTL8192E_TRANS_LPS_TO_ACT                                       \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /*SDIO RPWM, For Repeatly In and out, Taggle bit should be changed*/\
+        {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
+         PWR_BASEADDR_SDIO , PWR_CMD_WRITE, 0xFF, 0x84},                \
+        /*USB RPWM*/                                                    \
+        {0xFE58, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0x84},                 \
+        /*PCIe RPWM*/                                                   \
+        {0x0361, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0x84},                 \
+        /*Delay*/                                                       \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS},         \
+        /*0x08[4] = 0 switch TSF to 40M*/                               \
+        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(4), 0},                  \
+        /*Polling 0x109[7]=0  TSF in 40M*/                              \
+        {0x0109, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_POLLING, BIT(7), 0},                \
+        /*0x101[1] = 1*/                                                \
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(1), BIT(1)},             \
+        /*0x100[7:0] = 0xFF  enable WMAC TRX*/                          \
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0xFF},                 \
+        /* 0x02[1:0] = 2b'11 enable BB macro*/                          \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(1) | BIT(0), BIT(1) | BIT(0)},\
+        /*0x522 = 0*/                                                   \
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0},                    \
+        /*Clear ISR*/                                                   \
+        {0x013D, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         PWR_BASEADDR_MAC , PWR_CMD_WRITE, 0xFF, 0xFF},
+
+#define RTL8192E_TRANS_END                                              \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+         0, PWR_CMD_END, 0, 0},
+
+extern struct wlan_pwr_cfg rtl8192E_power_on_flow
+                                        [RTL8192E_TRANS_CARDEMU_TO_ACT_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8192E_radio_off_flow
+                                        [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8192E_card_disable_flow
+                                        [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                                         RTL8192E_TRANS_CARDEMU_TO_PDN_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8192E_card_enable_flow
+                                        [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                                         RTL8192E_TRANS_CARDEMU_TO_PDN_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8192E_suspend_flow
+                                        [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                                         RTL8192E_TRANS_CARDEMU_TO_SUS_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8192E_resume_flow
+                                        [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                                         RTL8192E_TRANS_CARDEMU_TO_SUS_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8192E_hwpdn_flow
+                                        [RTL8192E_TRANS_ACT_TO_CARDEMU_STEPS +
+                                         RTL8192E_TRANS_CARDEMU_TO_PDN_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8192E_enter_lps_flow
+                                        [RTL8192E_TRANS_ACT_TO_LPS_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8192E_leave_lps_flow
+                                        [RTL8192E_TRANS_LPS_TO_ACT_STEPS +
+                                         RTL8192E_TRANS_END_STEPS];
+
+/* RTL8192EE Power Configuration CMDs for PCIe interface */
+#define RTL8192E_NIC_PWR_ON_FLOW        rtl8192E_power_on_flow
+#define RTL8192E_NIC_RF_OFF_FLOW        rtl8192E_radio_off_flow
+#define RTL8192E_NIC_DISABLE_FLOW       rtl8192E_card_disable_flow
+#define RTL8192E_NIC_ENABLE_FLOW        rtl8192E_card_enable_flow
+#define RTL8192E_NIC_SUSPEND_FLOW       rtl8192E_suspend_flow
+#define RTL8192E_NIC_RESUME_FLOW        rtl8192E_resume_flow
+#define RTL8192E_NIC_PDN_FLOW           rtl8192E_hwpdn_flow
+#define RTL8192E_NIC_LPS_ENTER_FLOW     rtl8192E_enter_lps_flow
+#define RTL8192E_NIC_LPS_LEAVE_FLOW     rtl8192E_leave_lps_flow
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ee/reg.h
new file mode 100644
index 000000000000..3f2a9596e7cd
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/reg.h
@@ -0,0 +1,2231 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_REG_H__
+#define __RTL92E_REG_H__
+
+#define TXPKT_BUF_SELECT                        0x69
+#define RXPKT_BUF_SELECT                        0xA5
+#define DISABLE_TRXPKT_BUF_ACCESS               0x0
+
+#define REG_SYS_ISO_CTRL                        0x0000
+#define REG_SYS_FUNC_EN                         0x0002
+#define REG_APS_FSMCO                           0x0004
+#define REG_SYS_CLKR                            0x0008
+#define REG_9346CR                              0x000A
+#define REG_EE_VPD                              0x000C
+#define REG_SYS_SWR_CTRL1                       0x0010
+#define REG_SPS0_CTRL                           0x0011
+#define REG_SYS_SWR_CTRL2                       0x0014
+#define REG_SYS_SWR_CTRL3                       0x0018
+#define REG_RSV_CTRL                            0x001C
+#define REG_RF_CTRL                             0x001F
+#define REG_LPLDO_CTRL                          0x0023
+#define REG_AFE_CTRL1                           0x0024
+#define REG_AFE_XTAL_CTRL                       0x0024
+#define REG_AFE_CTRL2                           0x0028
+#define REG_MAC_PHY_CTRL                        0x002c
+#define REG_AFE_CTRL3                           0x002c
+#define REG_EFUSE_CTRL                          0x0030
+#define REG_EFUSE_TEST                          0x0034
+#define REG_PWR_DATA                            0x0038
+#define REG_CAL_TIMER                           0x003C
+#define REG_ACLK_MON                            0x003E
+#define REG_GPIO_MUXCFG                         0x0040
+#define REG_GPIO_IO_SEL                         0x0042
+#define REG_MAC_PINMUX_CFG                      0x0043
+#define REG_GPIO_PIN_CTRL                       0x0044
+#define REG_GPIO_INTM                           0x0048
+#define REG_LEDCFG0                             0x004C
+#define REG_LEDCFG1                             0x004D
+#define REG_LEDCFG2                             0x004E
+#define REG_LEDCFG3                             0x004F
+#define REG_FSIMR                               0x0050
+#define REG_FSISR                               0x0054
+#define REG_HSIMR                               0x0058
+#define REG_HSISR                               0x005c
+#define REG_SDIO_CTRL                           0x0070
+#define REG_OPT_CTRL                            0x0074
+#define REG_GPIO_OUTPUT                         0x006c
+#define REG_AFE_CTRL4                           0x0078
+#define REG_MCUFWDL                             0x0080
+
+#define REG_HIMR                                0x00B0
+#define REG_HISR                                0x00B4
+#define REG_HIMRE                               0x00B8
+#define REG_HISRE                               0x00BC
+
+#define REG_EFUSE_ACCESS                        0x00CF
+#define REG_HPON_FSM                            0x00EC
+#define REG_SYS_CFG1                            0x00F0
+#define REG_SYS_CFG2                            0x00FC
+
+#define REG_CR                                  0x0100
+#define REG_PBP                                 0x0104
+#define REG_PKT_BUFF_ACCESS_CTRL                0x0106
+#define REG_TRXDMA_CTRL                         0x010C
+#define REG_TRXFF_BNDY                          0x0114
+#define REG_TRXFF_STATUS                        0x0118
+#define REG_RXFF_PTR                            0x011C
+
+#define REG_CPWM                                0x012F
+#define REG_FWIMR                               0x0130
+#define REG_FWISR                               0x0134
+#define REG_PKTBUF_DBG_CTRL                     0x0140
+#define REG_RXPKTBUF_CTRL                       0x0142
+#define REG_PKTBUF_DBG_DATA_L                   0x0144
+#define REG_PKTBUF_DBG_DATA_H                   0x0148
+
+#define REG_TC0_CTRL                            0x0150
+#define REG_TC1_CTRL                            0x0154
+#define REG_TC2_CTRL                            0x0158
+#define REG_TC3_CTRL                            0x015C
+#define REG_TC4_CTRL                            0x0160
+#define REG_TCUNIT_BASE                         0x0164
+#define REG_RSVD3                               0x0168
+#define REG_C2HEVT_MSG_NORMAL                   0x01A0
+#define REG_C2HEVT_CLEAR                        0x01AF
+#define REG_MCUTST_1                            0x01c0
+#define REG_MCUTST_WOWLAN                       0x01C7
+#define REG_FMETHR                              0x01C8
+#define REG_HMETFR                              0x01CC
+#define REG_HMEBOX_0                            0x01D0
+#define REG_HMEBOX_1                            0x01D4
+#define REG_HMEBOX_2                            0x01D8
+#define REG_HMEBOX_3                            0x01DC
+
+#define REG_LLT_INIT                            0x01E0
+
+#define REG_HMEBOX_EXT_0                        0x01F0
+#define REG_HMEBOX_EXT_1                        0x01F4
+#define REG_HMEBOX_EXT_2                        0x01F8
+#define REG_HMEBOX_EXT_3                        0x01FC
+
+/*-----------------------------------------------------
+ *
+ *      0x0200h ~ 0x027Fh       TXDMA Configuration
+ *
+ *-----------------------------------------------------
+ */
+#define REG_RQPN                                0x0200
+#define REG_FIFOPAGE                            0x0204
+#define REG_DWBCN0_CTRL                         0x0208
+#define REG_TXDMA_OFFSET_CHK                    0x020C
+#define REG_TXDMA_STATUS                        0x0210
+#define REG_RQPN_NPQ                            0x0214
+#define REG_AUTO_LLT                            0x0224
+#define REG_DWBCN1_CTRL                         0x0228
+
+/*-----------------------------------------------------
+ *
+ *      0x0280h ~ 0x02FFh       RXDMA Configuration
+ *
+ *-----------------------------------------------------
+ */
+#define REG_RXDMA_AGG_PG_TH                     0x0280
+#define REG_FW_UPD_RDPTR                        0x0284
+#define REG_RXDMA_CONTROL                       0x0286
+#define REG_RXPKT_NUM                           0x0287
+#define REG_RXDMA_STATUS                        0x0288
+#define REG_RXDMA_PRO                           0x0290
+#define REG_EARLY_MODE_CONTROL                  0x02BC
+#define REG_RSVD5                               0x02F0
+#define REG_RSVD6                               0x02F4
+
+/*-----------------------------------------------------
+ *
+ *      0x0300h ~ 0x03FFh       PCIe
+ *
+ *-----------------------------------------------------
+ */
+#define REG_PCIE_CTRL_REG                       0x0300
+#define REG_INT_MIG                             0x0304
+#define REG_BCNQ_DESA                           0x0308
+#define REG_MGQ_DESA                            0x0310
+#define REG_VOQ_DESA                            0x0318
+#define REG_VIQ_DESA                            0x0320
+#define REG_BEQ_DESA                            0x0328
+#define REG_BKQ_DESA                            0x0330
+#define REG_RX_DESA                             0x0338
+#define REG_HQ0_DESA                            0x0340
+#define REG_HQ1_DESA                            0x0348
+#define REG_HQ2_DESA                            0x0350
+#define REG_HQ3_DESA                            0x0358
+#define REG_HQ4_DESA                            0x0360
+#define REG_HQ5_DESA                            0x0368
+#define REG_HQ6_DESA                            0x0370
+#define REG_HQ7_DESA                            0x0378
+#define REG_MGQ_TXBD_NUM                        0x0380
+#define REG_RX_RXBD_NUM                         0x0382
+#define REG_VOQ_TXBD_NUM                        0x0384
+#define REG_VIQ_TXBD_NUM                        0x0386
+#define REG_BEQ_TXBD_NUM                        0x0388
+#define REG_BKQ_TXBD_NUM                        0x038A
+#define REG_HI0Q_TXBD_NUM                       0x038C
+#define REG_HI1Q_TXBD_NUM                       0x038E
+#define REG_HI2Q_TXBD_NUM                       0x0390
+#define REG_HI3Q_TXBD_NUM                       0x0392
+#define REG_HI4Q_TXBD_NUM                       0x0394
+#define REG_HI5Q_TXBD_NUM                       0x0396
+#define REG_HI6Q_TXBD_NUM                       0x0398
+#define REG_HI7Q_TXBD_NUM                       0x039A
+#define REG_TSFTIMER_HCI                        0x039C
+/*Read Write Point*/
+#define REG_VOQ_TXBD_IDX                        0x03A0
+#define REG_VIQ_TXBD_IDX                        0x03A4
+#define REG_BEQ_TXBD_IDX                        0x03A8
+#define REG_BKQ_TXBD_IDX                        0x03AC
+#define REG_MGQ_TXBD_IDX                        0x03B0
+#define REG_RXQ_TXBD_IDX                        0x03B4
+
+#define REG_HI0Q_TXBD_IDX                       0x03B8
+#define REG_HI1Q_TXBD_IDX                       0x03BC
+#define REG_HI2Q_TXBD_IDX                       0x03C0
+#define REG_HI3Q_TXBD_IDX                       0x03C4
+
+#define REG_HI4Q_TXBD_IDX                       0x03C8
+#define REG_HI5Q_TXBD_IDX                       0x03CC
+#define REG_HI6Q_TXBD_IDX                       0x03D0
+#define REG_HI7Q_TXBD_IDX                       0x03D4
+#define REG_PCIE_HCPWM                          0x03D8
+#define REG_PCIE_CTRL2                          0x03DB
+#define REG_PCIE_HRPWM                          0x03DC
+#define REG_H2C_MSG_DRV2FW_INFO                 0x03E0
+#define REG_PCIE_C2H_MSG_REQUEST                0x03E4
+#define REG_BACKDOOR_DBI_WDATA                  0x03E8
+#define REG_BACKDOOR_DBI_RDATA                  0x03EC
+#define REG_BACKDOOR_DBI_DATA                   0x03F0
+#define REG_MDIO                                0x03F4
+#define REG_MDIO_DATA                           0x03F8
+
+#define REG_HDAQ_DESA_NODEF                     0x0000
+#define REG_CMDQ_DESA_NODEF                     0x0000
+/* spec version 11
+ *-----------------------------------------------------
+ *
+ *      0x0400h ~ 0x047Fh       Protocol Configuration
+ *
+ *-----------------------------------------------------
+ */
+#define REG_VOQ_INFORMATION                     0x0400
+#define REG_VIQ_INFORMATION                     0x0404
+#define REG_BEQ_INFORMATION                     0x0408
+#define REG_BKQ_INFORMATION                     0x040C
+#define REG_MGQ_INFORMATION                     0x0410
+#define REG_HGQ_INFORMATION                     0x0414
+#define REG_BCNQ_INFORMATION                    0x0418
+#define REG_TXPKT_EMPTY                         0x041A
+
+#define REG_FWHW_TXQ_CTRL                       0x0420
+#define REG_HWSEQ_CTRL                          0x0423
+#define REG_BCNQ_BDNY                           0x0424
+#define REG_MGQ_BDNY                            0x0425
+#define REG_LIFECTRL_CTRL                       0x0426
+#define REG_MULTI_BCNQ_OFFSET                   0x0427
+#define REG_SPEC_SIFS                           0x0428
+#define REG_RETRY_LIMIT                         0x042A
+#define REG_TXBF_CTRL                           0x042C
+#define REG_DARFRC                              0x0430
+#define REG_RARFRC                              0x0438
+#define REG_RRSR                                0x0440
+#define REG_ARFR0                               0x0444
+#define REG_ARFR1                               0x044C
+#define REG_AMPDU_MAX_TIME                      0x0456
+#define REG_BCNQ1_BDNY                          0x0457
+#define REG_AGGLEN_LMT                          0x0458
+#define REG_AMPDU_MIN_SPACE                     0x045C
+#define REG_TXPKTBUF_WMAC_LBK_BF_HD             0x045D
+#define REG_NDPA_OPT_CTRL                       0x045F
+#define REG_FAST_EDCA_CTRL                      0x0460
+#define REG_RD_RESP_PKT_TH                      0x0463
+#define REG_POWER_STAGE1                        0x04B4
+#define REG_POWER_STAGE2                        0x04B8
+#define REG_AMPDU_BURST_MODE                    0x04BC
+#define REG_PKT_VO_VI_LIFE_TIME                 0x04C0
+#define REG_PKT_BE_BK_LIFE_TIME                 0x04C2
+#define REG_STBC_SETTING                        0x04C4
+#define REG_PROT_MODE_CTRL                      0x04C8
+#define REG_MAX_AGGR_NUM                        0x04CA
+#define REG_RTS_MAX_AGGR_NUM                    0x04CB
+#define REG_BAR_MODE_CTRL                       0x04CC
+#define REG_RA_TRY_RATE_AGG_LMT                 0x04CF
+#define REG_MACID_PKT_DROP0                     0x04D0
+
+/*-----------------------------------------------------
+ *
+ *      0x0500h ~ 0x05FFh       EDCA Configuration
+ *
+ *-----------------------------------------------------
+ */
+#define REG_EDCA_VO_PARAM                       0x0500
+#define REG_EDCA_VI_PARAM                       0x0504
+#define REG_EDCA_BE_PARAM                       0x0508
+#define REG_EDCA_BK_PARAM                       0x050C
+#define REG_BCNTCFG                             0x0510
+#define REG_PIFS                                0x0512
+#define REG_RDG_PIFS                            0x0513
+#define REG_SIFS_CTX                            0x0514
+#define REG_SIFS_TRX                            0x0516
+#define REG_AGGR_BREAK_TIME                     0x051A
+#define REG_SLOT                                0x051B
+#define REG_TX_PTCL_CTRL                        0x0520
+#define REG_TXPAUSE                             0x0522
+#define REG_DIS_TXREQ_CLR                       0x0523
+#define REG_RD_CTRL                             0x0524
+
+#define REG_TBTT_PROHIBIT                       0x0540
+#define REG_RD_NAV_NXT                          0x0544
+#define REG_NAV_PROT_LEN                        0x0546
+#define REG_BCN_CTRL                            0x0550
+#define REG_BCN_CTRL_1                          0x0551
+#define REG_MBID_NUM                            0x0552
+#define REG_DUAL_TSF_RST                        0x0553
+#define REG_BCN_INTERVAL                        0x0554
+#define REG_DRVERLYINT                          0x0558
+#define REG_BCNDMATIM                           0x0559
+#define REG_ATIMWND                             0x055A
+#define REG_BCN_MAX_ERR                         0x055D
+#define REG_RXTSF_OFFSET_CCK                    0x055E
+#define REG_RXTSF_OFFSET_OFDM                   0x055F
+#define REG_TSFTR                               0x0560
+#define REG_CTWND                               0x0572
+#define REG_PSTIMER                             0x0580
+#define REG_TIMER0                              0x0584
+#define REG_TIMER1                              0x0588
+#define REG_BCN_PREDL_ITV                       0x058F
+#define REG_ACMHWCTRL                           0x05C0
+
+/*-----------------------------------------------------
+ *
+ *      0x0600h ~ 0x07FFh       WMAC Configuration
+ *
+ *-----------------------------------------------------
+ */
+#define REG_MAC_CR                              0x0600
+#define REG_BWOPMODE                            0x0603
+#define REG_TCR                                 0x0604
+#define REG_RCR                                 0x0608
+#define REG_RX_PKT_LIMIT                        0x060C
+#define REG_RX_DLK_TIME                         0x060D
+#define REG_RX_DRVINFO_SZ                       0x060F
+
+#define REG_MACID                               0x0610
+#define REG_BSSID                               0x0618
+#define REG_MAR                                 0x0620
+#define REG_MBIDCAMCFG                          0x0628
+
+#define REG_USTIME_EDCA                         0x0638
+#define REG_MAC_SPEC_SIFS                       0x063A
+#define REG_RESP_SIFS_CCK                       0x063C
+#define REG_RESP_SIFS_OFDM                      0x063E
+#define REG_ACKTO                               0x0640
+#define REG_CTS2TO                              0x0641
+#define REG_EIFS                                0x0642
+
+#define REG_NAV_UPPER                           0x0652
+
+/* Security*/
+#define REG_CAMCMD                              0x0670
+#define REG_CAMWRITE                            0x0674
+#define REG_CAMREAD                             0x0678
+#define REG_CAMDBG                              0x067C
+#define REG_SECCFG                              0x0680
+
+/* Power*/
+#define REG_WOW_CTRL                            0x0690
+#define REG_PS_RX_INFO                          0x0692
+#define REG_UAPSD_TID                           0x0693
+#define REG_WKFMCAM_NUM                         0x0698
+#define REG_WKFMCAM_RWD                         0x069C
+#define REG_RXFLTMAP0                           0x06A0
+#define REG_RXFLTMAP1                           0x06A2
+#define REG_RXFLTMAP2                           0x06A4
+#define REG_BCN_PSR_RPT                         0x06A8
+#define REG_BT_COEX_TABLE                       0x06C0
+#define REG_BFMER0_INFO                         0x06E4
+#define REG_BFMER1_INFO                         0x06EC
+#define REG_CSI_RPT_PARAM_BW20                  0x06F4
+#define REG_CSI_RPT_PARAM_BW40                  0x06F8
+#define REG_CSI_RPT_PARAM_BW80                  0x06FC
+/* Hardware Port 2*/
+#define REG_MACID1                              0x0700
+#define REG_BSSID1                              0x0708
+#define REG_BFMEE_SEL                           0x0714
+#define REG_SND_PTCL_CTRL                       0x0718
+
+#define CR9346                                  REG_9346CR
+#define MSR                                     (REG_CR + 2)
+#define ISR                                     REG_HISR
+#define TSFR                                    REG_TSFTR
+
+#define MACIDR0                                 REG_MACID
+#define MACIDR4                                 (REG_MACID + 4)
+
+#define PBP                                     REG_PBP
+
+#define IDR0                                    MACIDR0
+#define IDR4                                    MACIDR4
+
+#define UNUSED_REGISTER                         0x1BF
+#define DCAM                                    UNUSED_REGISTER
+#define PSR                                     UNUSED_REGISTER
+#define BBADDR                                  UNUSED_REGISTER
+#define PHYDATAR                                UNUSED_REGISTER
+
+#define INVALID_BBRF_VALUE                      0x12345678
+
+#define MAX_MSS_DENSITY_2T                      0x13
+#define MAX_MSS_DENSITY_1T                      0x0A
+
+#define CMDEEPROM_EN                            BIT(5)
+#define CMDEEPROM_SEL                           BIT(4)
+#define CMD9346CR_9356SEL                       BIT(4)
+#define AUTOLOAD_EEPROM                         (CMDEEPROM_EN | CMDEEPROM_SEL)
+#define AUTOLOAD_EFUSE                          CMDEEPROM_EN
+
+#define GPIOSEL_GPIO                            0
+#define GPIOSEL_ENBT                            BIT(5)
+
+#define GPIO_IN                                 REG_GPIO_PIN_CTRL
+#define GPIO_OUT                                (REG_GPIO_PIN_CTRL + 1)
+#define GPIO_IO_SEL                             (REG_GPIO_PIN_CTRL + 2)
+#define GPIO_MOD                                (REG_GPIO_PIN_CTRL + 3)
+
+#define MSR_NOLINK                              0x00
+#define MSR_ADHOC                               0x01
+#define MSR_INFRA                               0x02
+#define MSR_AP                                  0x03
+
+#define RRSR_RSC_OFFSET                         21
+#define RRSR_SHORT_OFFSET                       23
+#define RRSR_RSC_BW_40M                         0x600000
+#define RRSR_RSC_UPSUBCHNL                      0x400000
+#define RRSR_RSC_LOWSUBCHNL                     0x200000
+#define RRSR_SHORT                              0x800000
+#define RRSR_1M                                 BIT(0)
+#define RRSR_2M                                 BIT(1)
+#define RRSR_5_5M                               BIT(2)
+#define RRSR_11M                                BIT(3)
+#define RRSR_6M                                 BIT(4)
+#define RRSR_9M                                 BIT(5)
+#define RRSR_12M                                BIT(6)
+#define RRSR_18M                                BIT(7)
+#define RRSR_24M                                BIT(8)
+#define RRSR_36M                                BIT(9)
+#define RRSR_48M                                BIT(10)
+#define RRSR_54M                                BIT(11)
+#define RRSR_MCS0                               BIT(12)
+#define RRSR_MCS1                               BIT(13)
+#define RRSR_MCS2                               BIT(14)
+#define RRSR_MCS3                               BIT(15)
+#define RRSR_MCS4                               BIT(16)
+#define RRSR_MCS5                               BIT(17)
+#define RRSR_MCS6                               BIT(18)
+#define RRSR_MCS7                               BIT(19)
+#define BRSR_ACKSHORTPMB                        BIT(23)
+
+#define RATR_1M                                 0x00000001
+#define RATR_2M                                 0x00000002
+#define RATR_55M                                0x00000004
+#define RATR_11M                                0x00000008
+#define RATR_6M                                 0x00000010
+#define RATR_9M                                 0x00000020
+#define RATR_12M                                0x00000040
+#define RATR_18M                                0x00000080
+#define RATR_24M                                0x00000100
+#define RATR_36M                                0x00000200
+#define RATR_48M                                0x00000400
+#define RATR_54M                                0x00000800
+#define RATR_MCS0                               0x00001000
+#define RATR_MCS1                               0x00002000
+#define RATR_MCS2                               0x00004000
+#define RATR_MCS3                               0x00008000
+#define RATR_MCS4                               0x00010000
+#define RATR_MCS5                               0x00020000
+#define RATR_MCS6                               0x00040000
+#define RATR_MCS7                               0x00080000
+#define RATR_MCS8                               0x00100000
+#define RATR_MCS9                               0x00200000
+#define RATR_MCS10                              0x00400000
+#define RATR_MCS11                              0x00800000
+#define RATR_MCS12                              0x01000000
+#define RATR_MCS13                              0x02000000
+#define RATR_MCS14                              0x04000000
+#define RATR_MCS15                              0x08000000
+
+#define RATE_1M                                 BIT(0)
+#define RATE_2M                                 BIT(1)
+#define RATE_5_5M                               BIT(2)
+#define RATE_11M                                BIT(3)
+#define RATE_6M                                 BIT(4)
+#define RATE_9M                                 BIT(5)
+#define RATE_12M                                BIT(6)
+#define RATE_18M                                BIT(7)
+#define RATE_24M                                BIT(8)
+#define RATE_36M                                BIT(9)
+#define RATE_48M                                BIT(10)
+#define RATE_54M                                BIT(11)
+#define RATE_MCS0                               BIT(12)
+#define RATE_MCS1                               BIT(13)
+#define RATE_MCS2                               BIT(14)
+#define RATE_MCS3                               BIT(15)
+#define RATE_MCS4                               BIT(16)
+#define RATE_MCS5                               BIT(17)
+#define RATE_MCS6                               BIT(18)
+#define RATE_MCS7                               BIT(19)
+#define RATE_MCS8                               BIT(20)
+#define RATE_MCS9                               BIT(21)
+#define RATE_MCS10                              BIT(22)
+#define RATE_MCS11                              BIT(23)
+#define RATE_MCS12                              BIT(24)
+#define RATE_MCS13                              BIT(25)
+#define RATE_MCS14                              BIT(26)
+#define RATE_MCS15                              BIT(27)
+
+#define RATE_ALL_CCK            (RATR_1M | RATR_2M | RATR_55M | RATR_11M)
+#define RATE_ALL_OFDM_AG        (RATR_6M | RATR_9M | RATR_12M | RATR_18M |\
+                                 RATR_24M | RATR_36M | RATR_48M | RATR_54M)
+#define RATE_ALL_OFDM_1SS       (RATR_MCS0 | RATR_MCS1 | RATR_MCS2 |\
+                                 RATR_MCS3 | RATR_MCS4 | RATR_MCS5 |\
+                                 RATR_MCS6 | RATR_MCS7)
+#define RATE_ALL_OFDM_2SS       (RATR_MCS8 | RATR_MCS9 | RATR_MCS10 |\
+                                 RATR_MCS11 | RATR_MCS12 | RATR_MCS13 |\
+                                 RATR_MCS14 | RATR_MCS15)
+
+#define BW_OPMODE_20MHZ                         BIT(2)
+#define BW_OPMODE_5G                            BIT(1)
+#define CAM_VALID                               BIT(15)
+#define CAM_NOTVALID                            0x0000
+#define CAM_USEDK                               BIT(5)
+
+#define CAM_NONE                                0x0
+#define CAM_WEP40                               0x01
+#define CAM_TKIP                                0x02
+#define CAM_AES                                 0x04
+#define CAM_WEP104                              0x05
+
+#define TOTAL_CAM_ENTRY                         32
+#define HALF_CAM_ENTRY                          16
+
+#define CAM_WRITE                               BIT(16)
+#define CAM_READ                                0x00000000
+#define CAM_POLLINIG                            BIT(31)
+
+#define SCR_USEDK                               0x01
+#define SCR_TXSEC_ENABLE                        0x02
+#define SCR_RXSEC_ENABLE                        0x04
+
+/*********************************************
+*       8192EE IMR/ISR bits
+**********************************************/
+#define IMR_DISABLED                            0x0
+/* IMR DW0(0x0060-0063) Bit 0-31 */
+#define IMR_TIMER2                              BIT(31)
+#define IMR_TIMER1                              BIT(30)
+#define IMR_PSTIMEOUT                           BIT(29)
+#define IMR_GTINT4                              BIT(28)
+#define IMR_GTINT3                              BIT(27)
+#define IMR_TBDER                               BIT(26)
+#define IMR_TBDOK                               BIT(25)
+#define IMR_TSF_BIT32_TOGGLE                    BIT(24)
+#define IMR_BCNDMAINT0                          BIT(20)
+#define IMR_BCNDOK0                             BIT(16)
+#define IMR_BCNDMAINT_E                         BIT(14)
+#define IMR_ATIMEND                             BIT(12)
+#define IMR_HISR1_IND_INT                       BIT(11)
+#define IMR_C2HCMD                              BIT(10)
+#define IMR_CPWM2                               BIT(9)
+#define IMR_CPWM                                BIT(8)
+#define IMR_HIGHDOK                             BIT(7)
+#define IMR_MGNTDOK                             BIT(6)
+#define IMR_BKDOK                               BIT(5)
+#define IMR_BEDOK                               BIT(4)
+#define IMR_VIDOK                               BIT(3)
+#define IMR_VODOK                               BIT(2)
+#define IMR_RDU                                 BIT(1)
+#define IMR_ROK                                 BIT(0)
+
+/* IMR DW1(0x00B4-00B7) Bit 0-31 */
+#define IMR_MCUERR                              BIT(28)
+#define IMR_BCNDMAINT7                          BIT(27)
+#define IMR_BCNDMAINT6                          BIT(26)
+#define IMR_BCNDMAINT5                          BIT(25)
+#define IMR_BCNDMAINT4                          BIT(24)
+#define IMR_BCNDMAINT3                          BIT(23)
+#define IMR_BCNDMAINT2                          BIT(22)
+#define IMR_BCNDMAINT1                          BIT(21)
+#define IMR_BCNDOK7                             BIT(20)
+#define IMR_BCNDOK6                             BIT(19)
+#define IMR_BCNDOK5                             BIT(18)
+#define IMR_BCNDOK4                             BIT(17)
+#define IMR_BCNDOK3                             BIT(16)
+#define IMR_BCNDOK2                             BIT(15)
+#define IMR_BCNDOK1                             BIT(14)
+#define IMR_ATIMEND_E                           BIT(13)
+#define IMR_TXERR                               BIT(11)
+#define IMR_RXERR                               BIT(10)
+#define IMR_TXFOVW                              BIT(9)
+#define IMR_RXFOVW                              BIT(8)
+
+#define HWSET_MAX_SIZE                          512
+#define EFUSE_MAX_SECTION                       64
+#define EFUSE_REAL_CONTENT_LEN                  256
+#define EFUSE_OOB_PROTECT_BYTES                 18
+
+#define EEPROM_DEFAULT_TSSI                     0x0
+#define EEPROM_DEFAULT_TXPOWERDIFF              0x0
+#define EEPROM_DEFAULT_CRYSTALCAP               0x5
+#define EEPROM_DEFAULT_BOARDTYPE                0x02
+#define EEPROM_DEFAULT_TXPOWER                  0x1010
+#define EEPROM_DEFAULT_HT2T_TXPWR               0x10
+
+#define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
+#define EEPROM_DEFAULT_THERMALMETER             0x1A
+#define EEPROM_DEFAULT_ANTTXPOWERDIFF           0x0
+#define EEPROM_DEFAULT_TXPWDIFF_CRYSTALCAP      0x5
+#define EEPROM_DEFAULT_TXPOWERLEVEL             0x22
+#define EEPROM_DEFAULT_HT40_2SDIFF              0x0
+#define EEPROM_DEFAULT_HT20_DIFF                2
+#define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
+#define EEPROM_DEFAULT_HT40_PWRMAXOFFSET        0
+#define EEPROM_DEFAULT_HT20_PWRMAXOFFSET        0
+
+#define RF_OPTION1                              0x79
+#define RF_OPTION2                              0x7A
+#define RF_OPTION3                              0x7B
+#define RF_OPTION4                              0x7C
+
+#define EEPROM_DEFAULT_PID                      0x1234
+#define EEPROM_DEFAULT_VID                      0x5678
+#define EEPROM_DEFAULT_CUSTOMERID               0xAB
+#define EEPROM_DEFAULT_SUBCUSTOMERID            0xCD
+#define EEPROM_DEFAULT_VERSION                  0
+
+#define EEPROM_CHANNEL_PLAN_FCC                 0x0
+#define EEPROM_CHANNEL_PLAN_IC                  0x1
+#define EEPROM_CHANNEL_PLAN_ETSI                0x2
+#define EEPROM_CHANNEL_PLAN_SPAIN               0x3
+#define EEPROM_CHANNEL_PLAN_FRANCE              0x4
+#define EEPROM_CHANNEL_PLAN_MKK                 0x5
+#define EEPROM_CHANNEL_PLAN_MKK1                0x6
+#define EEPROM_CHANNEL_PLAN_ISRAEL              0x7
+#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_BY_HW_MASK          0x80
+
+#define EEPROM_CID_DEFAULT                      0x0
+#define EEPROM_CID_TOSHIBA                      0x4
+#define EEPROM_CID_CCX                          0x10
+#define EEPROM_CID_QMI                          0x0D
+#define EEPROM_CID_WHQL                         0xFE
+
+#define RTL8192E_EEPROM_ID                      0x8129
+
+#define EEPROM_HPON                             0x02
+#define EEPROM_CLK                              0x06
+#define EEPROM_TESTR                            0x08
+
+#define EEPROM_TXPOWERCCK                       0x10
+#define EEPROM_TXPOWERHT40_1S                   0x16
+#define EEPROM_TXPOWERHT20DIFF                  0x1B
+#define EEPROM_TXPOWER_OFDMDIFF                 0x1B
+
+#define EEPROM_TX_PWR_INX                       0x10
+
+#define EEPROM_CHANNELPLAN                      0xB8
+#define EEPROM_XTAL_92E                         0xB9
+#define EEPROM_THERMAL_METER_92E                0xBA
+#define EEPROM_IQK_LCK_92E                      0xBB
+
+#define EEPROM_RF_BOARD_OPTION_92E              0xC1
+#define EEPROM_RF_FEATURE_OPTION_92E            0xC2
+#define EEPROM_RF_BT_SETTING_92E                0xC3
+#define EEPROM_VERSION                          0xC4
+#define EEPROM_CUSTOMER_ID                      0xC5
+#define EEPROM_RF_ANTENNA_OPT_92E               0xC9
+
+#define EEPROM_MAC_ADDR                         0xD0
+#define EEPROM_VID                              0xD6
+#define EEPROM_DID                              0xD8
+#define EEPROM_SVID                             0xDA
+#define EEPROM_SMID                             0xDC
+
+#define STOPBECON                               BIT(6)
+#define STOPHIGHT                               BIT(5)
+#define STOPMGT                                 BIT(4)
+#define STOPVO                                  BIT(3)
+#define STOPVI                                  BIT(2)
+#define STOPBE                                  BIT(1)
+#define STOPBK                                  BIT(0)
+
+#define RCR_APPFCS                              BIT(31)
+#define RCR_APP_MIC                             BIT(30)
+#define RCR_APP_ICV                             BIT(29)
+#define RCR_APP_PHYST_RXFF                      BIT(28)
+#define RCR_APP_BA_SSN                          BIT(27)
+#define RCR_ENMBID                              BIT(24)
+#define RCR_LSIGEN                              BIT(23)
+#define RCR_MFBEN                               BIT(22)
+#define RCR_HTC_LOC_CTRL                        BIT(14)
+#define RCR_AMF                                 BIT(13)
+#define RCR_ACF                                 BIT(12)
+#define RCR_ADF                                 BIT(11)
+#define RCR_AICV                                BIT(9)
+#define RCR_ACRC32                              BIT(8)
+#define RCR_CBSSID_BCN                          BIT(7)
+#define RCR_CBSSID_DATA                         BIT(6)
+#define RCR_CBSSID                              RCR_CBSSID_DATA
+#define RCR_APWRMGT                             BIT(5)
+#define RCR_ADD3                                BIT(4)
+#define RCR_AB                                  BIT(3)
+#define RCR_AM                                  BIT(2)
+#define RCR_APM                                 BIT(1)
+#define RCR_AAP                                 BIT(0)
+#define RCR_MXDMA_OFFSET                        8
+#define RCR_FIFO_OFFSET                         13
+
+#define RSV_CTRL                                0x001C
+#define RD_CTRL                                 0x0524
+
+#define REG_USB_INFO                            0xFE17
+#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_DMA_AGG_TO                      0xFE5B
+#define REG_USB_AGG_TO                          0xFE5C
+#define REG_USB_AGG_TH                          0xFE5D
+
+#define REG_USB_VID                             0xFE60
+#define REG_USB_PID                             0xFE62
+#define REG_USB_OPTIONAL                        0xFE64
+#define REG_USB_CHIRP_K                         0xFE65
+#define REG_USB_PHY                             0xFE66
+#define REG_USB_MAC_ADDR                        0xFE70
+#define REG_USB_HRPWM                           0xFE58
+#define REG_USB_HCPWM                           0xFE57
+
+#define SW18_FPWM                               BIT(3)
+
+#define ISO_MD2PP                               BIT(0)
+#define ISO_UA2USB                              BIT(1)
+#define ISO_UD2CORE                             BIT(2)
+#define ISO_PA2PCIE                             BIT(3)
+#define ISO_PD2CORE                             BIT(4)
+#define ISO_IP2MAC                              BIT(5)
+#define ISO_DIOP                                BIT(6)
+#define ISO_DIOE                                BIT(7)
+#define ISO_EB2CORE                             BIT(8)
+#define ISO_DIOR                                BIT(9)
+
+#define PWC_EV25V                               BIT(14)
+#define PWC_EV12V                               BIT(15)
+
+#define FEN_BBRSTB                              BIT(0)
+#define FEN_BB_GLB_RSTN                         BIT(1)
+#define FEN_USBA                                BIT(2)
+#define FEN_UPLL                                BIT(3)
+#define FEN_USBD                                BIT(4)
+#define FEN_DIO_PCIE                            BIT(5)
+#define FEN_PCIEA                               BIT(6)
+#define FEN_PPLL                                BIT(7)
+#define FEN_PCIED                               BIT(8)
+#define FEN_DIOE                                BIT(9)
+#define FEN_CPUEN                               BIT(10)
+#define FEN_DCORE                               BIT(11)
+#define FEN_ELDR                                BIT(12)
+#define FEN_DIO_RF                              BIT(13)
+#define FEN_HWPDN                               BIT(14)
+#define FEN_MREGEN                              BIT(15)
+
+#define PFM_LDALL                               BIT(0)
+#define PFM_ALDN                                BIT(1)
+#define PFM_LDKP                                BIT(2)
+#define PFM_WOWL                                BIT(3)
+#define ENPDN                                   BIT(4)
+#define PDN_PL                                  BIT(5)
+#define APFM_ONMAC                              BIT(8)
+#define APFM_OFF                                BIT(9)
+#define APFM_RSM                                BIT(10)
+#define AFSM_HSUS                               BIT(11)
+#define AFSM_PCIE                               BIT(12)
+#define APDM_MAC                                BIT(13)
+#define APDM_HOST                               BIT(14)
+#define APDM_HPDN                               BIT(15)
+#define RDY_MACON                               BIT(16)
+#define SUS_HOST                                BIT(17)
+#define ROP_ALD                                 BIT(20)
+#define ROP_PWR                                 BIT(21)
+#define ROP_SPS                                 BIT(22)
+#define SOP_MRST                                BIT(25)
+#define SOP_FUSE                                BIT(26)
+#define SOP_ABG                                 BIT(27)
+#define SOP_AMB                                 BIT(28)
+#define SOP_RCK                                 BIT(29)
+#define SOP_A8M                                 BIT(30)
+#define XOP_BTCK                                BIT(31)
+
+#define ANAD16V_EN                              BIT(0)
+#define ANA8M                                   BIT(1)
+#define MACSLP                                  BIT(4)
+#define LOADER_CLK_EN                           BIT(5)
+#define _80M_SSC_DIS                            BIT(7)
+#define _80M_SSC_EN_HO                          BIT(8)
+#define PHY_SSC_RSTB                            BIT(9)
+#define SEC_CLK_EN                              BIT(10)
+#define MAC_CLK_EN                              BIT(11)
+#define SYS_CLK_EN                              BIT(12)
+#define RING_CLK_EN                             BIT(13)
+
+#define BOOT_FROM_EEPROM                        BIT(4)
+#define EEPROM_EN                               BIT(5)
+
+#define AFE_BGEN                                BIT(0)
+#define AFE_MBEN                                BIT(1)
+#define MAC_ID_EN                               BIT(7)
+
+#define WLOCK_ALL                               BIT(0)
+#define WLOCK_00                                BIT(1)
+#define WLOCK_04                                BIT(2)
+#define WLOCK_08                                BIT(3)
+#define WLOCK_40                                BIT(4)
+#define R_DIS_PRST_0                            BIT(5)
+#define R_DIS_PRST_1                            BIT(6)
+#define LOCK_ALL_EN                             BIT(7)
+
+#define RF_EN                                   BIT(0)
+#define RF_RSTB                                 BIT(1)
+#define RF_SDMRSTB                              BIT(2)
+
+#define LDA15_EN                                BIT(0)
+#define LDA15_STBY                              BIT(1)
+#define LDA15_OBUF                              BIT(2)
+#define LDA15_REG_VOS                           BIT(3)
+#define _LDA15_VOADJ(x)                         (((x) & 0x7) << 4)
+
+#define LDV12_EN                                BIT(0)
+#define LDV12_SDBY                              BIT(1)
+#define LPLDO_HSM                               BIT(2)
+#define LPLDO_LSM_DIS                           BIT(3)
+#define _LDV12_VADJ(x)                          (((x) & 0xF) << 4)
+
+#define XTAL_EN                                 BIT(0)
+#define XTAL_BSEL                               BIT(1)
+#define _XTAL_BOSC(x)                           (((x) & 0x3) << 2)
+#define _XTAL_CADJ(x)                           (((x) & 0xF) << 4)
+#define XTAL_GATE_USB                           BIT(8)
+#define _XTAL_USB_DRV(x)                        (((x) & 0x3) << 9)
+#define XTAL_GATE_AFE                           BIT(11)
+#define _XTAL_AFE_DRV(x)                        (((x) & 0x3) << 12)
+#define XTAL_RF_GATE                            BIT(14)
+#define _XTAL_RF_DRV(x)                         (((x) & 0x3) << 15)
+#define XTAL_GATE_DIG                           BIT(17)
+#define _XTAL_DIG_DRV(x)                        (((x) & 0x3) << 18)
+#define XTAL_BT_GATE                            BIT(20)
+#define _XTAL_BT_DRV(x)                         (((x) & 0x3) << 21)
+#define _XTAL_GPIO(x)                           (((x) & 0x7) << 23)
+
+#define CKDLY_AFE                               BIT(26)
+#define CKDLY_USB                               BIT(27)
+#define CKDLY_DIG                               BIT(28)
+#define CKDLY_BT                                BIT(29)
+
+#define APLL_EN                                 BIT(0)
+#define APLL_320_EN                             BIT(1)
+#define APLL_FREF_SEL                           BIT(2)
+#define APLL_EDGE_SEL                           BIT(3)
+#define APLL_WDOGB                              BIT(4)
+#define APLL_LPFEN                              BIT(5)
+
+#define APLL_REF_CLK_13MHZ                      0x1
+#define APLL_REF_CLK_19_2MHZ                    0x2
+#define APLL_REF_CLK_20MHZ                      0x3
+#define APLL_REF_CLK_25MHZ                      0x4
+#define APLL_REF_CLK_26MHZ                      0x5
+#define APLL_REF_CLK_38_4MHZ                    0x6
+#define APLL_REF_CLK_40MHZ                      0x7
+
+#define APLL_320EN                              BIT(14)
+#define APLL_80EN                               BIT(15)
+#define APLL_1MEN                               BIT(24)
+
+#define ALD_EN                                  BIT(18)
+#define EF_PD                                   BIT(19)
+#define EF_FLAG                                 BIT(31)
+
+#define EF_TRPT                                 BIT(7)
+#define LDOE25_EN                               BIT(31)
+
+#define RSM_EN                                  BIT(0)
+#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 SIC_SWRST                               BIT(11)
+#define ENSIC                                   BIT(12)
+#define SIC_23                                  BIT(13)
+#define ENHDP                                   BIT(14)
+#define SIC_LBK                                 BIT(15)
+
+#define LED0PL                                  BIT(4)
+#define LED1PL                                  BIT(12)
+#define LED0DIS                                 BIT(7)
+
+#define MCUFWDL_EN                              BIT(0)
+#define MCUFWDL_RDY                             BIT(1)
+#define FWDL_CHKSUM_RPT                         BIT(2)
+#define MACINI_RDY                              BIT(3)
+#define BBINI_RDY                               BIT(4)
+#define RFINI_RDY                               BIT(5)
+#define WINTINI_RDY                             BIT(6)
+#define CPRST                                   BIT(23)
+
+#define XCLK_VLD                                BIT(0)
+#define ACLK_VLD                                BIT(1)
+#define UCLK_VLD                                BIT(2)
+#define PCLK_VLD                                BIT(3)
+#define PCIRSTB                                 BIT(4)
+#define V15_VLD                                 BIT(5)
+#define TRP_B15V_EN                             BIT(7)
+#define SIC_IDLE                                BIT(8)
+#define BD_MAC2                                 BIT(9)
+#define BD_MAC1                                 BIT(10)
+#define IC_MACPHY_MODE                          BIT(11)
+#define VENDOR_ID                               BIT(19)
+#define PAD_HWPD_IDN                            BIT(22)
+#define TRP_VAUX_EN                             BIT(23)
+#define TRP_BT_EN                               BIT(24)
+#define BD_PKG_SEL                              BIT(25)
+#define BD_HCI_SEL                              BIT(26)
+#define TYPE_ID                                 BIT(27)
+
+#define CHIP_VER_RTL_MASK                       0xF000
+#define CHIP_VER_RTL_SHIFT                      12
+
+#define REG_LBMODE                              (REG_CR + 3)
+
+#define HCI_TXDMA_EN                            BIT(0)
+#define HCI_RXDMA_EN                            BIT(1)
+#define TXDMA_EN                                BIT(2)
+#define RXDMA_EN                                BIT(3)
+#define PROTOCOL_EN                             BIT(4)
+#define SCHEDULE_EN                             BIT(5)
+#define MACTXEN                                 BIT(6)
+#define MACRXEN                                 BIT(7)
+#define ENSWBCN                                 BIT(8)
+#define ENSEC                                   BIT(9)
+
+#define _NETTYPE(x)                             (((x) & 0x3) << 16)
+#define MASK_NETTYPE                            0x30000
+#define NT_NO_LINK                              0x0
+#define NT_LINK_AD_HOC                          0x1
+#define NT_LINK_AP                              0x2
+#define NT_AS_AP                                0x3
+
+#define _LBMODE(x)                              (((x) & 0xF) << 24)
+#define MASK_LBMODE                             0xF000000
+#define LOOPBACK_NORMAL                         0x0
+#define LOOPBACK_IMMEDIATELY                    0xB
+#define LOOPBACK_MAC_DELAY                      0x3
+#define LOOPBACK_PHY                            0x1
+#define LOOPBACK_DMA                            0x7
+
+#define GET_RX_PAGE_SIZE(value)                 ((value) & 0xF)
+#define GET_TX_PAGE_SIZE(value)                 (((value) & 0xF0) >> 4)
+#define _PSRX_MASK                              0xF
+#define _PSTX_MASK                              0xF0
+#define _PSRX(x)                                (x)
+#define _PSTX(x)                                ((x) << 4)
+
+#define PBP_64                                  0x0
+#define PBP_128                                 0x1
+#define PBP_256                                 0x2
+#define PBP_512                                 0x3
+#define PBP_1024                                0x4
+
+#define RXDMA_ARBBW_EN                          BIT(0)
+#define RXSHFT_EN                               BIT(1)
+#define RXDMA_AGG_EN                            BIT(2)
+#define QS_VO_QUEUE                             BIT(8)
+#define QS_VI_QUEUE                             BIT(9)
+#define QS_BE_QUEUE                             BIT(10)
+#define QS_BK_QUEUE                             BIT(11)
+#define QS_MANAGER_QUEUE                        BIT(12)
+#define QS_HIGH_QUEUE                           BIT(13)
+
+#define HQSEL_VOQ                               BIT(0)
+#define HQSEL_VIQ                               BIT(1)
+#define HQSEL_BEQ                               BIT(2)
+#define HQSEL_BKQ                               BIT(3)
+#define HQSEL_MGTQ                              BIT(4)
+#define HQSEL_HIQ                               BIT(5)
+
+#define _TXDMA_HIQ_MAP(x)                       (((x)&0x3) << 14)
+#define _TXDMA_MGQ_MAP(x)                       (((x)&0x3) << 12)
+#define _TXDMA_BKQ_MAP(x)                       (((x)&0x3) << 10)
+#define _TXDMA_BEQ_MAP(x)                       (((x)&0x3) << 8)
+#define _TXDMA_VIQ_MAP(x)                       (((x)&0x3) << 6)
+#define _TXDMA_VOQ_MAP(x)                       (((x)&0x3) << 4)
+
+#define QUEUE_LOW                               1
+#define QUEUE_NORMAL                            2
+#define QUEUE_HIGH                              3
+
+#define _LLT_NO_ACTIVE                          0x0
+#define _LLT_WRITE_ACCESS                       0x1
+#define _LLT_READ_ACCESS                        0x2
+
+#define _LLT_INIT_DATA(x)                       ((x) & 0xFF)
+#define _LLT_INIT_ADDR(x)                       (((x) & 0xFF) << 8)
+#define _LLT_OP(x)                                      (((x) & 0x3) << 30)
+#define _LLT_OP_VALUE(x)                        (((x) >> 30) & 0x3)
+
+#define BB_WRITE_READ_MASK                      (BIT(31) | BIT(30))
+#define BB_WRITE_EN                             BIT(30)
+#define BB_READ_EN                              BIT(31)
+
+#define _HPQ(x)                                 ((x) & 0xFF)
+#define _LPQ(x)                                 (((x) & 0xFF) << 8)
+#define _PUBQ(x)                                (((x) & 0xFF) << 16)
+#define _NPQ(x)                                 ((x) & 0xFF)
+
+#define HPQ_PUBLIC_DIS                          BIT(24)
+#define LPQ_PUBLIC_DIS                          BIT(25)
+#define LD_RQPN                                 BIT(31)
+
+#define BCN_VALID                               BIT(16)
+#define BCN_HEAD(x)                             (((x) & 0xFF) << 8)
+#define BCN_HEAD_MASK                           0xFF00
+
+#define BLK_DESC_NUM_SHIFT                      4
+#define BLK_DESC_NUM_MASK                       0xF
+
+#define DROP_DATA_EN                            BIT(9)
+
+#define EN_AMPDU_RTY_NEW                        BIT(7)
+
+#define _INIRTSMCS_SEL(x)                       ((x) & 0x3F)
+
+#define _SPEC_SIFS_CCK(x)                       ((x) & 0xFF)
+#define _SPEC_SIFS_OFDM(x)                      (((x) & 0xFF) << 8)
+
+#define RATE_REG_BITMAP_ALL                     0xFFFFF
+
+#define _RRSC_BITMAP(x)                         ((x) & 0xFFFFF)
+
+#define _RRSR_RSC(x)                            (((x) & 0x3) << 21)
+#define RRSR_RSC_RESERVED                       0x0
+#define RRSR_RSC_UPPER_SUBCHANNEL               0x1
+#define RRSR_RSC_LOWER_SUBCHANNEL               0x2
+#define RRSR_RSC_DUPLICATE_MODE                 0x3
+
+#define USE_SHORT_G1                            BIT(20)
+
+#define _AGGLMT_MCS0(x)                         ((x) & 0xF)
+#define _AGGLMT_MCS1(x)                         (((x) & 0xF) << 4)
+#define _AGGLMT_MCS2(x)                         (((x) & 0xF) << 8)
+#define _AGGLMT_MCS3(x)                         (((x) & 0xF) << 12)
+#define _AGGLMT_MCS4(x)                         (((x) & 0xF) << 16)
+#define _AGGLMT_MCS5(x)                         (((x) & 0xF) << 20)
+#define _AGGLMT_MCS6(x)                         (((x) & 0xF) << 24)
+#define _AGGLMT_MCS7(x)                         (((x) & 0xF) << 28)
+
+#define RETRY_LIMIT_SHORT_SHIFT                 8
+#define RETRY_LIMIT_LONG_SHIFT                  0
+
+#define _DARF_RC1(x)                            ((x) & 0x1F)
+#define _DARF_RC2(x)                            (((x) & 0x1F) << 8)
+#define _DARF_RC3(x)                            (((x) & 0x1F) << 16)
+#define _DARF_RC4(x)                            (((x) & 0x1F) << 24)
+#define _DARF_RC5(x)                            ((x) & 0x1F)
+#define _DARF_RC6(x)                            (((x) & 0x1F) << 8)
+#define _DARF_RC7(x)                            (((x) & 0x1F) << 16)
+#define _DARF_RC8(x)                            (((x) & 0x1F) << 24)
+
+#define _RARF_RC1(x)                            ((x) & 0x1F)
+#define _RARF_RC2(x)                            (((x) & 0x1F) << 8)
+#define _RARF_RC3(x)                            (((x) & 0x1F) << 16)
+#define _RARF_RC4(x)                            (((x) & 0x1F) << 24)
+#define _RARF_RC5(x)                            ((x) & 0x1F)
+#define _RARF_RC6(x)                            (((x) & 0x1F) << 8)
+#define _RARF_RC7(x)                            (((x) & 0x1F) << 16)
+#define _RARF_RC8(x)                            (((x) & 0x1F) << 24)
+
+#define AC_PARAM_TXOP_LIMIT_OFFSET              16
+#define AC_PARAM_ECW_MAX_OFFSET                 12
+#define AC_PARAM_ECW_MIN_OFFSET                 8
+#define AC_PARAM_AIFS_OFFSET                    0
+
+#define _AIFS(x)                                (x)
+#define _ECW_MAX_MIN(x)                         ((x) << 8)
+#define _TXOP_LIMIT(x)                          ((x) << 16)
+
+#define _BCNIFS(x)                              ((x) & 0xFF)
+#define _BCNECW(x)                              ((((x) & 0xF)) << 8)
+
+#define _LRL(x)                                 ((x) & 0x3F)
+#define _SRL(x)                                 (((x) & 0x3F) << 8)
+
+#define _SIFS_CCK_CTX(x)                        ((x) & 0xFF)
+#define _SIFS_CCK_TRX(x)                        (((x) & 0xFF) << 8)
+
+#define _SIFS_OFDM_CTX(x)                       ((x) & 0xFF)
+#define _SIFS_OFDM_TRX(x)                       (((x) & 0xFF) << 8)
+
+#define _TBTT_PROHIBIT_HOLD(x)                  (((x) & 0xFF) << 8)
+
+#define DIS_EDCA_CNT_DWN                        BIT(11)
+
+#define EN_MBSSID                               BIT(1)
+#define EN_TXBCN_RPT                            BIT(2)
+#define EN_BCN_FUNCTION                         BIT(3)
+
+#define TSFTR_RST                               BIT(0)
+#define TSFTR1_RST                              BIT(1)
+
+#define STOP_BCNQ                               BIT(6)
+
+#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 APSDOFF                                 BIT(6)
+#define APSDOFF_STATUS                          BIT(7)
+
+#define BW_20MHZ                                BIT(2)
+
+#define RATE_BITMAP_ALL                         0xFFFFF
+
+#define RATE_RRSR_CCK_ONLY_1M                   0xFFFF1
+
+#define TSFRST                                  BIT(0)
+#define DIS_GCLK                                BIT(1)
+#define PAD_SEL                                 BIT(2)
+#define PWR_ST                                  BIT(6)
+#define PWRBIT_OW_EN                            BIT(7)
+#define ACRC                                    BIT(8)
+#define CFENDFORM                               BIT(9)
+#define ICV                                     BIT(10)
+
+#define AAP                                     BIT(0)
+#define APM                                     BIT(1)
+#define AM                                      BIT(2)
+#define AB                                      BIT(3)
+#define ADD3                                    BIT(4)
+#define APWRMGT                                 BIT(5)
+#define CBSSID                                  BIT(6)
+#define CBSSID_DATA                             BIT(6)
+#define CBSSID_BCN                              BIT(7)
+#define ACRC32                                  BIT(8)
+#define AICV                                    BIT(9)
+#define ADF                                     BIT(11)
+#define ACF                                     BIT(12)
+#define AMF                                     BIT(13)
+#define HTC_LOC_CTRL                            BIT(14)
+#define UC_DATA_EN                              BIT(16)
+#define BM_DATA_EN                              BIT(17)
+#define MFBEN                                   BIT(22)
+#define LSIGEN                                  BIT(23)
+#define ENMBID                                  BIT(24)
+#define APP_BASSN                               BIT(27)
+#define APP_PHYSTS                              BIT(28)
+#define APP_ICV                                 BIT(29)
+#define APP_MIC                                 BIT(30)
+#define APP_FCS                                 BIT(31)
+
+#define _MIN_SPACE(x)                           ((x) & 0x7)
+#define _SHORT_GI_PADDING(x)                    (((x) & 0x1F) << 3)
+
+#define RXERR_TYPE_OFDM_PPDU                    0
+#define RXERR_TYPE_OFDM_FALSE_ALARM             1
+#define RXERR_TYPE_OFDM_MPDU_OK                 2
+#define RXERR_TYPE_OFDM_MPDU_FAIL               3
+#define RXERR_TYPE_CCK_PPDU                     4
+#define RXERR_TYPE_CCK_FALSE_ALARM              5
+#define RXERR_TYPE_CCK_MPDU_OK                  6
+#define RXERR_TYPE_CCK_MPDU_FAIL                7
+#define RXERR_TYPE_HT_PPDU                      8
+#define RXERR_TYPE_HT_FALSE_ALARM               9
+#define RXERR_TYPE_HT_MPDU_TOTAL                10
+#define RXERR_TYPE_HT_MPDU_OK                   11
+#define RXERR_TYPE_HT_MPDU_FAIL                 12
+#define RXERR_TYPE_RX_FULL_DROP                 15
+
+#define RXERR_COUNTER_MASK                      0xFFFFF
+#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_TXBCUSEDK                           BIT(6)
+#define SCR_RXBCUSEDK                           BIT(7)
+
+#define USB_IS_HIGH_SPEED                       0
+#define USB_IS_FULL_SPEED                       1
+#define USB_SPEED_MASK                          BIT(5)
+
+#define USB_NORMAL_SIE_EP_MASK                  0xF
+#define USB_NORMAL_SIE_EP_SHIFT                 4
+
+#define USB_TEST_EP_MASK                        0x30
+#define USB_TEST_EP_SHIFT                       4
+
+#define USB_AGG_EN                              BIT(3)
+
+#define MAC_ADDR_LEN                            6
+#define LAST_ENTRY_OF_TX_PKT_BUFFER             175
+
+#define POLLING_LLT_THRESHOLD                   20
+#define POLLING_READY_TIMEOUT_COUNT             3000
+
+#define MAX_MSS_DENSITY_2T                      0x13
+#define MAX_MSS_DENSITY_1T                      0x0A
+
+#define EPROM_CMD_OPERATING_MODE_MASK           ((1 << 7) | (1 << 6))
+#define EPROM_CMD_CONFIG                        0x3
+#define EPROM_CMD_LOAD                          1
+
+#define HWSET_MAX_SIZE_92S                      HWSET_MAX_SIZE
+
+#define HAL_8192C_HW_GPIO_WPS_BIT               BIT(2)
+
+#define RPMAC_RESET                             0x100
+#define RPMAC_TXSTART                           0x104
+#define RPMAC_TXLEGACYSIG                       0x108
+#define RPMAC_TXHTSIG1                          0x10c
+#define RPMAC_TXHTSIG2                          0x110
+#define RPMAC_PHYDEBUG                          0x114
+#define RPMAC_TXPACKETNUM                       0x118
+#define RPMAC_TXIDLE                            0x11c
+#define RPMAC_TXMACHEADER0                      0x120
+#define RPMAC_TXMACHEADER1                      0x124
+#define RPMAC_TXMACHEADER2                      0x128
+#define RPMAC_TXMACHEADER3                      0x12c
+#define RPMAC_TXMACHEADER4                      0x130
+#define RPMAC_TXMACHEADER5                      0x134
+#define RPMAC_TXDADATYPE                        0x138
+#define RPMAC_TXRANDOMSEED                      0x13c
+#define RPMAC_CCKPLCPPREAMBLE                   0x140
+#define RPMAC_CCKPLCPHEADER                     0x144
+#define RPMAC_CCKCRC16                          0x148
+#define RPMAC_OFDMRXCRC32OK                     0x170
+#define RPMAC_OFDMRXCRC32ER                     0x174
+#define RPMAC_OFDMRXPARITYER                    0x178
+#define RPMAC_OFDMRXCRC8ER                      0x17c
+#define RPMAC_CCKCRXRC16ER                      0x180
+#define RPMAC_CCKCRXRC32ER                      0x184
+#define RPMAC_CCKCRXRC32OK                      0x188
+#define RPMAC_TXSTATUS                          0x18c
+
+#define RFPGA0_RFMOD                            0x800
+
+#define RFPGA0_TXINFO                           0x804
+#define RFPGA0_PSDFUNCTION                      0x808
+
+#define RFPGA0_TXGAINSTAGE                      0x80c
+
+#define RFPGA0_RFTIMING1                        0x810
+#define RFPGA0_RFTIMING2                        0x814
+
+#define RFPGA0_XA_HSSIPARAMETER1                0x820
+#define RFPGA0_XA_HSSIPARAMETER2                0x824
+#define RFPGA0_XB_HSSIPARAMETER1                0x828
+#define RFPGA0_XB_HSSIPARAMETER2                0x82c
+
+#define RFPGA0_XA_LSSIPARAMETER                 0x840
+#define RFPGA0_XB_LSSIPARAMETER                 0x844
+
+#define RFPGA0_RFWAKEUPPARAMETER                0x850
+#define RFPGA0_RFSLEEPUPPARAMETER               0x854
+
+#define RFPGA0_XAB_SWITCHCONTROL                0x858
+#define RFPGA0_XCD_SWITCHCONTROL                0x85c
+
+#define RFPGA0_XA_RFINTERFACEOE                 0x860
+#define RFPGA0_XB_RFINTERFACEOE                 0x864
+
+#define RFPGA0_XAB_RFINTERFACESW                0x870
+#define RFPGA0_XCD_RFINTERFACESW                0x874
+
+#define RFPGA0_XAB_RFPARAMETER                  0x878
+#define RFPGA0_XCD_RFPARAMETER                  0x87c
+
+#define RFPGA0_ANALOGPARAMETER1                 0x880
+#define RFPGA0_ANALOGPARAMETER2                 0x884
+#define RFPGA0_ANALOGPARAMETER3                 0x888
+#define RFPGA0_ANALOGPARAMETER4                 0x88c
+
+#define RFPGA0_XA_LSSIREADBACK                  0x8a0
+#define RFPGA0_XB_LSSIREADBACK                  0x8a4
+#define RFPGA0_XC_LSSIREADBACK                  0x8a8
+#define RFPGA0_XD_LSSIREADBACK                  0x8ac
+
+#define RFPGA0_PSDREPORT                        0x8b4
+#define TRANSCEIVEA_HSPI_READBACK               0x8b8
+#define TRANSCEIVEB_HSPI_READBACK               0x8bc
+#define REG_SC_CNT                              0x8c4
+#define RFPGA0_XAB_RFINTERFACERB                0x8e0
+#define RFPGA0_XCD_RFINTERFACERB                0x8e4
+
+#define RFPGA1_RFMOD                            0x900
+
+#define RFPGA1_TXBLOCK                          0x904
+#define RFPGA1_DEBUGSELECT                      0x908
+#define RFPGA1_TXINFO                           0x90c
+
+#define RCCK0_SYSTEM                            0xa00
+
+#define RCCK0_AFESETTING                        0xa04
+#define RCCK0_CCA                               0xa08
+
+#define RCCK0_RXAGC1                            0xa0c
+#define RCCK0_RXAGC2                            0xa10
+
+#define RCCK0_RXHP                              0xa14
+
+#define RCCK0_DSPPARAMETER1                     0xa18
+#define RCCK0_DSPPARAMETER2                     0xa1c
+
+#define RCCK0_TXFILTER1                         0xa20
+#define RCCK0_TXFILTER2                         0xa24
+#define RCCK0_DEBUGPORT                         0xa28
+#define RCCK0_FALSEALARMREPORT                  0xa2c
+#define RCCK0_TRSSIREPORT                       0xa50
+#define RCCK0_RXREPORT                          0xa54
+#define RCCK0_FACOUNTERLOWER                    0xa5c
+#define RCCK0_FACOUNTERUPPER                    0xa58
+#define RCCK0_CCA_CNT                           0xa60
+
+/* PageB(0xB00) */
+#define RPDP_ANTA                               0xb00
+#define RPDP_ANTA_4                             0xb04
+#define RPDP_ANTA_8                             0xb08
+#define RPDP_ANTA_C                             0xb0c
+#define RPDP_ANTA_10                            0xb10
+#define RPDP_ANTA_14                            0xb14
+#define RPDP_ANTA_18                            0xb18
+#define RPDP_ANTA_1C                            0xb1c
+#define RPDP_ANTA_20                            0xb20
+#define RPDP_ANTA_24                            0xb24
+
+#define RCONFIG_PMPD_ANTA                       0xb28
+#define RCONFIG_RAM64x16                        0xb2c
+
+#define RBNDA                                   0xb30
+#define RHSSIPAR                                0xb34
+
+#define RCONFIG_ANTA                            0xb68
+#define RCONFIG_ANTB                            0xb6c
+
+#define RPDP_ANTB                               0xb70
+#define RPDP_ANTB_4                             0xb74
+#define RPDP_ANTB_8                             0xb78
+#define RPDP_ANTB_C                             0xb7c
+#define RPDP_ANTB_10                            0xb80
+#define RPDP_ANTB_14                            0xb84
+#define RPDP_ANTB_18                            0xb88
+#define RPDP_ANTB_1C                            0xb8c
+#define RPDP_ANTB_20                            0xb90
+#define RPDP_ANTB_24                            0xb94
+
+#define RCONFIG_PMPD_ANTB                       0xb98
+
+#define RBNDB                                   0xba0
+
+#define RAPK                                    0xbd8
+#define RPM_RX0_ANTA                            0xbdc
+#define RPM_RX1_ANTA                            0xbe0
+#define RPM_RX2_ANTA                            0xbe4
+#define RPM_RX3_ANTA                            0xbe8
+#define RPM_RX0_ANTB                            0xbec
+#define RPM_RX1_ANTB                            0xbf0
+#define RPM_RX2_ANTB                            0xbf4
+#define RPM_RX3_ANTB                            0xbf8
+
+/*Page C*/
+#define ROFDM0_LSTF                             0xc00
+
+#define ROFDM0_TRXPATHENABLE                    0xc04
+#define ROFDM0_TRMUXPAR                         0xc08
+#define ROFDM0_TRSWISOLATION                    0xc0c
+
+#define ROFDM0_XARXAFE                          0xc10
+#define ROFDM0_XARXIQIMBALANCE                  0xc14
+#define ROFDM0_XBRXAFE                          0xc18
+#define ROFDM0_XBRXIQIMBALANCE                  0xc1c
+#define ROFDM0_XCRXAFE                          0xc20
+#define ROFDM0_XCRXIQIMBANLANCE                 0xc24
+#define ROFDM0_XDRXAFE                          0xc28
+#define ROFDM0_XDRXIQIMBALANCE                  0xc2c
+
+#define ROFDM0_RXDETECTOR1                      0xc30
+#define ROFDM0_RXDETECTOR2                      0xc34
+#define ROFDM0_RXDETECTOR3                      0xc38
+#define ROFDM0_RXDETECTOR4                      0xc3c
+
+#define ROFDM0_RXDSP                            0xc40
+#define ROFDM0_CFOANDDAGC                       0xc44
+#define ROFDM0_CCADROPTHRESHOLD                 0xc48
+#define ROFDM0_ECCATHRESHOLD                    0xc4c
+
+#define ROFDM0_XAAGCCORE1                       0xc50
+#define ROFDM0_XAAGCCORE2                       0xc54
+#define ROFDM0_XBAGCCORE1                       0xc58
+#define ROFDM0_XBAGCCORE2                       0xc5c
+#define ROFDM0_XCAGCCORE1                       0xc60
+#define ROFDM0_XCAGCCORE2                       0xc64
+#define ROFDM0_XDAGCCORE1                       0xc68
+#define ROFDM0_XDAGCCORE2                       0xc6c
+
+#define ROFDM0_AGCPARAMETER1                    0xc70
+#define ROFDM0_AGCPARAMETER2                    0xc74
+#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_RXIQEXTANTA                      0xca0
+#define ROFDM0_TXCOEFF1                         0xca4
+#define ROFDM0_TXCOEFF2                         0xca8
+#define ROFDM0_TXCOEFF3                         0xcac
+#define ROFDM0_TXCOEFF4                         0xcb0
+#define ROFDM0_TXCOEFF5                         0xcb4
+#define ROFDM0_TXCOEFF6                         0xcb8
+
+#define ROFDM0_RXHPPARAMETER                    0xce0
+#define ROFDM0_TXPSEUDONOISEWGT                 0xce4
+#define ROFDM0_FRAMESYNC                        0xcf0
+#define ROFDM0_DFSREPORT                        0xcf4
+
+#define ROFDM1_LSTF                             0xd00
+#define ROFDM1_TRXPATHENABLE                    0xd04
+
+#define ROFDM1_CF0                              0xd08
+#define ROFDM1_CSI1                             0xd10
+#define ROFDM1_SBD                              0xd14
+#define ROFDM1_CSI2                             0xd18
+#define ROFDM1_CFOTRACKING                      0xd2c
+#define ROFDM1_TRXMESAURE1                      0xd34
+#define ROFDM1_INTFDET                          0xd3c
+#define ROFDM1_PSEUDONOISESTATEAB               0xd50
+#define ROFDM1_PSEUDONOISESTATECD               0xd54
+#define ROFDM1_RXPSEUDONOISEWGT                 0xd58
+
+#define ROFDM_PHYCOUNTER1                       0xda0
+#define ROFDM_PHYCOUNTER2                       0xda4
+#define ROFDM_PHYCOUNTER3                       0xda8
+
+#define ROFDM_SHORTCFOAB                        0xdac
+#define ROFDM_SHORTCFOCD                        0xdb0
+#define ROFDM_LONGCFOAB                         0xdb4
+#define ROFDM_LONGCFOCD                         0xdb8
+#define ROFDM_TAILCF0AB                         0xdbc
+#define ROFDM_TAILCF0CD                         0xdc0
+#define ROFDM_PWMEASURE1                        0xdc4
+#define ROFDM_PWMEASURE2                        0xdc8
+#define ROFDM_BWREPORT                          0xdcc
+#define ROFDM_AGCREPORT                         0xdd0
+#define ROFDM_RXSNR                             0xdd4
+#define ROFDM_RXEVMCSI                          0xdd8
+#define ROFDM_SIGREPORT                         0xddc
+
+#define RTXAGC_A_RATE18_06                      0xe00
+#define RTXAGC_A_RATE54_24                      0xe04
+#define RTXAGC_A_CCK1_MCS32                     0xe08
+#define RTXAGC_A_MCS03_MCS00                    0xe10
+#define RTXAGC_A_MCS07_MCS04                    0xe14
+#define RTXAGC_A_MCS11_MCS08                    0xe18
+#define RTXAGC_A_MCS15_MCS12                    0xe1c
+
+#define RTXAGC_B_RATE18_06                      0x830
+#define RTXAGC_B_RATE54_24                      0x834
+#define RTXAGC_B_CCK1_55_MCS32                  0x838
+#define RTXAGC_B_MCS03_MCS00                    0x83c
+#define RTXAGC_B_MCS07_MCS04                    0x848
+#define RTXAGC_B_MCS11_MCS08                    0x84c
+#define RTXAGC_B_MCS15_MCS12                    0x868
+#define RTXAGC_B_CCK11_A_CCK2_11                0x86c
+
+#define RFPGA0_IQK                              0xe28
+#define RTX_IQK_TONE_A                          0xe30
+#define RRX_IQK_TONE_A                          0xe34
+#define RTX_IQK_PI_A                            0xe38
+#define RRX_IQK_PI_A                            0xe3c
+
+#define RTX_IQK                                 0xe40
+#define RRX_IQK                                 0xe44
+#define RIQK_AGC_PTS                            0xe48
+#define RIQK_AGC_RSP                            0xe4c
+#define RTX_IQK_TONE_B                          0xe50
+#define RRX_IQK_TONE_B                          0xe54
+#define RTX_IQK_PI_B                            0xe58
+#define RRX_IQK_PI_B                            0xe5c
+#define RIQK_AGC_CONT                           0xe60
+
+#define RBLUE_TOOTH                             0xe6c
+#define RRX_WAIT_CCA                            0xe70
+#define RTX_CCK_RFON                            0xe74
+#define RTX_CCK_BBON                            0xe78
+#define RTX_OFDM_RFON                           0xe7c
+#define RTX_OFDM_BBON                           0xe80
+#define RTX_TO_RX                               0xe84
+#define RTX_TO_TX                               0xe88
+#define RRX_CCK                                 0xe8c
+
+#define RTX_POWER_BEFORE_IQK_A                  0xe94
+#define RTX_POWER_AFTER_IQK_A                   0xe9c
+
+#define RRX_POWER_BEFORE_IQK_A                  0xea0
+#define RRX_POWER_BEFORE_IQK_A_2                0xea4
+#define RRX_POWER_AFTER_IQK_A                   0xea8
+#define RRX_POWER_AFTER_IQK_A_2                 0xeac
+
+#define RTX_POWER_BEFORE_IQK_B                  0xeb4
+#define RTX_POWER_AFTER_IQK_B                   0xebc
+
+#define RRX_POWER_BEFORE_IQK_B                  0xec0
+#define RRX_POWER_BEFORE_IQK_B_2                0xec4
+#define RRX_POWER_AFTER_IQK_B                   0xec8
+#define RRX_POWER_AFTER_IQK_B_2                 0xecc
+
+#define RRX_OFDM                                0xed0
+#define RRX_WAIT_RIFS                           0xed4
+#define RRX_TO_RX                               0xed8
+#define RSTANDBY                                0xedc
+#define RSLEEP                                  0xee0
+#define RPMPD_ANAEN                             0xeec
+
+#define RZEBRA1_HSSIENABLE                      0x0
+#define RZEBRA1_TRXENABLE1                      0x1
+#define RZEBRA1_TRXENABLE2                      0x2
+#define RZEBRA1_AGC                             0x4
+#define RZEBRA1_CHARGEPUMP                      0x5
+#define RZEBRA1_CHANNEL                         0x7
+
+#define RZEBRA1_TXGAIN                          0x8
+#define RZEBRA1_TXLPF                           0x9
+#define RZEBRA1_RXLPF                           0xb
+#define RZEBRA1_RXHPFCORNER                     0xc
+
+#define RGLOBALCTRL                             0
+#define RRTL8256_TXLPF                          19
+#define RRTL8256_RXLPF                          11
+#define RRTL8258_TXLPF                          0x11
+#define RRTL8258_RXLPF                          0x13
+#define RRTL8258_RSSILPF                        0xa
+
+#define RF_AC                                   0x00
+
+#define RF_IQADJ_G1                             0x01
+#define RF_IQADJ_G2                             0x02
+#define RF_POW_TRSW                             0x05
+
+#define RF_GAIN_RX                              0x06
+#define RF_GAIN_TX                              0x07
+
+#define RF_TXM_IDAC                             0x08
+#define RF_BS_IQGEN                             0x0F
+
+#define RF_MODE1                                0x10
+#define RF_MODE2                                0x11
+
+#define RF_RX_AGC_HP                            0x12
+#define RF_TX_AGC                               0x13
+#define RF_BIAS                                 0x14
+#define RF_IPA                                  0x15
+#define RF_POW_ABILITY                          0x17
+#define RF_MODE_AG                              0x18
+#define RRFCHANNEL                              0x18
+#define RF_CHNLBW                               0x18
+#define RF_TOP                                  0x19
+
+#define RF_RX_G1                                0x1A
+#define RF_RX_G2                                0x1B
+
+#define RF_RX_BB2                               0x1C
+#define RF_RX_BB1                               0x1D
+
+#define RF_RCK1                                 0x1E
+#define RF_RCK2                                 0x1F
+
+#define RF_TX_G1                                0x20
+#define RF_TX_G2                                0x21
+#define RF_TX_G3                                0x22
+
+#define RF_TX_BB1                               0x23
+#define RF_T_METER                              0x42
+
+#define RF_SYN_G1                               0x25
+#define RF_SYN_G2                               0x26
+#define RF_SYN_G3                               0x27
+#define RF_SYN_G4                               0x28
+#define RF_SYN_G5                               0x29
+#define RF_SYN_G6                               0x2A
+#define RF_SYN_G7                               0x2B
+#define RF_SYN_G8                               0x2C
+
+#define RF_RCK_OS                               0x30
+#define RF_TXPA_G1                              0x31
+#define RF_TXPA_G2                              0x32
+#define RF_TXPA_G3                              0x33
+
+#define RF_TX_BIAS_A                            0x35
+#define RF_TX_BIAS_D                            0x36
+#define RF_LOBF_9                               0x38
+#define RF_RXRF_A3                              0x3C
+#define RF_TRSW                                 0x3F
+
+#define RF_TXRF_A2                              0x41
+#define RF_TXPA_G4                              0x46
+#define RF_TXPA_A4                              0x4B
+
+#define RF_WE_LUT                               0xEF
+
+#define BBBRESETB                               0x100
+#define BGLOBALRESETB                           0x200
+#define BOFDMTXSTART                            0x4
+#define BCCKTXSTART                             0x8
+#define BCRC32DEBUG                             0x100
+#define BPMACLOOPBACK                           0x10
+#define BTXLSIG                                 0xffffff
+#define BOFDMTXRATE                             0xf
+#define BOFDMTXRESERVED                         0x10
+#define BOFDMTXLENGTH                           0x1ffe0
+#define BOFDMTXPARITY                           0x20000
+#define BTXHTSIG1                               0xffffff
+#define BTXHTMCSRATE                            0x7f
+#define BTXHTBW                                 0x80
+#define BTXHTLENGTH                             0xffff00
+#define BTXHTSIG2                               0xffffff
+#define BTXHTSMOOTHING                          0x1
+#define BTXHTSOUNDING                           0x2
+#define BTXHTRESERVED                           0x4
+#define BTXHTAGGREATION                         0x8
+#define BTXHTSTBC                               0x30
+#define BTXHTADVANCECODING                      0x40
+#define BTXHTSHORTGI                            0x80
+#define BTXHTNUMBERHT_LTF                       0x300
+#define BTXHTCRC8                               0x3fc00
+#define BCOUNTERRESET                           0x10000
+#define BNUMOFOFDMTX                            0xffff
+#define BNUMOFCCKTX                             0xffff0000
+#define BTXIDLEINTERVAL                         0xffff
+#define BOFDMSERVICE                            0xffff0000
+#define BTXMACHEADER                            0xffffffff
+#define BTXDATAINIT                             0xff
+#define BTXHTMODE                               0x100
+#define BTXDATATYPE                             0x30000
+#define BTXRANDOMSEED                           0xffffffff
+#define BCCKTXPREAMBLE                          0x1
+#define BCCKTXSFD                               0xffff0000
+#define BCCKTXSIG                               0xff
+#define BCCKTXSERVICE                           0xff00
+#define BCCKLENGTHEXT                           0x8000
+#define BCCKTXLENGHT                            0xffff0000
+#define BCCKTXCRC16                             0xffff
+#define BCCKTXSTATUS                            0x1
+#define BOFDMTXSTATUS                           0x2
+#define IS_BB_REG_OFFSET_92S(_offset)   \
+        ((_offset >= 0x800) && (_offset <= 0xfff))
+
+#define BRFMOD                                  0x1
+#define BJAPANMODE                              0x2
+#define BCCKTXSC                                0x30
+#define BCCKEN                                  0x1000000
+#define BOFDMEN                                 0x2000000
+
+#define BOFDMRXADCPHASE                         0x10000
+#define BOFDMTXDACPHASE                         0x40000
+#define BXATXAGC                                0x3f
+
+#define BXBTXAGC                                0xf00
+#define BXCTXAGC                                0xf000
+#define BXDTXAGC                                0xf0000
+
+#define BPASTART                                0xf0000000
+#define BTRSTART                                0x00f00000
+#define BRFSTART                                0x0000f000
+#define BBBSTART                                0x000000f0
+#define BBBCCKSTART                             0x0000000f
+#define BPAEND                                  0xf
+#define BTREND                                  0x0f000000
+#define BRFEND                                  0x000f0000
+#define BCCAMASK                                0x000000f0
+#define BR2RCCAMASK                             0x00000f00
+#define BHSSI_R2TDELAY                          0xf8000000
+#define BHSSI_T2RDELAY                          0xf80000
+#define BCONTXHSSI                              0x400
+#define BIGFROMCCK                              0x200
+#define BAGCADDRESS                             0x3f
+#define BRXHPTX                                 0x7000
+#define BRXHP2RX                                0x38000
+#define BRXHPCCKINI                             0xc0000
+#define BAGCTXCODE                              0xc00000
+#define BAGCRXCODE                              0x300000
+
+#define B3WIREDATALENGTH                        0x800
+#define B3WIREADDREAALENGTH                     0x400
+
+#define B3WIRERFPOWERDOWN                       0x1
+#define B5GPAPEPOLARITY                         0x40000000
+#define B2GPAPEPOLARITY                         0x80000000
+#define BRFSW_TXDEFAULTANT                      0x3
+#define BRFSW_TXOPTIONANT                       0x30
+#define BRFSW_RXDEFAULTANT                      0x300
+#define BRFSW_RXOPTIONANT                       0x3000
+#define BRFSI_3WIREDATA                         0x1
+#define BRFSI_3WIRECLOCK                        0x2
+#define BRFSI_3WIRELOAD                         0x4
+#define BRFSI_3WIRERW                           0x8
+#define BRFSI_3WIRE                             0xf
+
+#define BRFSI_RFENV                             0x10
+
+#define BRFSI_TRSW                              0x20
+#define BRFSI_TRSWB                             0x40
+#define BRFSI_ANTSW                             0x100
+#define BRFSI_ANTSWB                            0x200
+#define BRFSI_PAPE                              0x400
+#define BRFSI_PAPE5G                            0x800
+#define BBANDSELECT                             0x1
+#define BHTSIG2_GI                              0x80
+#define BHTSIG2_SMOOTHING                       0x01
+#define BHTSIG2_SOUNDING                        0x02
+#define BHTSIG2_AGGREATON                       0x08
+#define BHTSIG2_STBC                            0x30
+#define BHTSIG2_ADVCODING                       0x40
+#define BHTSIG2_NUMOFHTLTF                      0x300
+#define BHTSIG2_CRC8                            0x3fc
+#define BHTSIG1_MCS                             0x7f
+#define BHTSIG1_BANDWIDTH                       0x80
+#define BHTSIG1_HTLENGTH                        0xffff
+#define BLSIG_RATE                              0xf
+#define BLSIG_RESERVED                          0x10
+#define BLSIG_LENGTH                            0x1fffe
+#define BLSIG_PARITY                            0x20
+#define BCCKRXPHASE                             0x4
+
+#define BLSSIREADADDRESS                        0x7f800000
+#define BLSSIREADEDGE                           0x80000000
+
+#define BLSSIREADBACKDATA                       0xfffff
+
+#define BLSSIREADOKFLAG                         0x1000
+#define BCCKSAMPLERATE                          0x8
+#define BREGULATOR0STANDBY                      0x1
+#define BREGULATORPLLSTANDBY                    0x2
+#define BREGULATOR1STANDBY                      0x4
+#define BPLLPOWERUP                             0x8
+#define BDPLLPOWERUP                            0x10
+#define BDA10POWERUP                            0x20
+#define BAD7POWERUP                             0x200
+#define BDA6POWERUP                             0x2000
+#define BXTALPOWERUP                            0x4000
+#define B40MDCLKPOWERUP                         0x8000
+#define BDA6DEBUGMODE                           0x20000
+#define BDA6SWING                               0x380000
+
+#define BADCLKPHASE                             0x4000000
+#define B80MCLKDELAY                            0x18000000
+#define BAFEWATCHDOGENABLE                      0x20000000
+
+#define BXTALCAP01                              0xc0000000
+#define BXTALCAP23                              0x3
+#define BXTALCAP92X                             0x0f000000
+#define BXTALCAP                                0x0f000000
+
+#define BINTDIFCLKENABLE                        0x400
+#define BEXTSIGCLKENABLE                        0x800
+#define BBANDGAP_MBIAS_POWERUP                  0x10000
+#define BAD11SH_GAIN                            0xc0000
+#define BAD11NPUT_RANGE                         0x700000
+#define BAD110P_CURRENT                         0x3800000
+#define BLPATH_LOOPBACK                         0x4000000
+#define BQPATH_LOOPBACK                         0x8000000
+#define BAFE_LOOPBACK                           0x10000000
+#define BDA10_SWING                             0x7e0
+#define BDA10_REVERSE                           0x800
+#define BDA_CLK_SOURCE                          0x1000
+#define BDA7INPUT_RANGE                         0x6000
+#define BDA7_GAIN                               0x38000
+#define BDA7OUTPUT_CM_MODE                      0x40000
+#define BDA7INPUT_CM_MODE                       0x380000
+#define BDA7CURRENT                             0xc00000
+#define BREGULATOR_ADJUST                       0x7000000
+#define BAD11POWERUP_ATTX                       0x1
+#define BDA10PS_ATTX                            0x10
+#define BAD11POWERUP_ATRX                       0x100
+#define BDA10PS_ATRX                            0x1000
+#define BCCKRX_AGC_FORMAT                       0x200
+#define BPSDFFT_SAMPLE_POINT                    0xc000
+#define BPSD_AVERAGE_NUM                        0x3000
+#define BIQPATH_CONTROL                         0xc00
+#define BPSD_FREQ                               0x3ff
+#define BPSD_ANTENNA_PATH                       0x30
+#define BPSD_IQ_SWITCH                          0x40
+#define BPSD_RX_TRIGGER                         0x400000
+#define BPSD_TX_TRIGGER                         0x80000000
+#define BPSD_SINE_TONE_SCALE                    0x7f000000
+#define BPSD_REPORT                             0xffff
+
+#define BOFDM_TXSC                              0x30000000
+#define BCCK_TXON                               0x1
+#define BOFDM_TXON                              0x2
+#define BDEBUG_PAGE                             0xfff
+#define BDEBUG_ITEM                             0xff
+#define BANTL                                   0x10
+#define BANT_NONHT                              0x100
+#define BANT_HT1                                0x1000
+#define BANT_HT2                                0x10000
+#define BANT_HT1S1                              0x100000
+#define BANT_NONHTS1                            0x1000000
+
+#define BCCK_BBMODE                             0x3
+#define BCCK_TXPOWERSAVING                      0x80
+#define BCCK_RXPOWERSAVING                      0x40
+
+#define BCCK_SIDEBAND                           0x10
+
+#define BCCK_SCRAMBLE                           0x8
+#define BCCK_ANTDIVERSITY                       0x8000
+#define BCCK_CARRIER_RECOVERY                   0x4000
+#define BCCK_TXRATE                             0x3000
+#define BCCK_DCCANCEL                           0x0800
+#define BCCK_ISICANCEL                          0x0400
+#define BCCK_MATCH_FILTER                       0x0200
+#define BCCK_EQUALIZER                          0x0100
+#define BCCK_PREAMBLE_DETECT                    0x800000
+#define BCCK_FAST_FALSECCA                      0x400000
+#define BCCK_CH_ESTSTART                        0x300000
+#define BCCK_CCA_COUNT                          0x080000
+#define BCCK_CS_LIM                             0x070000
+#define BCCK_BIST_MODE                          0x80000000
+#define BCCK_CCAMASK                            0x40000000
+#define BCCK_TX_DAC_PHASE                       0x4
+#define BCCK_RX_ADC_PHASE                       0x20000000
+#define BCCKR_CP_MODE                           0x0100
+#define BCCK_TXDC_OFFSET                        0xf0
+#define BCCK_RXDC_OFFSET                        0xf
+#define BCCK_CCA_MODE                           0xc000
+#define BCCK_FALSECS_LIM                        0x3f00
+#define BCCK_CS_RATIO                           0xc00000
+#define BCCK_CORGBIT_SEL                        0x300000
+#define BCCK_PD_LIM                             0x0f0000
+#define BCCK_NEWCCA                             0x80000000
+#define BCCK_RXHP_OF_IG                         0x8000
+#define BCCK_RXIG                               0x7f00
+#define BCCK_LNA_POLARITY                       0x800000
+#define BCCK_RX1ST_BAIN                         0x7f0000
+#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
+#define BCCK_RXAGC_REPORTTYPE                   0x0300
+#define BCCK_RXDAGC_EN                          0x80000000
+#define BCCK_RXDAGC_PERIOD                      0x20000000
+#define BCCK_RXDAGC_SATLEVEL                    0x1f000000
+#define BCCK_TIMING_RECOVERY                    0x800000
+#define BCCK_TXC0                               0x3f0000
+#define BCCK_TXC1                               0x3f000000
+#define BCCK_TXC2                               0x3f
+#define BCCK_TXC3                               0x3f00
+#define BCCK_TXC4                               0x3f0000
+#define BCCK_TXC5                               0x3f000000
+#define BCCK_TXC6                               0x3f
+#define BCCK_TXC7                               0x3f00
+#define BCCK_DEBUGPORT                          0xff0000
+#define BCCK_DAC_DEBUG                          0x0f000000
+#define BCCK_FALSEALARM_ENABLE                  0x8000
+#define BCCK_FALSEALARM_READ                    0x4000
+#define BCCK_TRSSI                              0x7f
+#define BCCK_RXAGC_REPORT                       0xfe
+#define BCCK_RXREPORT_ANTSEL                    0x80000000
+#define BCCK_RXREPORT_MFOFF                     0x40000000
+#define BCCK_RXREPORT_SQLOSS                    0x20000000
+#define BCCK_RXREPORT_PKTLOSS                   0x10000000
+#define BCCK_RXREPORT_LOCKEDBIT                 0x08000000
+#define BCCK_RXREPORT_RATEERROR                 0x04000000
+#define BCCK_RXREPORT_RXRATE                    0x03000000
+#define BCCK_RXFA_COUNTER_LOWER                 0xff
+#define BCCK_RXFA_COUNTER_UPPER                 0xff000000
+#define BCCK_RXHPAGC_START                      0xe000
+#define BCCK_RXHPAGC_FINAL                      0x1c00
+#define BCCK_RXFALSEALARM_ENABLE                0x8000
+#define BCCK_FACOUNTER_FREEZE                   0x4000
+#define BCCK_TXPATH_SEL                         0x10000000
+#define BCCK_DEFAULT_RXPATH                     0xc000000
+#define BCCK_OPTION_RXPATH                      0x3000000
+
+#define BNUM_OFSTF                              0x3
+#define BSHIFT_L                                0xc0
+#define BGI_TH                                  0xc
+#define BRXPATH_A                               0x1
+#define BRXPATH_B                               0x2
+#define BRXPATH_C                               0x4
+#define BRXPATH_D                               0x8
+#define BTXPATH_A                               0x1
+#define BTXPATH_B                               0x2
+#define BTXPATH_C                               0x4
+#define BTXPATH_D                               0x8
+#define BTRSSI_FREQ                             0x200
+#define BADC_BACKOFF                            0x3000
+#define BDFIR_BACKOFF                           0xc000
+#define BTRSSI_LATCH_PHASE                      0x10000
+#define BRX_LDC_OFFSET                          0xff
+#define BRX_QDC_OFFSET                          0xff00
+#define BRX_DFIR_MODE                           0x1800000
+#define BRX_DCNF_TYPE                           0xe000000
+#define BRXIQIMB_A                              0x3ff
+#define BRXIQIMB_B                              0xfc00
+#define BRXIQIMB_C                              0x3f0000
+#define BRXIQIMB_D                              0xffc00000
+#define BDC_DC_NOTCH                            0x60000
+#define BRXNB_NOTCH                             0x1f000000
+#define BPD_TH                                  0xf
+#define BPD_TH_OPT2                             0xc000
+#define BPWED_TH                                0x700
+#define BIFMF_WIN_L                             0x800
+#define BPD_OPTION                              0x1000
+#define BMF_WIN_L                               0xe000
+#define BBW_SEARCH_L                            0x30000
+#define BWIN_ENH_L                              0xc0000
+#define BBW_TH                                  0x700000
+#define BED_TH2                                 0x3800000
+#define BBW_OPTION                              0x4000000
+#define BRADIO_TH                               0x18000000
+#define BWINDOW_L                               0xe0000000
+#define BSBD_OPTION                             0x1
+#define BFRAME_TH                               0x1c
+#define BFS_OPTION                              0x60
+#define BDC_SLOPE_CHECK                         0x80
+#define BFGUARD_COUNTER_DC_L                    0xe00
+#define BFRAME_WEIGHT_SHORT                     0x7000
+#define BSUB_TUNE                               0xe00000
+#define BFRAME_DC_LENGTH                        0xe000000
+#define BSBD_START_OFFSET                       0x30000000
+#define BFRAME_TH_2                             0x7
+#define BFRAME_GI2_TH                           0x38
+#define BGI2_SYNC_EN                            0x40
+#define BSARCH_SHORT_EARLY                      0x300
+#define BSARCH_SHORT_LATE                       0xc00
+#define BSARCH_GI2_LATE                         0x70000
+#define BCFOANTSUM                              0x1
+#define BCFOACC                                 0x2
+#define BCFOSTARTOFFSET                         0xc
+#define BCFOLOOPBACK                            0x70
+#define BCFOSUMWEIGHT                           0x80
+#define BDAGCENABLE                             0x10000
+#define BTXIQIMB_A                              0x3ff
+#define BTXIQIMB_b                              0xfc00
+#define BTXIQIMB_C                              0x3f0000
+#define BTXIQIMB_D                              0xffc00000
+#define BTXIDCOFFSET                            0xff
+#define BTXIQDCOFFSET                           0xff00
+#define BTXDFIRMODE                             0x10000
+#define BTXPESUDO_NOISEON                       0x4000000
+#define BTXPESUDO_NOISE_A                       0xff
+#define BTXPESUDO_NOISE_B                       0xff00
+#define BTXPESUDO_NOISE_C                       0xff0000
+#define BTXPESUDO_NOISE_D                       0xff000000
+#define BCCA_DROPOPTION                         0x20000
+#define BCCA_DROPTHRES                          0xfff00000
+#define BEDCCA_H                                0xf
+#define BEDCCA_L                                0xf0
+#define BLAMBDA_ED                              0x300
+#define BRX_INITIALGAIN                         0x7f
+#define BRX_ANTDIV_EN                           0x80
+#define BRX_AGC_ADDRESS_FOR_LNA                 0x7f00
+#define BRX_HIGHPOWER_FLOW                      0x8000
+#define BRX_AGC_FREEZE_THRES                    0xc0000
+#define BRX_FREEZESTEP_AGC1                     0x300000
+#define BRX_FREEZESTEP_AGC2                     0xc00000
+#define BRX_FREEZESTEP_AGC3                     0x3000000
+#define BRX_FREEZESTEP_AGC0                     0xc000000
+#define BRXRSSI_CMP_EN                          0x10000000
+#define BRXQUICK_AGCEN                          0x20000000
+#define BRXAGC_FREEZE_THRES_MODE                0x40000000
+#define BRX_OVERFLOW_CHECKTYPE                  0x80000000
+#define BRX_AGCSHIFT                            0x7f
+#define BTRSW_TRI_ONLY                          0x80
+#define BPOWER_THRES                            0x300
+#define BRXAGC_EN                               0x1
+#define BRXAGC_TOGETHER_EN                      0x2
+#define BRXAGC_MIN                              0x4
+#define BRXHP_INI                               0x7
+#define BRXHP_TRLNA                             0x70
+#define BRXHP_RSSI                              0x700
+#define BRXHP_BBP1                              0x7000
+#define BRXHP_BBP2                              0x70000
+#define BRXHP_BBP3                              0x700000
+#define BRSSI_H                                 0x7f0000
+#define BRSSI_GEN                               0x7f000000
+#define BRXSETTLE_TRSW                          0x7
+#define BRXSETTLE_LNA                           0x38
+#define BRXSETTLE_RSSI                          0x1c0
+#define BRXSETTLE_BBP                           0xe00
+#define BRXSETTLE_RXHP                          0x7000
+#define BRXSETTLE_ANTSW_RSSI                    0x38000
+#define BRXSETTLE_ANTSW                         0xc0000
+#define BRXPROCESS_TIME_DAGC                    0x300000
+#define BRXSETTLE_HSSI                          0x400000
+#define BRXPROCESS_TIME_BBPPW                   0x800000
+#define BRXANTENNA_POWER_SHIFT                  0x3000000
+#define BRSSI_TABLE_SELECT                      0xc000000
+#define BRXHP_FINAL                             0x7000000
+#define BRXHPSETTLE_BBP                         0x7
+#define BRXHTSETTLE_HSSI                        0x8
+#define BRXHTSETTLE_RXHP                        0x70
+#define BRXHTSETTLE_BBPPW                       0x80
+#define BRXHTSETTLE_IDLE                        0x300
+#define BRXHTSETTLE_RESERVED                    0x1c00
+#define BRXHT_RXHP_EN                           0x8000
+#define BRXAGC_FREEZE_THRES                     0x30000
+#define BRXAGC_TOGETHEREN                       0x40000
+#define BRXHTAGC_MIN                            0x80000
+#define BRXHTAGC_EN                             0x100000
+#define BRXHTDAGC_EN                            0x200000
+#define BRXHT_RXHP_BBP                          0x1c00000
+#define BRXHT_RXHP_FINAL                        0xe0000000
+#define BRXPW_RADIO_TH                          0x3
+#define BRXPW_RADIO_EN                          0x4
+#define BRXMF_HOLD                              0x3800
+#define BRXPD_DELAY_TH1                         0x38
+#define BRXPD_DELAY_TH2                         0x1c0
+#define BRXPD_DC_COUNT_MAX                      0x600
+#define BRXPD_DELAY_TH                          0x8000
+#define BRXPROCESS_DELAY                        0xf0000
+#define BRXSEARCHRANGE_GI2_EARLY                0x700000
+#define BRXFRAME_FUARD_COUNTER_L                0x3800000
+#define BRXSGI_GUARD_L                          0xc000000
+#define BRXSGI_SEARCH_L                         0x30000000
+#define BRXSGI_TH                               0xc0000000
+#define BDFSCNT0                                0xff
+#define BDFSCNT1                                0xff00
+#define BDFSFLAG                                0xf0000
+#define BMF_WEIGHT_SUM                          0x300000
+#define BMINIDX_TH                              0x7f000000
+#define BDAFORMAT                               0x40000
+#define BTXCH_EMU_ENABLE                        0x01000000
+#define BTRSW_ISOLATION_A                       0x7f
+#define BTRSW_ISOLATION_B                       0x7f00
+#define BTRSW_ISOLATION_C                       0x7f0000
+#define BTRSW_ISOLATION_D                       0x7f000000
+#define BEXT_LNA_GAIN                           0x7c00
+
+#define BSTBC_EN                                0x4
+#define BANTENNA_MAPPING                        0x10
+#define BNSS                                    0x20
+#define BCFO_ANTSUM_ID                          0x200
+#define BPHY_COUNTER_RESET                      0x8000000
+#define BCFO_REPORT_GET                         0x4000000
+#define BOFDM_CONTINUE_TX                       0x10000000
+#define BOFDM_SINGLE_CARRIER                    0x20000000
+#define BOFDM_SINGLE_TONE                       0x40000000
+#define BHT_DETECT                              0x100
+#define BCFOEN                                  0x10000
+#define BCFOVALUE                               0xfff00000
+#define BSIGTONE_RE                             0x3f
+#define BSIGTONE_IM                             0x7f00
+#define BCOUNTER_CCA                            0xffff
+#define BCOUNTER_PARITYFAIL                     0xffff0000
+#define BCOUNTER_RATEILLEGAL                    0xffff
+#define BCOUNTER_CRC8FAIL                       0xffff0000
+#define BCOUNTER_MCSNOSUPPORT                   0xffff
+#define BCOUNTER_FASTSYNC                       0xffff
+#define BSHORTCFO                               0xfff
+#define BSHORTCFOT_LENGTH                       12
+#define BSHORTCFOF_LENGTH                       11
+#define BLONGCFO                                0x7ff
+#define BLONGCFOT_LENGTH                        11
+#define BLONGCFOF_LENGTH                        11
+#define BTAILCFO                                0x1fff
+#define BTAILCFOT_LENGTH                        13
+#define BTAILCFOF_LENGTH                        12
+#define BNOISE_EN_PWDB                          0xffff
+#define BCC_POWER_DB                            0xffff0000
+#define BMOISE_PWDB                             0xffff
+#define BPOWERMEAST_LENGTH                      10
+#define BPOWERMEASF_LENGTH                      3
+#define BRX_HT_BW                               0x1
+#define BRXSC                                   0x6
+#define BRX_HT                                  0x8
+#define BNB_INTF_DET_ON                         0x1
+#define BINTF_WIN_LEN_CFG                       0x30
+#define BNB_INTF_TH_CFG                         0x1c0
+#define BRFGAIN                                 0x3f
+#define BTABLESEL                               0x40
+#define BTRSW                                   0x80
+#define BRXSNR_A                                0xff
+#define BRXSNR_B                                0xff00
+#define BRXSNR_C                                0xff0000
+#define BRXSNR_D                                0xff000000
+#define BSNR_EVMT_LENGTH                        8
+#define BSNR_EVMF_LENGTH                        1
+#define BCSI1ST                                 0xff
+#define BCSI2ND                                 0xff00
+#define BRXEVM1ST                               0xff0000
+#define BRXEVM2ND                               0xff000000
+#define BSIGEVM                                 0xff
+#define BPWDB                                   0xff00
+#define BSGIEN                                  0x10000
+
+#define BSFACTOR_QMA1                           0xf
+#define BSFACTOR_QMA2                           0xf0
+#define BSFACTOR_QMA3                           0xf00
+#define BSFACTOR_QMA4                           0xf000
+#define BSFACTOR_QMA5                           0xf0000
+#define BSFACTOR_QMA6                           0xf0000
+#define BSFACTOR_QMA7                           0xf00000
+#define BSFACTOR_QMA8                           0xf000000
+#define BSFACTOR_QMA9                           0xf0000000
+#define BCSI_SCHEME                             0x100000
+
+#define BNOISE_LVL_TOP_SET                      0x3
+#define BCHSMOOTH                               0x4
+#define BCHSMOOTH_CFG1                          0x38
+#define BCHSMOOTH_CFG2                          0x1c0
+#define BCHSMOOTH_CFG3                          0xe00
+#define BCHSMOOTH_CFG4                          0x7000
+#define BMRCMODE                                0x800000
+#define BTHEVMCFG                               0x7000000
+
+#define BLOOP_FIT_TYPE                          0x1
+#define BUPD_CFO                                0x40
+#define BUPD_CFO_OFFDATA                        0x80
+#define BADV_UPD_CFO                            0x100
+#define BADV_TIME_CTRL                          0x800
+#define BUPD_CLKO                               0x1000
+#define BFC                                     0x6000
+#define BTRACKING_MODE                          0x8000
+#define BPHCMP_ENABLE                           0x10000
+#define BUPD_CLKO_LTF                           0x20000
+#define BCOM_CH_CFO                             0x40000
+#define BCSI_ESTI_MODE                          0x80000
+#define BADV_UPD_EQZ                            0x100000
+#define BUCHCFG                                 0x7000000
+#define BUPDEQZ                                 0x8000000
+
+#define BRX_PESUDO_NOISE_ON                     0x20000000
+#define BRX_PESUDO_NOISE_A                      0xff
+#define BRX_PESUDO_NOISE_B                      0xff00
+#define BRX_PESUDO_NOISE_C                      0xff0000
+#define BRX_PESUDO_NOISE_D                      0xff000000
+#define BRX_PESUDO_NOISESTATE_A                 0xffff
+#define BRX_PESUDO_NOISESTATE_B                 0xffff0000
+#define BRX_PESUDO_NOISESTATE_C                 0xffff
+#define BRX_PESUDO_NOISESTATE_D                 0xffff0000
+
+#define BZEBRA1_HSSIENABLE                      0x8
+#define BZEBRA1_TRXCONTROL                      0xc00
+#define BZEBRA1_TRXGAINSETTING                  0x07f
+#define BZEBRA1_RXCOUNTER                       0xc00
+#define BZEBRA1_TXCHANGEPUMP                    0x38
+#define BZEBRA1_RXCHANGEPUMP                    0x7
+#define BZEBRA1_CHANNEL_NUM                     0xf80
+#define BZEBRA1_TXLPFBW                         0x400
+#define BZEBRA1_RXLPFBW                         0x600
+
+#define BRTL8256REG_MODE_CTRL1                  0x100
+#define BRTL8256REG_MODE_CTRL0                  0x40
+#define BRTL8256REG_TXLPFBW                     0x18
+#define BRTL8256REG_RXLPFBW                     0x600
+
+#define BRTL8258_TXLPFBW                        0xc
+#define BRTL8258_RXLPFBW                        0xc00
+#define BRTL8258_RSSILPFBW                      0xc0
+
+#define BBYTE0                                  0x1
+#define BBYTE1                                  0x2
+#define BBYTE2                                  0x4
+#define BBYTE3                                  0x8
+#define BWORD0                                  0x3
+#define BWORD1                                  0xc
+#define BWORD                                   0xf
+
+#define MASKBYTE0                               0xff
+#define MASKBYTE1                               0xff00
+#define MASKBYTE2                               0xff0000
+#define MASKBYTE3                               0xff000000
+#define MASKHWORD                               0xffff0000
+#define MASKLWORD                               0x0000ffff
+#define MASKDWORD                               0xffffffff
+#define MASK12BITS                              0xfff
+#define MASKH4BITS                              0xf0000000
+#define MASKOFDM_D                              0xffc00000
+#define MASKCCK                                 0x3f3f3f3f
+
+#define MASK4BITS                               0x0f
+#define MASK20BITS                              0xfffff
+#define RFREG_OFFSET_MASK                       0xfffff
+
+#define BENABLE                                 0x1
+#define BDISABLE                                0x0
+
+#define LEFT_ANTENNA                            0x0
+#define RIGHT_ANTENNA                           0x1
+
+#define TCHECK_TXSTATUS                         500
+#define TUPDATE_RXCOUNTER                       100
+
+#define REG_UN_used_register                    0x01bf
+
+/* WOL bit information */
+#define HAL92C_WOL_PTK_UPDATE_EVENT             BIT(0)
+#define HAL92C_WOL_GTK_UPDATE_EVENT             BIT(1)
+#define HAL92C_WOL_DISASSOC_EVENT               BIT(2)
+#define HAL92C_WOL_DEAUTH_EVENT                 BIT(3)
+#define HAL92C_WOL_FW_DISCONNECT_EVENT          BIT(4)
+
+#define WOL_REASON_PTK_UPDATE                   BIT(0)
+#define WOL_REASON_GTK_UPDATE                   BIT(1)
+#define WOL_REASON_DISASSOC                     BIT(2)
+#define WOL_REASON_DEAUTH                       BIT(3)
+#define WOL_REASON_FW_DISCONNECT                BIT(4)
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/rf.c b/drivers/net/wireless/rtlwifi/rtl8192ee/rf.c
new file mode 100644
index 000000000000..c9bc33cd1090
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/rf.c
@@ -0,0 +1,152 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "rf.h"
+#include "dm.h"
+
+static bool _rtl92ee_phy_rf6052_config_parafile(struct ieee80211_hw *hw);
+
+void rtl92ee_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        switch (bandwidth) {
+        case HT_CHANNEL_WIDTH_20:
+                rtlphy->rfreg_chnlval[0] = ((rtlphy->rfreg_chnlval[0] &
+                                             0xfffff3ff) | BIT(10) | BIT(11));
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, RFREG_OFFSET_MASK,
+                              rtlphy->rfreg_chnlval[0]);
+                rtl_set_rfreg(hw, RF90_PATH_B, RF_CHNLBW, RFREG_OFFSET_MASK,
+                              rtlphy->rfreg_chnlval[0]);
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                rtlphy->rfreg_chnlval[0] = ((rtlphy->rfreg_chnlval[0] &
+                                             0xfffff3ff) | BIT(10));
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, RFREG_OFFSET_MASK,
+                              rtlphy->rfreg_chnlval[0]);
+                rtl_set_rfreg(hw, RF90_PATH_B, RF_CHNLBW, RFREG_OFFSET_MASK,
+                              rtlphy->rfreg_chnlval[0]);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "unknown bandwidth: %#X\n", bandwidth);
+                break;
+        }
+}
+
+bool rtl92ee_phy_rf6052_config(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        if (rtlphy->rf_type == RF_1T1R)
+                rtlphy->num_total_rfpath = 1;
+        else
+                rtlphy->num_total_rfpath = 2;
+
+        return _rtl92ee_phy_rf6052_config_parafile(hw);
+}
+
+static bool _rtl92ee_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 u4_regvalue = 0;
+        u8 rfpath;
+        bool rtstatus = true;
+        struct bb_reg_def *pphyreg;
+
+        for (rfpath = 0; rfpath < rtlphy->num_total_rfpath; rfpath++) {
+                pphyreg = &rtlphy->phyreg_def[rfpath];
+
+                switch (rfpath) {
+                case RF90_PATH_A:
+                case RF90_PATH_C:
+                        u4_regvalue = rtl_get_bbreg(hw, pphyreg->rfintfs,
+                                                    BRFSI_RFENV);
+                        break;
+                case RF90_PATH_B:
+                case RF90_PATH_D:
+                        u4_regvalue = rtl_get_bbreg(hw, pphyreg->rfintfs,
+                                                    BRFSI_RFENV << 16);
+                        break;
+                }
+
+                rtl_set_bbreg(hw, pphyreg->rfintfe, BRFSI_RFENV << 16, 0x1);
+                udelay(1);
+
+                rtl_set_bbreg(hw, pphyreg->rfintfo, BRFSI_RFENV, 0x1);
+                udelay(1);
+
+                rtl_set_bbreg(hw, pphyreg->rfhssi_para2,
+                              B3WIREADDREAALENGTH, 0x0);
+                udelay(1);
+
+                rtl_set_bbreg(hw, pphyreg->rfhssi_para2, B3WIREDATALENGTH, 0x0);
+                udelay(1);
+
+                switch (rfpath) {
+                case RF90_PATH_A:
+                        rtstatus = rtl92ee_phy_config_rf_with_headerfile(hw,
+                                                       (enum radio_path)rfpath);
+                        break;
+                case RF90_PATH_B:
+                        rtstatus = rtl92ee_phy_config_rf_with_headerfile(hw,
+                                                       (enum radio_path)rfpath);
+                        break;
+                case RF90_PATH_C:
+                        break;
+                case RF90_PATH_D:
+                        break;
+                }
+
+                switch (rfpath) {
+                case RF90_PATH_A:
+                case RF90_PATH_C:
+                        rtl_set_bbreg(hw, pphyreg->rfintfs,
+                                      BRFSI_RFENV, u4_regvalue);
+                        break;
+                case RF90_PATH_B:
+                case RF90_PATH_D:
+                        rtl_set_bbreg(hw, pphyreg->rfintfs,
+                                      BRFSI_RFENV << 16, u4_regvalue);
+                        break;
+                }
+
+                if (!rtstatus) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                 "Radio[%d] Fail!!", rfpath);
+                        return false;
+                }
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "\n");
+        return rtstatus;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/rf.h b/drivers/net/wireless/rtlwifi/rtl8192ee/rf.h
new file mode 100644
index 000000000000..8bdeed3c064e
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/rf.h
@@ -0,0 +1,36 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_RF_H__
+#define __RTL92E_RF_H__
+
+#define RF6052_MAX_TX_PWR               0x3F
+#define RF6052_MAX_REG                  0x3F
+
+void rtl92ee_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
+                                      u8 bandwidth);
+bool rtl92ee_phy_rf6052_config(struct ieee80211_hw *hw);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c
new file mode 100644
index 000000000000..9b5a7d5be121
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c
@@ -0,0 +1,399 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../core.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "hw.h"
+#include "sw.h"
+#include "fw.h"
+#include "trx.h"
+#include "led.h"
+#include "table.h"
+
+#include "../btcoexist/rtl_btc.h"
+
+#include <linux/vmalloc.h>
+#include <linux/module.h>
+
+static void rtl92ee_init_aspm_vars(struct ieee80211_hw *hw)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        /*close ASPM for AMD defaultly */
+        rtlpci->const_amdpci_aspm = 0;
+
+        /**
+         * ASPM PS mode.
+         * 0 - Disable ASPM,
+         * 1 - Enable ASPM without Clock Req,
+         * 2 - Enable ASPM with Clock Req,
+         * 3 - Alwyas Enable ASPM with Clock Req,
+         * 4 - Always Enable ASPM without Clock Req.
+         * set defult to RTL8192CE:3 RTL8192E:2
+         */
+        rtlpci->const_pci_aspm = 3;
+
+        /*Setting for PCI-E device */
+        rtlpci->const_devicepci_aspm_setting = 0x03;
+
+        /*Setting for PCI-E bridge */
+        rtlpci->const_hostpci_aspm_setting = 0x02;
+
+        /**
+         * In Hw/Sw Radio Off situation.
+         * 0 - Default,
+         * 1 - From ASPM setting without low Mac Pwr,
+         * 2 - From ASPM setting with low Mac Pwr,
+         * 3 - Bus D3
+         * set default to RTL8192CE:0 RTL8192SE:2
+         */
+        rtlpci->const_hwsw_rfoff_d3 = 0;
+
+        /**
+         * This setting works for those device with
+         * backdoor ASPM setting such as EPHY setting.
+         * 0 - Not support ASPM,
+         * 1 - Support ASPM,
+         * 2 - According to chipset.
+         */
+        rtlpci->const_support_pciaspm = 1;
+}
+
+int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        int err = 0;
+
+        rtl92ee_bt_reg_init(hw);
+        rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
+        rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();
+
+        rtlpriv->dm.dm_initialgain_enable = 1;
+        rtlpriv->dm.dm_flag = 0;
+        rtlpriv->dm.disable_framebursting = 0;
+        rtlpci->transmit_config = CFENDFORM | BIT(15);
+
+        /*just 2.4G band*/
+        rtlpriv->rtlhal.current_bandtype = BAND_ON_2_4G;
+        rtlpriv->rtlhal.bandset = BAND_ON_2_4G;
+        rtlpriv->rtlhal.macphymode = SINGLEMAC_SINGLEPHY;
+
+        rtlpci->receive_config = (RCR_APPFCS                    |
+                                  RCR_APP_MIC                   |
+                                  RCR_APP_ICV                   |
+                                  RCR_APP_PHYST_RXFF            |
+                                  RCR_HTC_LOC_CTRL              |
+                                  RCR_AMF                       |
+                                  RCR_ACF                       |
+                                  RCR_ADF                       |
+                                  RCR_AICV                      |
+                                  RCR_ACRC32                    |
+                                  RCR_AB                        |
+                                  RCR_AM                        |
+                                  RCR_APM                       |
+                                  0);
+
+        rtlpci->irq_mask[0] = (u32)(IMR_PSTIMEOUT               |
+                                     IMR_C2HCMD                 |
+                                     IMR_HIGHDOK                |
+                                     IMR_MGNTDOK                |
+                                     IMR_BKDOK                  |
+                                     IMR_BEDOK                  |
+                                     IMR_VIDOK                  |
+                                     IMR_VODOK                  |
+                                     IMR_RDU                    |
+                                     IMR_ROK                    |
+                                     0);
+        rtlpci->irq_mask[1] = (u32)(IMR_RXFOVW | 0);
+
+        /* for debug level */
+        rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
+        /* for LPS & IPS */
+        rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
+        rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
+        rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
+        rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
+        if (rtlpriv->cfg->mod_params->disable_watchdog)
+                pr_info("watchdog disabled\n");
+        rtlpriv->psc.reg_fwctrl_lps = 3;
+        rtlpriv->psc.reg_max_lps_awakeintvl = 5;
+        /* for ASPM, you can close aspm through
+         * set const_support_pciaspm = 0
+         */
+        rtl92ee_init_aspm_vars(hw);
+
+        if (rtlpriv->psc.reg_fwctrl_lps == 1)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_MIN_MODE;
+        else if (rtlpriv->psc.reg_fwctrl_lps == 2)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_MAX_MODE;
+        else if (rtlpriv->psc.reg_fwctrl_lps == 3)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
+
+        /* for early mode */
+        rtlpriv->rtlhal.earlymode_enable = false;
+
+        /*low power */
+        rtlpriv->psc.low_power_enable = false;
+
+        /* for firmware buf */
+        rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
+        if (!rtlpriv->rtlhal.pfirmware) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't alloc buffer for fw\n");
+                return 1;
+        }
+
+        /* request fw */
+        rtlpriv->cfg->fw_name = "rtlwifi/rtl8192eefw.bin";
+
+        rtlpriv->max_fw_size = 0x8000;
+        pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl_fw_cb);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Failed to request firmware!\n");
+                return 1;
+        }
+
+        return 0;
+}
+
+void rtl92ee_deinit_sw_vars(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->rtlhal.pfirmware) {
+                vfree(rtlpriv->rtlhal.pfirmware);
+                rtlpriv->rtlhal.pfirmware = NULL;
+        }
+}
+
+/* get bt coexist status */
+bool rtl92ee_get_btc_status(void)
+{
+        return true;
+}
+
+static struct rtl_hal_ops rtl8192ee_hal_ops = {
+        .init_sw_vars = rtl92ee_init_sw_vars,
+        .deinit_sw_vars = rtl92ee_deinit_sw_vars,
+        .read_eeprom_info = rtl92ee_read_eeprom_info,
+        .interrupt_recognized = rtl92ee_interrupt_recognized,/*need check*/
+        .hw_init = rtl92ee_hw_init,
+        .hw_disable = rtl92ee_card_disable,
+        .hw_suspend = rtl92ee_suspend,
+        .hw_resume = rtl92ee_resume,
+        .enable_interrupt = rtl92ee_enable_interrupt,
+        .disable_interrupt = rtl92ee_disable_interrupt,
+        .set_network_type = rtl92ee_set_network_type,
+        .set_chk_bssid = rtl92ee_set_check_bssid,
+        .set_qos = rtl92ee_set_qos,
+        .set_bcn_reg = rtl92ee_set_beacon_related_registers,
+        .set_bcn_intv = rtl92ee_set_beacon_interval,
+        .update_interrupt_mask = rtl92ee_update_interrupt_mask,
+        .get_hw_reg = rtl92ee_get_hw_reg,
+        .set_hw_reg = rtl92ee_set_hw_reg,
+        .update_rate_tbl = rtl92ee_update_hal_rate_tbl,
+        .pre_fill_tx_bd_desc = rtl92ee_pre_fill_tx_bd_desc,
+        .rx_desc_buff_remained_cnt = rtl92ee_rx_desc_buff_remained_cnt,
+        .rx_check_dma_ok = rtl92ee_rx_check_dma_ok,
+        .fill_tx_desc = rtl92ee_tx_fill_desc,
+        .fill_tx_cmddesc = rtl92ee_tx_fill_cmddesc,
+        .query_rx_desc = rtl92ee_rx_query_desc,
+        .set_channel_access = rtl92ee_update_channel_access_setting,
+        .radio_onoff_checking = rtl92ee_gpio_radio_on_off_checking,
+        .set_bw_mode = rtl92ee_phy_set_bw_mode,
+        .switch_channel = rtl92ee_phy_sw_chnl,
+        .dm_watchdog = rtl92ee_dm_watchdog,
+        .scan_operation_backup = rtl92ee_phy_scan_operation_backup,
+        .set_rf_power_state = rtl92ee_phy_set_rf_power_state,
+        .led_control = rtl92ee_led_control,
+        .set_desc = rtl92ee_set_desc,
+        .get_desc = rtl92ee_get_desc,
+        .is_tx_desc_closed = rtl92ee_is_tx_desc_closed,
+        .tx_polling = rtl92ee_tx_polling,
+        .enable_hw_sec = rtl92ee_enable_hw_security_config,
+        .set_key = rtl92ee_set_key,
+        .init_sw_leds = rtl92ee_init_sw_leds,
+        .get_bbreg = rtl92ee_phy_query_bb_reg,
+        .set_bbreg = rtl92ee_phy_set_bb_reg,
+        .get_rfreg = rtl92ee_phy_query_rf_reg,
+        .set_rfreg = rtl92ee_phy_set_rf_reg,
+        .fill_h2c_cmd = rtl92ee_fill_h2c_cmd,
+        .get_btc_status = rtl92ee_get_btc_status,
+        .rx_command_packet = rtl92ee_rx_command_packet,
+};
+
+static struct rtl_mod_params rtl92ee_mod_params = {
+        .sw_crypto = false,
+        .inactiveps = false,
+        .swctrl_lps = false,
+        .fwctrl_lps = true,
+        .msi_support = true,
+        .debug = DBG_EMERG,
+};
+
+static struct rtl_hal_cfg rtl92ee_hal_cfg = {
+        .bar_id = 2,
+        .write_readback = true,
+        .name = "rtl92ee_pci",
+        .fw_name = "rtlwifi/rtl8192eefw.bin",
+        .ops = &rtl8192ee_hal_ops,
+        .mod_params = &rtl92ee_mod_params,
+
+        .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
+        .maps[SYS_FUNC_EN] = REG_SYS_FUNC_EN,
+        .maps[SYS_CLK] = REG_SYS_CLKR,
+        .maps[MAC_RCR_AM] = AM,
+        .maps[MAC_RCR_AB] = AB,
+        .maps[MAC_RCR_ACRC32] = ACRC32,
+        .maps[MAC_RCR_ACF] = ACF,
+        .maps[MAC_RCR_AAP] = AAP,
+        .maps[MAC_HIMR] = REG_HIMR,
+        .maps[MAC_HIMRE] = REG_HIMRE,
+
+        .maps[EFUSE_ACCESS] = REG_EFUSE_ACCESS,
+
+        .maps[EFUSE_TEST] = REG_EFUSE_TEST,
+        .maps[EFUSE_CTRL] = REG_EFUSE_CTRL,
+        .maps[EFUSE_CLK] = 0,
+        .maps[EFUSE_CLK_CTRL] = REG_EFUSE_CTRL,
+        .maps[EFUSE_PWC_EV12V] = PWC_EV12V,
+        .maps[EFUSE_FEN_ELDR] = FEN_ELDR,
+        .maps[EFUSE_LOADER_CLK_EN] = LOADER_CLK_EN,
+        .maps[EFUSE_ANA8M] = ANA8M,
+        .maps[EFUSE_HWSET_MAX_SIZE] = HWSET_MAX_SIZE,
+        .maps[EFUSE_MAX_SECTION_MAP] = EFUSE_MAX_SECTION,
+        .maps[EFUSE_REAL_CONTENT_SIZE] = EFUSE_REAL_CONTENT_LEN,
+        .maps[EFUSE_OOB_PROTECT_BYTES_LEN] = EFUSE_OOB_PROTECT_BYTES,
+
+        .maps[RWCAM] = REG_CAMCMD,
+        .maps[WCAMI] = REG_CAMWRITE,
+        .maps[RCAMO] = REG_CAMREAD,
+        .maps[CAMDBG] = REG_CAMDBG,
+        .maps[SECR] = REG_SECCFG,
+        .maps[SEC_CAM_NONE] = CAM_NONE,
+        .maps[SEC_CAM_WEP40] = CAM_WEP40,
+        .maps[SEC_CAM_TKIP] = CAM_TKIP,
+        .maps[SEC_CAM_AES] = CAM_AES,
+        .maps[SEC_CAM_WEP104] = CAM_WEP104,
+
+        .maps[RTL_IMR_BCNDMAINT6] = IMR_BCNDMAINT6,
+        .maps[RTL_IMR_BCNDMAINT5] = IMR_BCNDMAINT5,
+        .maps[RTL_IMR_BCNDMAINT4] = IMR_BCNDMAINT4,
+        .maps[RTL_IMR_BCNDMAINT3] = IMR_BCNDMAINT3,
+        .maps[RTL_IMR_BCNDMAINT2] = IMR_BCNDMAINT2,
+        .maps[RTL_IMR_BCNDMAINT1] = IMR_BCNDMAINT1,
+        .maps[RTL_IMR_BCNDOK7] = IMR_BCNDOK7,
+        .maps[RTL_IMR_BCNDOK6] = IMR_BCNDOK6,
+        .maps[RTL_IMR_BCNDOK5] = IMR_BCNDOK5,
+        .maps[RTL_IMR_BCNDOK4] = IMR_BCNDOK4,
+        .maps[RTL_IMR_BCNDOK3] = IMR_BCNDOK3,
+        .maps[RTL_IMR_BCNDOK2] = IMR_BCNDOK2,
+        .maps[RTL_IMR_BCNDOK1] = IMR_BCNDOK1,
+
+        .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
+        .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
+        .maps[RTL_IMR_BCNINT] = IMR_BCNDMAINT0,
+        .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW,
+        .maps[RTL_IMR_RDU] = IMR_RDU,
+        .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND,
+        .maps[RTL_IMR_BDOK] = IMR_BCNDOK0,
+        .maps[RTL_IMR_MGNTDOK] = IMR_MGNTDOK,
+        .maps[RTL_IMR_TBDER] = IMR_TBDER,
+        .maps[RTL_IMR_HIGHDOK] = IMR_HIGHDOK,
+        .maps[RTL_IMR_TBDOK] = IMR_TBDOK,
+        .maps[RTL_IMR_BKDOK] = IMR_BKDOK,
+        .maps[RTL_IMR_BEDOK] = IMR_BEDOK,
+        .maps[RTL_IMR_VIDOK] = IMR_VIDOK,
+        .maps[RTL_IMR_VODOK] = IMR_VODOK,
+        .maps[RTL_IMR_ROK] = IMR_ROK,
+        .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNDMAINT0 | IMR_TBDOK | IMR_TBDER),
+
+        .maps[RTL_RC_CCK_RATE1M] = DESC92C_RATE1M,
+        .maps[RTL_RC_CCK_RATE2M] = DESC92C_RATE2M,
+        .maps[RTL_RC_CCK_RATE5_5M] = DESC92C_RATE5_5M,
+        .maps[RTL_RC_CCK_RATE11M] = DESC92C_RATE11M,
+        .maps[RTL_RC_OFDM_RATE6M] = DESC92C_RATE6M,
+        .maps[RTL_RC_OFDM_RATE9M] = DESC92C_RATE9M,
+        .maps[RTL_RC_OFDM_RATE12M] = DESC92C_RATE12M,
+        .maps[RTL_RC_OFDM_RATE18M] = DESC92C_RATE18M,
+        .maps[RTL_RC_OFDM_RATE24M] = DESC92C_RATE24M,
+        .maps[RTL_RC_OFDM_RATE36M] = DESC92C_RATE36M,
+        .maps[RTL_RC_OFDM_RATE48M] = DESC92C_RATE48M,
+        .maps[RTL_RC_OFDM_RATE54M] = DESC92C_RATE54M,
+
+        .maps[RTL_RC_HT_RATEMCS7] = DESC92C_RATEMCS7,
+        .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15,
+};
+
+static struct pci_device_id rtl92ee_pci_ids[] = {
+        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x818B, rtl92ee_hal_cfg)},
+        {},
+};
+
+MODULE_DEVICE_TABLE(pci, rtl92ee_pci_ids);
+
+MODULE_AUTHOR("Realtek WlanFAE  <wlanfae@realtek.com>");
+MODULE_AUTHOR("Larry Finger     <Larry.Finger@lwfinger.net>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Realtek 8192EE 802.11n PCI wireless");
+MODULE_FIRMWARE("rtlwifi/rtl8192eefw.bin");
+
+module_param_named(swenc, rtl92ee_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl92ee_mod_params.debug, int, 0444);
+module_param_named(ips, rtl92ee_mod_params.inactiveps, bool, 0444);
+module_param_named(swlps, rtl92ee_mod_params.swctrl_lps, bool, 0444);
+module_param_named(fwlps, rtl92ee_mod_params.fwctrl_lps, bool, 0444);
+module_param_named(msi, rtl92ee_mod_params.msi_support, bool, 0444);
+module_param_named(disable_watchdog, rtl92ee_mod_params.disable_watchdog,
+                   bool, 0444);
+MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
+MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
+MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
+MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
+MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 1)\n");
+MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");
+
+static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+
+static struct pci_driver rtl92ee_driver = {
+        .name = KBUILD_MODNAME,
+        .id_table = rtl92ee_pci_ids,
+        .probe = rtl_pci_probe,
+        .remove = rtl_pci_disconnect,
+        .driver.pm = &rtlwifi_pm_ops,
+};
+
+module_pci_driver(rtl92ee_driver);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/sw.h b/drivers/net/wireless/rtlwifi/rtl8192ee/sw.h
new file mode 100644
index 000000000000..21433d0332d0
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/sw.h
@@ -0,0 +1,33 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_SW_H__
+#define __RTL92E_SW_H__
+
+int rtl92ee_init_sw_vars(struct ieee80211_hw *hw);
+void rtl92ee_deinit_sw_vars(struct ieee80211_hw *hw);
+bool rtl92ee_get_btc_status(void);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/table.c b/drivers/net/wireless/rtlwifi/rtl8192ee/table.c
new file mode 100644
index 000000000000..abcdd0670fd8
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/table.c
@@ -0,0 +1,882 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "table.h"
+u32 RTL8192EE_PHY_REG_ARRAY[] = {
+                0x800, 0x80040000,
+                0x804, 0x00000003,
+                0x808, 0x0000FC00,
+                0x80C, 0x0000000A,
+                0x810, 0x10001331,
+                0x814, 0x020C3D10,
+                0x818, 0x02220385,
+                0x81C, 0x00000000,
+                0x820, 0x01000100,
+                0x824, 0x00390204,
+                0x828, 0x01000100,
+                0x82C, 0x00390204,
+                0x830, 0x32323232,
+                0x834, 0x30303030,
+                0x838, 0x30303030,
+                0x83C, 0x30303030,
+                0x840, 0x00010000,
+                0x844, 0x00010000,
+                0x848, 0x28282828,
+                0x84C, 0x28282828,
+                0x850, 0x00000000,
+                0x854, 0x00000000,
+                0x858, 0x009A009A,
+                0x85C, 0x01000014,
+                0x860, 0x66F60000,
+                0x864, 0x061F0000,
+                0x868, 0x30303030,
+                0x86C, 0x30303030,
+                0x870, 0x00000000,
+                0x874, 0x55004200,
+                0x878, 0x08080808,
+                0x87C, 0x00000000,
+                0x880, 0xB0000C1C,
+                0x884, 0x00000001,
+                0x888, 0x00000000,
+                0x88C, 0xCC0000C0,
+                0x890, 0x00000800,
+                0x894, 0xFFFFFFFE,
+                0x898, 0x40302010,
+                0x900, 0x00000000,
+                0x904, 0x00000023,
+                0x908, 0x00000000,
+                0x90C, 0x81121313,
+                0x910, 0x806C0001,
+                0x914, 0x00000001,
+                0x918, 0x00000000,
+                0x91C, 0x00010000,
+                0x924, 0x00000001,
+                0x928, 0x00000000,
+                0x92C, 0x00000000,
+                0x930, 0x00000000,
+                0x934, 0x00000000,
+                0x938, 0x00000000,
+                0x93C, 0x00000000,
+                0x940, 0x00000000,
+                0x944, 0x00000000,
+                0x94C, 0x00000008,
+                0xA00, 0x00D0C7C8,
+                0xA04, 0x81FF000C,
+                0xA08, 0x8C838300,
+                0xA0C, 0x2E68120F,
+                0xA10, 0x95009B78,
+                0xA14, 0x1114D028,
+                0xA18, 0x00881117,
+                0xA1C, 0x89140F00,
+                0xA20, 0x1A1B0000,
+                0xA24, 0x090E1317,
+                0xA28, 0x00000204,
+                0xA2C, 0x00D30000,
+                0xA70, 0x101FBF00,
+                0xA74, 0x00000007,
+                0xA78, 0x00000900,
+                0xA7C, 0x225B0606,
+                0xA80, 0x218075B1,
+                0xB38, 0x00000000,
+                0xC00, 0x48071D40,
+                0xC04, 0x03A05633,
+                0xC08, 0x000000E4,
+                0xC0C, 0x6C6C6C6C,
+                0xC10, 0x08800000,
+                0xC14, 0x40000100,
+                0xC18, 0x08800000,
+                0xC1C, 0x40000100,
+                0xC20, 0x00000000,
+                0xC24, 0x00000000,
+                0xC28, 0x00000000,
+                0xC2C, 0x00000000,
+                0xC30, 0x69E9AC47,
+                0xC34, 0x469652AF,
+                0xC38, 0x49795994,
+                0xC3C, 0x0A97971C,
+                0xC40, 0x1F7C403F,
+                0xC44, 0x000100B7,
+                0xC48, 0xEC020107,
+                0xC4C, 0x007F037F,
+        0xFF010718, 0xABCD,
+                0xC50, 0x00340220,
+        0xCDCDCDCD, 0xCDCD,
+                0xC50, 0x00340020,
+        0xFF010718, 0xDEAD,
+                0xC54, 0x0080801F,
+        0xFF010718, 0xABCD,
+                0xC58, 0x00000220,
+        0xCDCDCDCD, 0xCDCD,
+                0xC58, 0x00000020,
+        0xFF010718, 0xDEAD,
+                0xC5C, 0x00248492,
+                0xC60, 0x00000000,
+                0xC64, 0x7112848B,
+                0xC68, 0x47C00BFF,
+                0xC6C, 0x00000036,
+                0xC70, 0x00000600,
+                0xC74, 0x02013169,
+                0xC78, 0x0000001F,
+                0xC7C, 0x00B91612,
+        0xFF010718, 0xABCD,
+                0xC80, 0x2D4000B5,
+        0xCDCDCDCD, 0xCDCD,
+                0xC80, 0x40000100,
+        0xFF010718, 0xDEAD,
+                0xC84, 0x21F60000,
+        0xFF010718, 0xABCD,
+                0xC88, 0x2D4000B5,
+        0xCDCDCDCD, 0xCDCD,
+                0xC88, 0x40000100,
+        0xFF010718, 0xDEAD,
+                0xC8C, 0xA0E40000,
+                0xC90, 0x00121820,
+                0xC94, 0x00000000,
+                0xC98, 0x00121820,
+                0xC9C, 0x00007F7F,
+                0xCA0, 0x00000000,
+                0xCA4, 0x000300A0,
+                0xCA8, 0x00000000,
+                0xCAC, 0x00000000,
+                0xCB0, 0x00000000,
+                0xCB4, 0x00000000,
+                0xCB8, 0x00000000,
+                0xCBC, 0x28000000,
+                0xCC0, 0x00000000,
+                0xCC4, 0x00000000,
+                0xCC8, 0x00000000,
+                0xCCC, 0x00000000,
+                0xCD0, 0x00000000,
+                0xCD4, 0x00000000,
+                0xCD8, 0x64B22427,
+                0xCDC, 0x00766932,
+                0xCE0, 0x00222222,
+                0xCE4, 0x00040000,
+                0xCE8, 0x77644302,
+                0xCEC, 0x2F97D40C,
+                0xD00, 0x00080740,
+                0xD04, 0x00020403,
+                0xD08, 0x0000907F,
+                0xD0C, 0x20010201,
+                0xD10, 0xA0633333,
+                0xD14, 0x3333BC43,
+                0xD18, 0x7A8F5B6B,
+                0xD1C, 0x0000007F,
+                0xD2C, 0xCC979975,
+                0xD30, 0x00000000,
+                0xD34, 0x80608000,
+                0xD38, 0x00000000,
+                0xD3C, 0x00127353,
+                0xD40, 0x00000000,
+                0xD44, 0x00000000,
+                0xD48, 0x00000000,
+                0xD4C, 0x00000000,
+                0xD50, 0x6437140A,
+                0xD54, 0x00000000,
+                0xD58, 0x00000282,
+                0xD5C, 0x30032064,
+                0xD60, 0x4653DE68,
+                0xD64, 0x04518A3C,
+                0xD68, 0x00002101,
+                0xD6C, 0x2A201C16,
+                0xD70, 0x1812362E,
+                0xD74, 0x322C2220,
+                0xD78, 0x000E3C24,
+                0xD80, 0x01081008,
+                0xD84, 0x00000800,
+                0xD88, 0xF0B50000,
+                0xE00, 0x30303030,
+                0xE04, 0x30303030,
+                0xE08, 0x03903030,
+                0xE10, 0x30303030,
+                0xE14, 0x30303030,
+                0xE18, 0x30303030,
+                0xE1C, 0x30303030,
+                0xE28, 0x00000000,
+                0xE30, 0x1000DC1F,
+                0xE34, 0x10008C1F,
+                0xE38, 0x02140102,
+                0xE3C, 0x681604C2,
+                0xE40, 0x01007C00,
+                0xE44, 0x01004800,
+                0xE48, 0xFB000000,
+                0xE4C, 0x000028D1,
+                0xE50, 0x1000DC1F,
+                0xE54, 0x10008C1F,
+                0xE58, 0x02140102,
+                0xE5C, 0x28160D05,
+                0xE60, 0x00000008,
+                0xE68, 0x0FC05656,
+                0xE6C, 0x03C09696,
+                0xE70, 0x03C09696,
+                0xE74, 0x0C005656,
+                0xE78, 0x0C005656,
+                0xE7C, 0x0C005656,
+                0xE80, 0x0C005656,
+                0xE84, 0x03C09696,
+                0xE88, 0x0C005656,
+                0xE8C, 0x03C09696,
+                0xED0, 0x03C09696,
+                0xED4, 0x03C09696,
+                0xED8, 0x03C09696,
+                0xEDC, 0x0000D6D6,
+                0xEE0, 0x0000D6D6,
+                0xEEC, 0x0FC01616,
+                0xEE4, 0xB0000C1C,
+                0xEE8, 0x00000001,
+                0xF14, 0x00000003,
+                0xF4C, 0x00000000,
+                0xF00, 0x00000300,
+};
+
+u32 RTL8192EE_PHY_REG_ARRAY_PG[] = {
+        0, 0, 0, 0x00000e08, 0x0000ff00, 0x00003200,
+        0, 0, 1, 0x00000e08, 0x0000ff00, 0x00003200,
+        0, 0, 0, 0x0000086c, 0xffffff00, 0x32323200,
+        0, 0, 1, 0x0000086c, 0xffffff00, 0x32323200,
+        0, 0, 0, 0x00000e00, 0xffffffff, 0x34343636,
+        0, 0, 1, 0x00000e00, 0xffffffff, 0x34343636,
+        0, 0, 0, 0x00000e04, 0xffffffff, 0x28283032,
+        0, 0, 1, 0x00000e04, 0xffffffff, 0x28283032,
+        0, 0, 0, 0x00000e10, 0xffffffff, 0x34363840,
+        0, 0, 1, 0x00000e10, 0xffffffff, 0x34363840,
+        0, 0, 0, 0x00000e14, 0xffffffff, 0x26283032,
+        0, 0, 1, 0x00000e14, 0xffffffff, 0x26283032,
+        0, 0, 1, 0x00000e18, 0xffffffff, 0x36384040,
+        0, 0, 1, 0x00000e1c, 0xffffffff, 0x24262832,
+        0, 1, 0, 0x00000838, 0xffffff00, 0x32323200,
+        0, 1, 1, 0x00000838, 0xffffff00, 0x32323200,
+        0, 1, 0, 0x0000086c, 0x000000ff, 0x00000032,
+        0, 1, 1, 0x0000086c, 0x000000ff, 0x00000032,
+        0, 1, 0, 0x00000830, 0xffffffff, 0x34343636,
+        0, 1, 1, 0x00000830, 0xffffffff, 0x34343636,
+        0, 1, 0, 0x00000834, 0xffffffff, 0x28283032,
+        0, 1, 1, 0x00000834, 0xffffffff, 0x28283032,
+        0, 1, 0, 0x0000083c, 0xffffffff, 0x34363840,
+        0, 1, 1, 0x0000083c, 0xffffffff, 0x34363840,
+        0, 1, 0, 0x00000848, 0xffffffff, 0x26283032,
+        0, 1, 1, 0x00000848, 0xffffffff, 0x26283032,
+        0, 1, 1, 0x0000084c, 0xffffffff, 0x36384040,
+        0, 1, 1, 0x00000868, 0xffffffff, 0x24262832
+};
+
+u32 RTL8192EE_RADIOA_ARRAY[] = {
+                0x07F, 0x00000082,
+                0x081, 0x0003FC00,
+                0x000, 0x00030000,
+                0x008, 0x00008400,
+                0x018, 0x00000407,
+                0x019, 0x00000012,
+                0x01B, 0x00000064,
+                0x01E, 0x00080009,
+                0x01F, 0x00000880,
+                0x02F, 0x0001A060,
+                0x03F, 0x00000000,
+                0x042, 0x000060C0,
+                0x057, 0x000D0000,
+                0x058, 0x000BE180,
+                0x067, 0x00001552,
+                0x083, 0x00000000,
+                0x0B0, 0x000FF9F1,
+                0x0B1, 0x00055418,
+                0x0B2, 0x0008CC00,
+                0x0B4, 0x00043083,
+                0x0B5, 0x00008166,
+                0x0B6, 0x0000803E,
+                0x0B7, 0x0001C69F,
+                0x0B8, 0x0000407F,
+                0x0B9, 0x00080001,
+                0x0BA, 0x00040001,
+                0x0BB, 0x00000400,
+                0x0BF, 0x000C0000,
+                0x0C2, 0x00002400,
+                0x0C3, 0x00000009,
+                0x0C4, 0x00040C91,
+                0x0C5, 0x00099999,
+                0x0C6, 0x000000A3,
+                0x0C7, 0x00088820,
+                0x0C8, 0x00076C06,
+                0x0C9, 0x00000000,
+                0x0CA, 0x00080000,
+                0x0DF, 0x00000180,
+                0x0EF, 0x000001A0,
+                0x051, 0x00069545,
+                0x052, 0x0007E45E,
+                0x053, 0x00000071,
+                0x056, 0x00051FF3,
+                0x035, 0x000000A8,
+                0x035, 0x000001E2,
+                0x035, 0x000002A8,
+                0x036, 0x00001C24,
+                0x036, 0x00009C24,
+                0x036, 0x00011C24,
+                0x036, 0x00019C24,
+                0x018, 0x00000C07,
+                0x05A, 0x00048000,
+                0x019, 0x000739D0,
+        0xFF010718, 0xABCD,
+                0x034, 0x0000A093,
+                0x034, 0x0000908F,
+                0x034, 0x0000808C,
+                0x034, 0x0000704D,
+                0x034, 0x0000604A,
+                0x034, 0x00005047,
+                0x034, 0x0000400A,
+                0x034, 0x00003007,
+                0x034, 0x00002004,
+                0x034, 0x00001001,
+                0x034, 0x00000000,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0000ADD7,
+                0x034, 0x00009DD4,
+                0x034, 0x00008DD1,
+                0x034, 0x00007DCE,
+                0x034, 0x00006DCB,
+                0x034, 0x00005DC8,
+                0x034, 0x00004DC5,
+                0x034, 0x000034CC,
+                0x034, 0x0000244F,
+                0x034, 0x0000144C,
+                0x034, 0x00000014,
+        0xFF010718, 0xDEAD,
+                0x000, 0x00030159,
+                0x084, 0x00068180,
+                0x086, 0x0000014E,
+                0x087, 0x00048E00,
+                0x08E, 0x00065540,
+                0x08F, 0x00088000,
+                0x0EF, 0x000020A0,
+        0xFF010718, 0xABCD,
+                0x03B, 0x000F07B0,
+        0xCDCDCDCD, 0xCDCD,
+                0x03B, 0x000F02B0,
+        0xFF010718, 0xDEAD,
+                0x03B, 0x000EF7B0,
+                0x03B, 0x000D4FB0,
+                0x03B, 0x000CF060,
+                0x03B, 0x000B0090,
+                0x03B, 0x000A0080,
+                0x03B, 0x00090080,
+                0x03B, 0x0008F780,
+        0xFF010718, 0xABCD,
+                0x03B, 0x000787B0,
+        0xCDCDCDCD, 0xCDCD,
+                0x03B, 0x00078730,
+        0xFF010718, 0xDEAD,
+                0x03B, 0x00060FB0,
+                0x03B, 0x0005FFA0,
+                0x03B, 0x00040620,
+                0x03B, 0x00037090,
+                0x03B, 0x00020080,
+                0x03B, 0x0001F060,
+                0x03B, 0x0000FFB0,
+                0x0EF, 0x000000A0,
+                0x0FE, 0x00000000,
+                0x018, 0x0000FC07,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x01E, 0x00000001,
+                0x01F, 0x00080000,
+                0x000, 0x00033E70,
+};
+
+u32 RTL8192EE_RADIOB_ARRAY[] = {
+                0x07F, 0x00000082,
+                0x081, 0x0003FC00,
+                0x000, 0x00030000,
+                0x008, 0x00008400,
+                0x018, 0x00000407,
+                0x019, 0x00000012,
+                0x01B, 0x00000064,
+                0x01E, 0x00080009,
+                0x01F, 0x00000880,
+                0x02F, 0x0001A060,
+                0x03F, 0x00000000,
+                0x042, 0x000060C0,
+                0x057, 0x000D0000,
+                0x058, 0x000BE180,
+                0x067, 0x00001552,
+                0x07F, 0x00000082,
+                0x081, 0x0003F000,
+                0x083, 0x00000000,
+                0x0DF, 0x00000180,
+                0x0EF, 0x000001A0,
+                0x051, 0x00069545,
+                0x052, 0x0007E42E,
+                0x053, 0x00000071,
+                0x056, 0x00051FF3,
+                0x035, 0x000000A8,
+                0x035, 0x000001E0,
+                0x035, 0x000002A8,
+                0x036, 0x00001CA8,
+                0x036, 0x00009C24,
+                0x036, 0x00011C24,
+                0x036, 0x00019C24,
+                0x018, 0x00000C07,
+                0x05A, 0x00048000,
+                0x019, 0x000739D0,
+        0xFF010718, 0xABCD,
+                0x034, 0x0000A093,
+                0x034, 0x0000908F,
+                0x034, 0x0000808C,
+                0x034, 0x0000704D,
+                0x034, 0x0000604A,
+                0x034, 0x00005047,
+                0x034, 0x0000400A,
+                0x034, 0x00003007,
+                0x034, 0x00002004,
+                0x034, 0x00001001,
+                0x034, 0x00000000,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0000ADD7,
+                0x034, 0x00009DD4,
+                0x034, 0x00008DD1,
+                0x034, 0x00007DCE,
+                0x034, 0x00006DCB,
+                0x034, 0x00005DC8,
+                0x034, 0x00004DC5,
+                0x034, 0x000034CC,
+                0x034, 0x0000244F,
+                0x034, 0x0000144C,
+                0x034, 0x00000014,
+        0xFF010718, 0xDEAD,
+                0x000, 0x00030159,
+                0x084, 0x00068180,
+                0x086, 0x000000CE,
+                0x087, 0x00048A00,
+                0x08E, 0x00065540,
+                0x08F, 0x00088000,
+                0x0EF, 0x000020A0,
+        0xFF010718, 0xABCD,
+                0x03B, 0x000F07B0,
+        0xCDCDCDCD, 0xCDCD,
+                0x03B, 0x000F02B0,
+        0xFF010718, 0xDEAD,
+                0x03B, 0x000EF7B0,
+                0x03B, 0x000D4FB0,
+                0x03B, 0x000CF060,
+                0x03B, 0x000B0090,
+                0x03B, 0x000A0080,
+                0x03B, 0x00090080,
+                0x03B, 0x0008F780,
+        0xFF010718, 0xABCD,
+                0x03B, 0x000787B0,
+        0xCDCDCDCD, 0xCDCD,
+                0x03B, 0x00078730,
+        0xFF010718, 0xDEAD,
+                0x03B, 0x00060FB0,
+                0x03B, 0x0005FFA0,
+                0x03B, 0x00040620,
+                0x03B, 0x00037090,
+                0x03B, 0x00020080,
+                0x03B, 0x0001F060,
+                0x03B, 0x0000FFB0,
+                0x0EF, 0x000000A0,
+                0x000, 0x00010159,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x01E, 0x00000001,
+                0x01F, 0x00080000,
+                0x000, 0x00033E70,
+};
+
+u32 RTL8192EE_MAC_ARRAY[] = {
+                0x011, 0x000000EB,
+                0x012, 0x00000007,
+                0x014, 0x00000075,
+                0x303, 0x000000A7,
+                0x428, 0x0000000A,
+                0x429, 0x00000010,
+                0x430, 0x00000000,
+                0x431, 0x00000000,
+                0x432, 0x00000000,
+                0x433, 0x00000001,
+                0x434, 0x00000004,
+                0x435, 0x00000005,
+                0x436, 0x00000007,
+                0x437, 0x00000008,
+                0x43C, 0x00000004,
+                0x43D, 0x00000005,
+                0x43E, 0x00000007,
+                0x43F, 0x00000008,
+                0x440, 0x0000005D,
+                0x441, 0x00000001,
+                0x442, 0x00000000,
+                0x444, 0x00000010,
+                0x445, 0x00000000,
+                0x446, 0x00000000,
+                0x447, 0x00000000,
+                0x448, 0x00000000,
+                0x449, 0x000000F0,
+                0x44A, 0x0000000F,
+                0x44B, 0x0000003E,
+                0x44C, 0x00000010,
+                0x44D, 0x00000000,
+                0x44E, 0x00000000,
+                0x44F, 0x00000000,
+                0x450, 0x00000000,
+                0x451, 0x000000F0,
+                0x452, 0x0000000F,
+                0x453, 0x00000000,
+                0x456, 0x0000005E,
+                0x460, 0x00000066,
+                0x461, 0x00000066,
+                0x4C8, 0x000000FF,
+                0x4C9, 0x00000008,
+                0x4CC, 0x000000FF,
+                0x4CD, 0x000000FF,
+                0x4CE, 0x00000001,
+                0x500, 0x00000026,
+                0x501, 0x000000A2,
+                0x502, 0x0000002F,
+                0x503, 0x00000000,
+                0x504, 0x00000028,
+                0x505, 0x000000A3,
+                0x506, 0x0000005E,
+                0x507, 0x00000000,
+                0x508, 0x0000002B,
+                0x509, 0x000000A4,
+                0x50A, 0x0000005E,
+                0x50B, 0x00000000,
+                0x50C, 0x0000004F,
+                0x50D, 0x000000A4,
+                0x50E, 0x00000000,
+                0x50F, 0x00000000,
+                0x512, 0x0000001C,
+                0x514, 0x0000000A,
+                0x516, 0x0000000A,
+                0x525, 0x0000004F,
+                0x540, 0x00000012,
+                0x541, 0x00000064,
+                0x550, 0x00000010,
+                0x551, 0x00000010,
+                0x559, 0x00000002,
+                0x55C, 0x00000050,
+                0x55D, 0x000000FF,
+                0x605, 0x00000030,
+                0x608, 0x0000000E,
+                0x609, 0x0000002A,
+                0x620, 0x000000FF,
+                0x621, 0x000000FF,
+                0x622, 0x000000FF,
+                0x623, 0x000000FF,
+                0x624, 0x000000FF,
+                0x625, 0x000000FF,
+                0x626, 0x000000FF,
+                0x627, 0x000000FF,
+                0x638, 0x00000050,
+                0x63C, 0x0000000A,
+                0x63D, 0x0000000A,
+                0x63E, 0x0000000E,
+                0x63F, 0x0000000E,
+                0x640, 0x00000040,
+                0x642, 0x00000040,
+                0x643, 0x00000000,
+                0x652, 0x000000C8,
+                0x66E, 0x00000005,
+                0x700, 0x00000021,
+                0x701, 0x00000043,
+                0x702, 0x00000065,
+                0x703, 0x00000087,
+                0x708, 0x00000021,
+                0x709, 0x00000043,
+                0x70A, 0x00000065,
+                0x70B, 0x00000087,
+};
+
+u32 RTL8192EE_AGC_TAB_ARRAY[] = {
+        0xFF010718, 0xABCD,
+                0xC78, 0xFA000001,
+                0xC78, 0xF9010001,
+                0xC78, 0xF8020001,
+                0xC78, 0xF7030001,
+                0xC78, 0xF6040001,
+                0xC78, 0xF5050001,
+                0xC78, 0xF4060001,
+                0xC78, 0xF3070001,
+                0xC78, 0xF2080001,
+                0xC78, 0xF1090001,
+                0xC78, 0xF00A0001,
+                0xC78, 0xEF0B0001,
+                0xC78, 0xEE0C0001,
+                0xC78, 0xED0D0001,
+                0xC78, 0xEC0E0001,
+                0xC78, 0xEB0F0001,
+                0xC78, 0xEA100001,
+                0xC78, 0xE9110001,
+                0xC78, 0xE8120001,
+                0xC78, 0xE7130001,
+                0xC78, 0xE6140001,
+                0xC78, 0xE5150001,
+                0xC78, 0xE4160001,
+                0xC78, 0xE3170001,
+                0xC78, 0xE2180001,
+                0xC78, 0xE1190001,
+                0xC78, 0x8A1A0001,
+                0xC78, 0x891B0001,
+                0xC78, 0x881C0001,
+                0xC78, 0x871D0001,
+                0xC78, 0x861E0001,
+                0xC78, 0x851F0001,
+                0xC78, 0x84200001,
+                0xC78, 0x83210001,
+                0xC78, 0x82220001,
+                0xC78, 0x6A230001,
+                0xC78, 0x69240001,
+                0xC78, 0x68250001,
+                0xC78, 0x67260001,
+                0xC78, 0x66270001,
+                0xC78, 0x65280001,
+                0xC78, 0x64290001,
+                0xC78, 0x632A0001,
+                0xC78, 0x622B0001,
+                0xC78, 0x612C0001,
+                0xC78, 0x602D0001,
+                0xC78, 0x472E0001,
+                0xC78, 0x462F0001,
+                0xC78, 0x45300001,
+                0xC78, 0x44310001,
+                0xC78, 0x43320001,
+                0xC78, 0x42330001,
+                0xC78, 0x41340001,
+                0xC78, 0x40350001,
+                0xC78, 0x40360001,
+                0xC78, 0x40370001,
+                0xC78, 0x40380001,
+                0xC78, 0x40390001,
+                0xC78, 0x403A0001,
+                0xC78, 0x403B0001,
+                0xC78, 0x403C0001,
+                0xC78, 0x403D0001,
+                0xC78, 0x403E0001,
+                0xC78, 0x403F0001,
+        0xCDCDCDCD, 0xCDCD,
+                0xC78, 0xFB000001,
+                0xC78, 0xFB010001,
+                0xC78, 0xFB020001,
+                0xC78, 0xFB030001,
+                0xC78, 0xFB040001,
+                0xC78, 0xFB050001,
+                0xC78, 0xFA060001,
+                0xC78, 0xF9070001,
+                0xC78, 0xF8080001,
+                0xC78, 0xF7090001,
+                0xC78, 0xF60A0001,
+                0xC78, 0xF50B0001,
+                0xC78, 0xF40C0001,
+                0xC78, 0xF30D0001,
+                0xC78, 0xF20E0001,
+                0xC78, 0xF10F0001,
+                0xC78, 0xF0100001,
+                0xC78, 0xEF110001,
+                0xC78, 0xEE120001,
+                0xC78, 0xED130001,
+                0xC78, 0xEC140001,
+                0xC78, 0xEB150001,
+                0xC78, 0xEA160001,
+                0xC78, 0xE9170001,
+                0xC78, 0xE8180001,
+                0xC78, 0xE7190001,
+                0xC78, 0xC81A0001,
+                0xC78, 0xC71B0001,
+                0xC78, 0xC61C0001,
+                0xC78, 0x071D0001,
+                0xC78, 0x061E0001,
+                0xC78, 0x051F0001,
+                0xC78, 0x04200001,
+                0xC78, 0x03210001,
+                0xC78, 0xAA220001,
+                0xC78, 0xA9230001,
+                0xC78, 0xA8240001,
+                0xC78, 0xA7250001,
+                0xC78, 0xA6260001,
+                0xC78, 0x85270001,
+                0xC78, 0x84280001,
+                0xC78, 0x83290001,
+                0xC78, 0x252A0001,
+                0xC78, 0x242B0001,
+                0xC78, 0x232C0001,
+                0xC78, 0x222D0001,
+                0xC78, 0x672E0001,
+                0xC78, 0x662F0001,
+                0xC78, 0x65300001,
+                0xC78, 0x64310001,
+                0xC78, 0x63320001,
+                0xC78, 0x62330001,
+                0xC78, 0x61340001,
+                0xC78, 0x45350001,
+                0xC78, 0x44360001,
+                0xC78, 0x43370001,
+                0xC78, 0x42380001,
+                0xC78, 0x41390001,
+                0xC78, 0x403A0001,
+                0xC78, 0x403B0001,
+                0xC78, 0x403C0001,
+                0xC78, 0x403D0001,
+                0xC78, 0x403E0001,
+                0xC78, 0x403F0001,
+        0xFF010718, 0xDEAD,
+        0xFF010718, 0xABCD,
+                0xC78, 0xFA400001,
+                0xC78, 0xF9410001,
+                0xC78, 0xF8420001,
+                0xC78, 0xF7430001,
+                0xC78, 0xF6440001,
+                0xC78, 0xF5450001,
+                0xC78, 0xF4460001,
+                0xC78, 0xF3470001,
+                0xC78, 0xF2480001,
+                0xC78, 0xF1490001,
+                0xC78, 0xF04A0001,
+                0xC78, 0xEF4B0001,
+                0xC78, 0xEE4C0001,
+                0xC78, 0xED4D0001,
+                0xC78, 0xEC4E0001,
+                0xC78, 0xEB4F0001,
+                0xC78, 0xEA500001,
+                0xC78, 0xE9510001,
+                0xC78, 0xE8520001,
+                0xC78, 0xE7530001,
+                0xC78, 0xE6540001,
+                0xC78, 0xE5550001,
+                0xC78, 0xE4560001,
+                0xC78, 0xE3570001,
+                0xC78, 0xE2580001,
+                0xC78, 0xE1590001,
+                0xC78, 0x8A5A0001,
+                0xC78, 0x895B0001,
+                0xC78, 0x885C0001,
+                0xC78, 0x875D0001,
+                0xC78, 0x865E0001,
+                0xC78, 0x855F0001,
+                0xC78, 0x84600001,
+                0xC78, 0x83610001,
+                0xC78, 0x82620001,
+                0xC78, 0x6A630001,
+                0xC78, 0x69640001,
+                0xC78, 0x68650001,
+                0xC78, 0x67660001,
+                0xC78, 0x66670001,
+                0xC78, 0x65680001,
+                0xC78, 0x64690001,
+                0xC78, 0x636A0001,
+                0xC78, 0x626B0001,
+                0xC78, 0x616C0001,
+                0xC78, 0x606D0001,
+                0xC78, 0x476E0001,
+                0xC78, 0x466F0001,
+                0xC78, 0x45700001,
+                0xC78, 0x44710001,
+                0xC78, 0x43720001,
+                0xC78, 0x42730001,
+                0xC78, 0x41740001,
+                0xC78, 0x40750001,
+                0xC78, 0x40760001,
+                0xC78, 0x40770001,
+                0xC78, 0x40780001,
+                0xC78, 0x40790001,
+                0xC78, 0x407A0001,
+                0xC78, 0x407B0001,
+                0xC78, 0x407C0001,
+                0xC78, 0x407D0001,
+                0xC78, 0x407E0001,
+                0xC78, 0x407F0001,
+                0xC50, 0x00040222,
+                0xC50, 0x00040220,
+        0xCDCDCDCD, 0xCDCD,
+                0xC78, 0xFB400001,
+                0xC78, 0xFB410001,
+                0xC78, 0xFB420001,
+                0xC78, 0xFB430001,
+                0xC78, 0xFB440001,
+                0xC78, 0xFB450001,
+                0xC78, 0xFA460001,
+                0xC78, 0xF9470001,
+                0xC78, 0xF8480001,
+                0xC78, 0xF7490001,
+                0xC78, 0xF64A0001,
+                0xC78, 0xF54B0001,
+                0xC78, 0xF44C0001,
+                0xC78, 0xF34D0001,
+                0xC78, 0xF24E0001,
+                0xC78, 0xF14F0001,
+                0xC78, 0xF0500001,
+                0xC78, 0xEF510001,
+                0xC78, 0xEE520001,
+                0xC78, 0xED530001,
+                0xC78, 0xEC540001,
+                0xC78, 0xEB550001,
+                0xC78, 0xEA560001,
+                0xC78, 0xE9570001,
+                0xC78, 0xE8580001,
+                0xC78, 0xE7590001,
+                0xC78, 0xE65A0001,
+                0xC78, 0xE55B0001,
+                0xC78, 0xE45C0001,
+                0xC78, 0xE35D0001,
+                0xC78, 0xE25E0001,
+                0xC78, 0xE15F0001,
+                0xC78, 0x8A600001,
+                0xC78, 0x89610001,
+                0xC78, 0x88620001,
+                0xC78, 0x87630001,
+                0xC78, 0x86640001,
+                0xC78, 0x85650001,
+                0xC78, 0x84660001,
+                0xC78, 0x83670001,
+                0xC78, 0x82680001,
+                0xC78, 0x6B690001,
+                0xC78, 0x6A6A0001,
+                0xC78, 0x696B0001,
+                0xC78, 0x686C0001,
+                0xC78, 0x676D0001,
+                0xC78, 0x666E0001,
+                0xC78, 0x656F0001,
+                0xC78, 0x64700001,
+                0xC78, 0x63710001,
+                0xC78, 0x62720001,
+                0xC78, 0x61730001,
+                0xC78, 0x49740001,
+                0xC78, 0x48750001,
+                0xC78, 0x47760001,
+                0xC78, 0x46770001,
+                0xC78, 0x45780001,
+                0xC78, 0x44790001,
+                0xC78, 0x437A0001,
+                0xC78, 0x427B0001,
+                0xC78, 0x417C0001,
+                0xC78, 0x407D0001,
+                0xC78, 0x407E0001,
+                0xC78, 0x407F0001,
+                0xC50, 0x00040022,
+                0xC50, 0x00040020,
+        0xFF010718, 0xDEAD,
+};
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/table.h b/drivers/net/wireless/rtlwifi/rtl8192ee/table.h
new file mode 100644
index 000000000000..bff9df88815d
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/table.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_TABLE__H_
+#define __RTL92E_TABLE__H_
+
+#include <linux/types.h>
+#define RTL8192EE_PHY_REG_ARRAY_LEN     448
+extern u32 RTL8192EE_PHY_REG_ARRAY[];
+#define RTL8192EE_PHY_REG_ARRAY_PG_LEN  168
+extern u32 RTL8192EE_PHY_REG_ARRAY_PG[];
+#define RTL8192EE_RADIOA_ARRAY_LEN      238
+extern u32 RTL8192EE_RADIOA_ARRAY[];
+#define RTL8192EE_RADIOB_ARRAY_LEN      198
+extern u32 RTL8192EE_RADIOB_ARRAY[];
+#define RTL8192EE_MAC_ARRAY_LEN         202
+extern u32 RTL8192EE_MAC_ARRAY[];
+#define RTL8192EE_AGC_TAB_ARRAY_LEN     532
+extern u32 RTL8192EE_AGC_TAB_ARRAY[];
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
new file mode 100644
index 000000000000..2fcbef1d029f
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
@@ -0,0 +1,1293 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../base.h"
+#include "../stats.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "trx.h"
+#include "led.h"
+#include "dm.h"
+#include "fw.h"
+
+static u8 _rtl92ee_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
+{
+        __le16 fc = rtl_get_fc(skb);
+
+        if (unlikely(ieee80211_is_beacon(fc)))
+                return QSLT_BEACON;
+        if (ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))
+                return QSLT_MGNT;
+
+        return skb->priority;
+}
+
+/* mac80211's rate_idx is like this:
+ *
+ * 2.4G band:rx_status->band == IEEE80211_BAND_2GHZ
+ *
+ * B/G rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC92C_RATE1M-->DESC92C_RATE54M ==> idx is 0-->11,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC92C_RATEMCS0-->DESC92C_RATEMCS15 ==> idx is 0-->15
+ *
+ * 5G band:rx_status->band == IEEE80211_BAND_5GHZ
+ * A rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC92C_RATE6M-->DESC92C_RATE54M ==> idx is 0-->7,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC92C_RATEMCS0-->DESC92C_RATEMCS15 ==> idx is 0-->15
+ */
+static int _rtl92ee_rate_mapping(struct ieee80211_hw *hw,
+                                 bool isht, u8 desc_rate)
+{
+        int rate_idx;
+
+        if (!isht) {
+                if (IEEE80211_BAND_2GHZ == hw->conf.chandef.chan->band) {
+                        switch (desc_rate) {
+                        case DESC92C_RATE1M:
+                                rate_idx = 0;
+                                break;
+                        case DESC92C_RATE2M:
+                                rate_idx = 1;
+                                break;
+                        case DESC92C_RATE5_5M:
+                                rate_idx = 2;
+                                break;
+                        case DESC92C_RATE11M:
+                                rate_idx = 3;
+                                break;
+                        case DESC92C_RATE6M:
+                                rate_idx = 4;
+                                break;
+                        case DESC92C_RATE9M:
+                                rate_idx = 5;
+                                break;
+                        case DESC92C_RATE12M:
+                                rate_idx = 6;
+                                break;
+                        case DESC92C_RATE18M:
+                                rate_idx = 7;
+                                break;
+                        case DESC92C_RATE24M:
+                                rate_idx = 8;
+                                break;
+                        case DESC92C_RATE36M:
+                                rate_idx = 9;
+                                break;
+                        case DESC92C_RATE48M:
+                                rate_idx = 10;
+                                break;
+                        case DESC92C_RATE54M:
+                                rate_idx = 11;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                } else {
+                        switch (desc_rate) {
+                        case DESC92C_RATE6M:
+                                rate_idx = 0;
+                                break;
+                        case DESC92C_RATE9M:
+                                rate_idx = 1;
+                                break;
+                        case DESC92C_RATE12M:
+                                rate_idx = 2;
+                                break;
+                        case DESC92C_RATE18M:
+                                rate_idx = 3;
+                                break;
+                        case DESC92C_RATE24M:
+                                rate_idx = 4;
+                                break;
+                        case DESC92C_RATE36M:
+                                rate_idx = 5;
+                                break;
+                        case DESC92C_RATE48M:
+                                rate_idx = 6;
+                                break;
+                        case DESC92C_RATE54M:
+                                rate_idx = 7;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                }
+        } else {
+                switch (desc_rate) {
+                case DESC92C_RATEMCS0:
+                        rate_idx = 0;
+                        break;
+                case DESC92C_RATEMCS1:
+                        rate_idx = 1;
+                        break;
+                case DESC92C_RATEMCS2:
+                        rate_idx = 2;
+                        break;
+                case DESC92C_RATEMCS3:
+                        rate_idx = 3;
+                        break;
+                case DESC92C_RATEMCS4:
+                        rate_idx = 4;
+                        break;
+                case DESC92C_RATEMCS5:
+                        rate_idx = 5;
+                        break;
+                case DESC92C_RATEMCS6:
+                        rate_idx = 6;
+                        break;
+                case DESC92C_RATEMCS7:
+                        rate_idx = 7;
+                        break;
+                case DESC92C_RATEMCS8:
+                        rate_idx = 8;
+                        break;
+                case DESC92C_RATEMCS9:
+                        rate_idx = 9;
+                        break;
+                case DESC92C_RATEMCS10:
+                        rate_idx = 10;
+                        break;
+                case DESC92C_RATEMCS11:
+                        rate_idx = 11;
+                        break;
+                case DESC92C_RATEMCS12:
+                        rate_idx = 12;
+                        break;
+                case DESC92C_RATEMCS13:
+                        rate_idx = 13;
+                        break;
+                case DESC92C_RATEMCS14:
+                        rate_idx = 14;
+                        break;
+                case DESC92C_RATEMCS15:
+                        rate_idx = 15;
+                        break;
+                default:
+                        rate_idx = 0;
+                        break;
+                }
+        }
+        return rate_idx;
+}
+
+static void _rtl92ee_query_rxphystatus(struct ieee80211_hw *hw,
+                                       struct rtl_stats *pstatus, u8 *pdesc,
+                                       struct rx_fwinfo *p_drvinfo,
+                                       bool bpacket_match_bssid,
+                                       bool bpacket_toself,
+                                       bool packet_beacon)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct phy_status_rpt *p_phystrpt = (struct phy_status_rpt *)p_drvinfo;
+        char rx_pwr_all = 0, rx_pwr[4];
+        u8 rf_rx_num = 0, evm, pwdb_all;
+        u8 i, max_spatial_stream;
+        u32 rssi, total_rssi = 0;
+        bool is_cck = pstatus->is_cck;
+        u8 lan_idx, vga_idx;
+
+        /* Record it for next packet processing */
+        pstatus->packet_matchbssid = bpacket_match_bssid;
+        pstatus->packet_toself = bpacket_toself;
+        pstatus->packet_beacon = packet_beacon;
+        pstatus->rx_mimo_signalquality[0] = -1;
+        pstatus->rx_mimo_signalquality[1] = -1;
+
+        if (is_cck) {
+                u8 cck_highpwr;
+                u8 cck_agc_rpt;
+                /* CCK Driver info Structure is not the same as OFDM packet. */
+                cck_agc_rpt = p_phystrpt->cck_agc_rpt_ofdm_cfosho_a;
+
+                /* (1)Hardware does not provide RSSI for CCK
+                 * (2)PWDB, Average PWDB cacluated by
+                 * hardware (for rate adaptive)
+                 */
+                cck_highpwr = (u8)rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2,
+                                                 BIT(9));
+
+                lan_idx = ((cck_agc_rpt & 0xE0) >> 5);
+                vga_idx = (cck_agc_rpt & 0x1f);
+                switch (lan_idx) {
+                case 7: /*VGA_idx = 27~2*/
+                                if (vga_idx <= 27)
+                                        rx_pwr_all = -100 + 2 * (27 - vga_idx);
+                                else
+                                        rx_pwr_all = -100;
+                                break;
+                case 6: /*VGA_idx = 2~0*/
+                                rx_pwr_all = -48 + 2 * (2 - vga_idx);
+                                break;
+                case 5: /*VGA_idx = 7~5*/
+                                rx_pwr_all = -42 + 2 * (7 - vga_idx);
+                                break;
+                case 4: /*VGA_idx = 7~4*/
+                                rx_pwr_all = -36 + 2 * (7 - vga_idx);
+                                break;
+                case 3: /*VGA_idx = 7~0*/
+                                rx_pwr_all = -24 + 2 * (7 - vga_idx);
+                                break;
+                case 2: /*VGA_idx = 5~0*/
+                                if (cck_highpwr)
+                                        rx_pwr_all = -12 + 2 * (5 - vga_idx);
+                                else
+                                        rx_pwr_all = -6 + 2 * (5 - vga_idx);
+                                break;
+                case 1:
+                                rx_pwr_all = 8 - 2 * vga_idx;
+                                break;
+                case 0:
+                                rx_pwr_all = 14 - 2 * vga_idx;
+                                break;
+                default:
+                                break;
+                }
+                rx_pwr_all += 16;
+                pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+
+                if (!cck_highpwr) {
+                        if (pwdb_all >= 80)
+                                pwdb_all = ((pwdb_all - 80) << 1) +
+                                           ((pwdb_all - 80) >> 1) + 80;
+                        else if ((pwdb_all <= 78) && (pwdb_all >= 20))
+                                pwdb_all += 3;
+                        if (pwdb_all > 100)
+                                pwdb_all = 100;
+                }
+
+                pstatus->rx_pwdb_all = pwdb_all;
+                pstatus->bt_rx_rssi_percentage = pwdb_all;
+                pstatus->recvsignalpower = rx_pwr_all;
+
+                /* (3) Get Signal Quality (EVM) */
+                if (bpacket_match_bssid) {
+                        u8 sq, sq_rpt;
+
+                        if (pstatus->rx_pwdb_all > 40) {
+                                sq = 100;
+                        } else {
+                                sq_rpt = p_phystrpt->cck_sig_qual_ofdm_pwdb_all;
+                                if (sq_rpt > 64)
+                                        sq = 0;
+                                else if (sq_rpt < 20)
+                                        sq = 100;
+                                else
+                                        sq = ((64 - sq_rpt) * 100) / 44;
+                        }
+
+                        pstatus->signalquality = sq;
+                        pstatus->rx_mimo_signalquality[0] = sq;
+                        pstatus->rx_mimo_signalquality[1] = -1;
+                }
+        } else {
+                /* (1)Get RSSI for HT rate */
+                for (i = RF90_PATH_A; i < RF6052_MAX_PATH; i++) {
+                        /* we will judge RF RX path now. */
+                        if (rtlpriv->dm.rfpath_rxenable[i])
+                                rf_rx_num++;
+
+                        rx_pwr[i] = ((p_phystrpt->path_agc[i].gain & 0x3f) * 2)
+                                    - 110;
+
+                        pstatus->rx_pwr[i] = rx_pwr[i];
+                        /* Translate DBM to percentage. */
+                        rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
+                        total_rssi += rssi;
+
+                        pstatus->rx_mimo_signalstrength[i] = (u8)rssi;
+                }
+
+                /* (2)PWDB, Average PWDB cacluated by
+                 * hardware (for rate adaptive)
+                 */
+                rx_pwr_all = ((p_phystrpt->cck_sig_qual_ofdm_pwdb_all >> 1)
+                              & 0x7f) - 110;
+
+                pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+                pstatus->rx_pwdb_all = pwdb_all;
+                pstatus->bt_rx_rssi_percentage = pwdb_all;
+                pstatus->rxpower = rx_pwr_all;
+                pstatus->recvsignalpower = rx_pwr_all;
+
+                /* (3)EVM of HT rate */
+                if (pstatus->rate >= DESC92C_RATEMCS8 &&
+                    pstatus->rate <= DESC92C_RATEMCS15)
+                        max_spatial_stream = 2;
+                else
+                        max_spatial_stream = 1;
+
+                for (i = 0; i < max_spatial_stream; i++) {
+                        evm = rtl_evm_db_to_percentage(
+                                                p_phystrpt->stream_rxevm[i]);
+
+                        if (bpacket_match_bssid) {
+                                /* Fill value in RFD, Get the first
+                                 * spatial stream only
+                                 */
+                                if (i == 0)
+                                        pstatus->signalquality = (u8)(evm &
+                                                                       0xff);
+                                pstatus->rx_mimo_signalquality[i] = (u8)(evm &
+                                                                          0xff);
+                        }
+                }
+
+                if (bpacket_match_bssid) {
+                        for (i = RF90_PATH_A; i <= RF90_PATH_B; i++)
+                                rtl_priv(hw)->dm.cfo_tail[i] =
+                                        (int)p_phystrpt->path_cfotail[i];
+
+                        if (rtl_priv(hw)->dm.packet_count == 0xffffffff)
+                                rtl_priv(hw)->dm.packet_count = 0;
+                        else
+                                rtl_priv(hw)->dm.packet_count++;
+                }
+        }
+
+        /* UI BSS List signal strength(in percentage),
+         * make it good looking, from 0~100.
+         */
+        if (is_cck)
+                pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
+                                                                     pwdb_all));
+        else if (rf_rx_num != 0)
+                pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
+                                                      total_rssi /= rf_rx_num));
+}
+
+static void _rtl92ee_translate_rx_signal_stuff(struct ieee80211_hw *hw,
+                                               struct sk_buff *skb,
+                                               struct rtl_stats *pstatus,
+                                               u8 *pdesc,
+                                               struct rx_fwinfo *p_drvinfo)
+{
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct ieee80211_hdr *hdr;
+        u8 *tmp_buf;
+        u8 *praddr;
+        u8 *psaddr;
+        __le16 fc;
+        bool packet_matchbssid, packet_toself, packet_beacon;
+
+        tmp_buf = skb->data + pstatus->rx_drvinfo_size +
+                  pstatus->rx_bufshift + 24;
+
+        hdr = (struct ieee80211_hdr *)tmp_buf;
+        fc = hdr->frame_control;
+        praddr = hdr->addr1;
+        psaddr = ieee80211_get_SA(hdr);
+        ether_addr_copy(pstatus->psaddr, psaddr);
+
+        packet_matchbssid = (!ieee80211_is_ctl(fc) &&
+                               (ether_addr_equal(mac->bssid,
+                                                ieee80211_has_tods(fc) ?
+                                                hdr->addr1 :
+                                                ieee80211_has_fromds(fc) ?
+                                                hdr->addr2 : hdr->addr3)) &&
+                                (!pstatus->hwerror) && (!pstatus->crc) &&
+                                (!pstatus->icv));
+
+        packet_toself = packet_matchbssid &&
+                         (ether_addr_equal(praddr, rtlefuse->dev_addr));
+
+        if (ieee80211_is_beacon(fc))
+                packet_beacon = true;
+        else
+                packet_beacon = false;
+
+        if (packet_beacon && packet_matchbssid)
+                rtl_priv(hw)->dm.dbginfo.num_qry_beacon_pkt++;
+
+        if (packet_matchbssid && ieee80211_is_data_qos(hdr->frame_control) &&
+            !is_multicast_ether_addr(ieee80211_get_DA(hdr))) {
+                struct ieee80211_qos_hdr *hdr_qos =
+                                            (struct ieee80211_qos_hdr *)tmp_buf;
+                u16 tid = le16_to_cpu(hdr_qos->qos_ctrl) & 0xf;
+
+                if (tid != 0 && tid != 3)
+                        rtl_priv(hw)->dm.dbginfo.num_non_be_pkt++;
+        }
+
+        _rtl92ee_query_rxphystatus(hw, pstatus, pdesc, p_drvinfo,
+                                   packet_matchbssid, packet_toself,
+                                   packet_beacon);
+        rtl_process_phyinfo(hw, tmp_buf, pstatus);
+}
+
+static void _rtl92ee_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
+                                      u8 *virtualaddress)
+{
+        u32 dwtmp = 0;
+
+        memset(virtualaddress, 0, 8);
+
+        SET_EARLYMODE_PKTNUM(virtualaddress, ptcb_desc->empkt_num);
+        if (ptcb_desc->empkt_num == 1) {
+                dwtmp = ptcb_desc->empkt_len[0];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[0];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[1];
+        }
+        SET_EARLYMODE_LEN0(virtualaddress, dwtmp);
+
+        if (ptcb_desc->empkt_num <= 3) {
+                dwtmp = ptcb_desc->empkt_len[2];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[2];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[3];
+        }
+        SET_EARLYMODE_LEN1(virtualaddress, dwtmp);
+        if (ptcb_desc->empkt_num <= 5) {
+                dwtmp = ptcb_desc->empkt_len[4];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[4];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[5];
+        }
+        SET_EARLYMODE_LEN2_1(virtualaddress, dwtmp & 0xF);
+        SET_EARLYMODE_LEN2_2(virtualaddress, dwtmp >> 4);
+        if (ptcb_desc->empkt_num <= 7) {
+                dwtmp = ptcb_desc->empkt_len[6];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[6];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[7];
+        }
+        SET_EARLYMODE_LEN3(virtualaddress, dwtmp);
+        if (ptcb_desc->empkt_num <= 9) {
+                dwtmp = ptcb_desc->empkt_len[8];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[8];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
+                dwtmp += ptcb_desc->empkt_len[9];
+        }
+        SET_EARLYMODE_LEN4(virtualaddress, dwtmp);
+}
+
+bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,
+                           struct rtl_stats *status,
+                           struct ieee80211_rx_status *rx_status,
+                           u8 *pdesc, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rx_fwinfo *p_drvinfo;
+        struct ieee80211_hdr *hdr;
+        u32 phystatus = GET_RX_DESC_PHYST(pdesc);
+
+        status->length = (u16)GET_RX_DESC_PKT_LEN(pdesc);
+        status->rx_drvinfo_size = (u8)GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
+                                  RX_DRV_INFO_SIZE_UNIT;
+        status->rx_bufshift = (u8)(GET_RX_DESC_SHIFT(pdesc) & 0x03);
+        status->icv = (u16)GET_RX_DESC_ICV(pdesc);
+        status->crc = (u16)GET_RX_DESC_CRC32(pdesc);
+        status->hwerror = (status->crc | status->icv);
+        status->decrypted = !GET_RX_DESC_SWDEC(pdesc);
+        status->rate = (u8)GET_RX_DESC_RXMCS(pdesc);
+        status->isampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1);
+                status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
+        status->is_cck = RTL92EE_RX_HAL_IS_CCK_RATE(status->rate);
+
+        status->macid = GET_RX_DESC_MACID(pdesc);
+        if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
+                status->wake_match = BIT(2);
+        else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
+                status->wake_match = BIT(1);
+        else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))
+                status->wake_match = BIT(0);
+        else
+                status->wake_match = 0;
+        if (status->wake_match)
+                RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,
+                         "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",
+                         status->wake_match);
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
+
+        hdr = (struct ieee80211_hdr *)(skb->data + status->rx_drvinfo_size +
+                                       status->rx_bufshift + 24);
+
+        if (status->crc)
+                rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
+
+        if (status->rx_is40Mhzpacket)
+                rx_status->flag |= RX_FLAG_40MHZ;
+
+        if (status->is_ht)
+                rx_status->flag |= RX_FLAG_HT;
+
+        rx_status->flag |= RX_FLAG_MACTIME_START;
+
+        /* hw will set status->decrypted true, if it finds the
+         * frame is open data frame or mgmt frame.
+         * So hw will not decryption robust managment frame
+         * for IEEE80211w but still set status->decrypted
+         * true, so here we should set it back to undecrypted
+         * for IEEE80211w frame, and mac80211 sw will help
+         * to decrypt it
+         */
+        if (status->decrypted) {
+                if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
+                    (ieee80211_has_protected(hdr->frame_control)))
+                        rx_status->flag |= RX_FLAG_DECRYPTED;
+                else
+                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
+        }
+
+        /* rate_idx: index of data rate into band's
+         * supported rates or MCS index if HT rates
+         * are use (RX_FLAG_HT)
+         * Notice: this is diff with windows define
+         */
+        rx_status->rate_idx = _rtl92ee_rate_mapping(hw,
+                                                    status->is_ht,
+                                                    status->rate);
+
+        rx_status->mactime = status->timestamp_low;
+        if (phystatus) {
+                p_drvinfo = (struct rx_fwinfo *)(skb->data +
+                                                 status->rx_bufshift + 24);
+
+                _rtl92ee_translate_rx_signal_stuff(hw, skb, status, pdesc,
+                                                   p_drvinfo);
+        }
+        rx_status->signal = status->recvsignalpower + 10;
+        if (status->packet_report_type == TX_REPORT2) {
+                status->macid_valid_entry[0] =
+                        GET_RX_RPT2_DESC_MACID_VALID_1(pdesc);
+                status->macid_valid_entry[1] =
+                        GET_RX_RPT2_DESC_MACID_VALID_2(pdesc);
+        }
+        return true;
+}
+
+/*in Windows, this == Rx_92EE_Interrupt*/
+void rtl92ee_rx_check_dma_ok(struct ieee80211_hw *hw, u8 *header_desc,
+                             u8 queue_index)
+{
+        u8 first_seg = 0;
+        u8 last_seg = 0;
+        u16 total_len = 0;
+        u16 read_cnt = 0;
+
+        if (header_desc == NULL)
+                return;
+
+        total_len = (u16)GET_RX_BUFFER_DESC_TOTAL_LENGTH(header_desc);
+
+        first_seg = (u8)GET_RX_BUFFER_DESC_FS(header_desc);
+
+        last_seg = (u8)GET_RX_BUFFER_DESC_LS(header_desc);
+
+        while (total_len == 0 && first_seg == 0 && last_seg == 0) {
+                read_cnt++;
+                total_len = (u16)GET_RX_BUFFER_DESC_TOTAL_LENGTH(header_desc);
+                first_seg = (u8)GET_RX_BUFFER_DESC_FS(header_desc);
+                last_seg = (u8)GET_RX_BUFFER_DESC_LS(header_desc);
+
+                if (read_cnt > 20)
+                        break;
+        }
+}
+
+u16 rtl92ee_rx_desc_buff_remained_cnt(struct ieee80211_hw *hw, u8 queue_index)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u16 read_point = 0, write_point = 0, remind_cnt = 0;
+        u32 tmp_4byte = 0;
+        static u16 last_read_point;
+        static bool start_rx;
+
+        tmp_4byte = rtl_read_dword(rtlpriv, REG_RXQ_TXBD_IDX);
+        read_point = (u16)((tmp_4byte>>16) & 0x7ff);
+        write_point = (u16)(tmp_4byte & 0x7ff);
+
+        if (write_point != rtlpci->rx_ring[queue_index].next_rx_rp) {
+                RT_TRACE(rtlpriv, COMP_RXDESC, DBG_DMESG,
+                         "!!!write point is 0x%x, reg 0x3B4 value is 0x%x\n",
+                          write_point, tmp_4byte);
+                tmp_4byte = rtl_read_dword(rtlpriv, REG_RXQ_TXBD_IDX);
+                read_point = (u16)((tmp_4byte>>16) & 0x7ff);
+                write_point = (u16)(tmp_4byte & 0x7ff);
+        }
+
+        if (read_point > 0)
+                start_rx = true;
+        if (!start_rx)
+                return 0;
+
+        if ((last_read_point > (RX_DESC_NUM_92E / 2)) &&
+            (read_point <= (RX_DESC_NUM_92E / 2))) {
+                remind_cnt = RX_DESC_NUM_92E - write_point;
+        } else {
+                remind_cnt = (read_point >= write_point) ?
+                             (read_point - write_point) :
+                             (RX_DESC_NUM_92E - write_point + read_point);
+        }
+
+        if (remind_cnt == 0)
+                return 0;
+
+        rtlpci->rx_ring[queue_index].next_rx_rp = write_point;
+
+        last_read_point = read_point;
+        return remind_cnt;
+}
+
+static u16 get_desc_addr_fr_q_idx(u16 queue_index)
+{
+        u16 desc_address = REG_BEQ_TXBD_IDX;
+
+        switch (queue_index) {
+        case BK_QUEUE:
+                desc_address = REG_BKQ_TXBD_IDX;
+                break;
+        case BE_QUEUE:
+                desc_address = REG_BEQ_TXBD_IDX;
+                break;
+        case VI_QUEUE:
+                desc_address = REG_VIQ_TXBD_IDX;
+                break;
+        case VO_QUEUE:
+                desc_address = REG_VOQ_TXBD_IDX;
+                break;
+        case BEACON_QUEUE:
+                desc_address = REG_BEQ_TXBD_IDX;
+                break;
+        case TXCMD_QUEUE:
+                desc_address = REG_BEQ_TXBD_IDX;
+                break;
+        case MGNT_QUEUE:
+                desc_address = REG_MGQ_TXBD_IDX;
+                break;
+        case HIGH_QUEUE:
+                desc_address = REG_HI0Q_TXBD_IDX;
+                break;
+        case HCCA_QUEUE:
+                desc_address = REG_BEQ_TXBD_IDX;
+                break;
+        default:
+                break;
+        }
+        return desc_address;
+}
+
+void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 q_idx)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u16 point_diff = 0;
+        u16 current_tx_read_point = 0, current_tx_write_point = 0;
+        u32 tmp_4byte;
+
+        tmp_4byte = rtl_read_dword(rtlpriv,
+                                   get_desc_addr_fr_q_idx(q_idx));
+        current_tx_read_point = (u16)((tmp_4byte >> 16) & 0x0fff);
+        current_tx_write_point = (u16)((tmp_4byte) & 0x0fff);
+
+        point_diff = ((current_tx_read_point > current_tx_write_point) ?
+                      (current_tx_read_point - current_tx_write_point) :
+                      (TX_DESC_NUM_92E - current_tx_write_point +
+                       current_tx_read_point));
+
+        rtlpci->tx_ring[q_idx].avl_desc = point_diff;
+}
+
+void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
+                                 u8 *tx_bd_desc, u8 *desc, u8 queue_index,
+                                 struct sk_buff *skb, dma_addr_t addr)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 pkt_len = skb->len;
+        u16 desc_size = 40; /*tx desc size*/
+        u32 psblen = 0;
+        u16 tx_page_size = 0;
+        u32 total_packet_size = 0;
+        u16 current_bd_desc;
+        u8 i = 0;
+        u16 real_desc_size = 0x28;
+        u16     append_early_mode_size = 0;
+#if (RTL8192EE_SEG_NUM == 0)
+        u8 segmentnum = 2;
+#elif (RTL8192EE_SEG_NUM == 1)
+        u8 segmentnum = 4;
+#elif (RTL8192EE_SEG_NUM == 2)
+        u8 segmentnum = 8;
+#endif
+
+        tx_page_size = 2;
+        current_bd_desc = rtlpci->tx_ring[queue_index].cur_tx_wp;
+
+        total_packet_size = desc_size+pkt_len;
+
+        if (rtlpriv->rtlhal.earlymode_enable)   {
+                if (queue_index < BEACON_QUEUE) {
+                        append_early_mode_size = 8;
+                        total_packet_size += append_early_mode_size;
+                }
+        }
+
+        if (tx_page_size > 0) {
+                psblen = (pkt_len + real_desc_size + append_early_mode_size) /
+                         (tx_page_size * 128);
+
+                if (psblen * (tx_page_size * 128) < total_packet_size)
+                        psblen += 1;
+        }
+
+        /* Reset */
+        SET_TX_BUFF_DESC_LEN_0(tx_bd_desc, 0);
+        SET_TX_BUFF_DESC_PSB(tx_bd_desc, 0);
+        SET_TX_BUFF_DESC_OWN(tx_bd_desc, 0);
+
+        for (i = 1; i < segmentnum; i++) {
+                SET_TXBUFFER_DESC_LEN_WITH_OFFSET(tx_bd_desc, i, 0);
+                SET_TXBUFFER_DESC_AMSDU_WITH_OFFSET(tx_bd_desc, i, 0);
+                SET_TXBUFFER_DESC_ADD_LOW_WITH_OFFSET(tx_bd_desc, i, 0);
+#if (DMA_IS_64BIT == 1)
+                SET_TXBUFFER_DESC_ADD_HIGT_WITH_OFFSET(tx_bd_desc, i, 0);
+#endif
+        }
+        SET_TX_BUFF_DESC_LEN_1(tx_bd_desc, 0);
+        SET_TX_BUFF_DESC_AMSDU_1(tx_bd_desc, 0);
+
+        SET_TX_BUFF_DESC_LEN_2(tx_bd_desc, 0);
+        SET_TX_BUFF_DESC_AMSDU_2(tx_bd_desc, 0);
+        SET_TX_BUFF_DESC_LEN_3(tx_bd_desc, 0);
+        SET_TX_BUFF_DESC_AMSDU_3(tx_bd_desc, 0);
+        /* Clear all status */
+        CLEAR_PCI_TX_DESC_CONTENT(desc, TX_DESC_SIZE);
+
+        if (rtlpriv->rtlhal.earlymode_enable) {
+                if (queue_index < BEACON_QUEUE) {
+                        /* This if needs braces */
+                        SET_TX_BUFF_DESC_LEN_0(tx_bd_desc, desc_size + 8);
+                } else {
+                        SET_TX_BUFF_DESC_LEN_0(tx_bd_desc, desc_size);
+                }
+        } else {
+                SET_TX_BUFF_DESC_LEN_0(tx_bd_desc, desc_size);
+        }
+        SET_TX_BUFF_DESC_PSB(tx_bd_desc, psblen);
+        SET_TX_BUFF_DESC_ADDR_LOW_0(tx_bd_desc,
+                                    rtlpci->tx_ring[queue_index].dma +
+                                    (current_bd_desc * TX_DESC_SIZE));
+
+        SET_TXBUFFER_DESC_LEN_WITH_OFFSET(tx_bd_desc, 1, pkt_len);
+        /* don't using extendsion mode. */
+        SET_TXBUFFER_DESC_AMSDU_WITH_OFFSET(tx_bd_desc, 1, 0);
+        SET_TXBUFFER_DESC_ADD_LOW_WITH_OFFSET(tx_bd_desc, 1, addr);
+
+        SET_TX_DESC_PKT_SIZE(desc, (u16)(pkt_len));
+        SET_TX_DESC_TX_BUFFER_SIZE(desc, (u16)(pkt_len));
+}
+
+void rtl92ee_tx_fill_desc(struct ieee80211_hw *hw,
+                          struct ieee80211_hdr *hdr, u8 *pdesc_tx,
+                          u8 *pbd_desc_tx,
+                          struct ieee80211_tx_info *info,
+                          struct ieee80211_sta *sta,
+                          struct sk_buff *skb,
+                          u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        u8 *pdesc = (u8 *)pdesc_tx;
+        u16 seq_number;
+        __le16 fc = hdr->frame_control;
+        unsigned int buf_len = 0;
+        u8 fw_qsel = _rtl92ee_map_hwqueue_to_fwqueue(skb, hw_queue);
+        bool firstseg = ((hdr->seq_ctrl &
+                            cpu_to_le16(IEEE80211_SCTL_FRAG)) == 0);
+        bool lastseg = ((hdr->frame_control &
+                           cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
+        dma_addr_t mapping;
+        u8 bw_40 = 0;
+        u8 short_gi = 0;
+
+        if (mac->opmode == NL80211_IFTYPE_STATION) {
+                bw_40 = mac->bw_40;
+        } else if (mac->opmode == NL80211_IFTYPE_AP ||
+                   mac->opmode == NL80211_IFTYPE_ADHOC) {
+                if (sta)
+                        bw_40 = sta->ht_cap.cap &
+                                IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+        }
+        seq_number = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
+        rtl_get_tcb_desc(hw, info, sta, skb, ptcb_desc);
+        /* reserve 8 byte for AMPDU early mode */
+        if (rtlhal->earlymode_enable) {
+                skb_push(skb, EM_HDR_LEN);
+                memset(skb->data, 0, EM_HDR_LEN);
+        }
+        buf_len = skb->len;
+        mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
+                                 PCI_DMA_TODEVICE);
+        if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "DMA mapping error");
+                return;
+        }
+
+        if (pbd_desc_tx != NULL)
+                rtl92ee_pre_fill_tx_bd_desc(hw, pbd_desc_tx, pdesc, hw_queue,
+                                            skb, mapping);
+
+        if (ieee80211_is_nullfunc(fc) || ieee80211_is_ctl(fc)) {
+                firstseg = true;
+                lastseg = true;
+        }
+        if (firstseg) {
+                if (rtlhal->earlymode_enable) {
+                        SET_TX_DESC_PKT_OFFSET(pdesc, 1);
+                        SET_TX_DESC_OFFSET(pdesc,
+                                           USB_HWDESC_HEADER_LEN + EM_HDR_LEN);
+                        if (ptcb_desc->empkt_num) {
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                                         "Insert 8 byte.pTcb->EMPktNum:%d\n",
+                                          ptcb_desc->empkt_num);
+                                _rtl92ee_insert_emcontent(ptcb_desc,
+                                                          (u8 *)(skb->data));
+                        }
+                } else {
+                        SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+                }
+
+                SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
+
+                if (ieee80211_is_mgmt(fc)) {
+                        ptcb_desc->use_driver_rate = true;
+                } else {
+                        if (rtlpriv->ra.is_special_data) {
+                                ptcb_desc->use_driver_rate = true;
+                                SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE11M);
+                        } else {
+                                ptcb_desc->use_driver_rate = false;
+                        }
+                }
+
+                if (ptcb_desc->hw_rate > DESC92C_RATEMCS0)
+                        short_gi = (ptcb_desc->use_shortgi) ? 1 : 0;
+                else
+                        short_gi = (ptcb_desc->use_shortpreamble) ? 1 : 0;
+
+                if (info->flags & IEEE80211_TX_CTL_AMPDU) {
+                        SET_TX_DESC_AGG_ENABLE(pdesc, 1);
+                        SET_TX_DESC_MAX_AGG_NUM(pdesc, 0x14);
+                }
+                SET_TX_DESC_SEQ(pdesc, seq_number);
+                SET_TX_DESC_RTS_ENABLE(pdesc,
+                                       ((ptcb_desc->rts_enable &&
+                                         !ptcb_desc->cts_enable) ? 1 : 0));
+                SET_TX_DESC_HW_RTS_ENABLE(pdesc, 0);
+                SET_TX_DESC_CTS2SELF(pdesc,
+                                     ((ptcb_desc->cts_enable) ? 1 : 0));
+
+                SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
+                SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
+                SET_TX_DESC_RTS_SHORT(pdesc,
+                                ((ptcb_desc->rts_rate <= DESC92C_RATE54M) ?
+                                 (ptcb_desc->rts_use_shortpreamble ? 1 : 0) :
+                                 (ptcb_desc->rts_use_shortgi ? 1 : 0)));
+
+                if (ptcb_desc->tx_enable_sw_calc_duration)
+                        SET_TX_DESC_NAV_USE_HDR(pdesc, 1);
+
+                if (bw_40) {
+                        if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) {
+                                SET_TX_DESC_DATA_BW(pdesc, 1);
+                                SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);
+                        } else {
+                                SET_TX_DESC_DATA_BW(pdesc, 0);
+                                SET_TX_DESC_TX_SUB_CARRIER(pdesc,
+                                                           mac->cur_40_prime_sc);
+                        }
+                } else {
+                        SET_TX_DESC_DATA_BW(pdesc, 0);
+                        SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
+                }
+
+                SET_TX_DESC_LINIP(pdesc, 0);
+                if (sta) {
+                        u8 ampdu_density = sta->ht_cap.ampdu_density;
+
+                        SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);
+                }
+                if (info->control.hw_key) {
+                        struct ieee80211_key_conf *key = info->control.hw_key;
+
+                        switch (key->cipher) {
+                        case WLAN_CIPHER_SUITE_WEP40:
+                        case WLAN_CIPHER_SUITE_WEP104:
+                        case WLAN_CIPHER_SUITE_TKIP:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
+                                break;
+                        case WLAN_CIPHER_SUITE_CCMP:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
+                                break;
+                        default:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
+                                break;
+                        }
+                }
+
+                SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
+                SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
+                SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);
+                SET_TX_DESC_DISABLE_FB(pdesc,
+                                       ptcb_desc->disable_ratefallback ? 1 : 0);
+                SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
+
+                /*SET_TX_DESC_PWR_STATUS(pdesc, pwr_status);*/
+                /* Set TxRate and RTSRate in TxDesc  */
+                /* This prevent Tx initial rate of new-coming packets */
+                /* from being overwritten by retried  packet rate.*/
+                if (!ptcb_desc->use_driver_rate) {
+                        /*SET_TX_DESC_RTS_RATE(pdesc, 0x08); */
+                        /* SET_TX_DESC_TX_RATE(pdesc, 0x0b); */
+                }
+                if (ieee80211_is_data_qos(fc)) {
+                        if (mac->rdg_en) {
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                                         "Enable RDG function.\n");
+                                SET_TX_DESC_RDG_ENABLE(pdesc, 1);
+                                SET_TX_DESC_HTC(pdesc, 1);
+                        }
+                }
+        }
+
+        SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
+        SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
+        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+        if (rtlpriv->dm.useramask) {
+                SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
+        } else {
+                SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->ratr_index);
+        }
+
+        SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
+        if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||
+            is_broadcast_ether_addr(ieee80211_get_DA(hdr))) {
+                SET_TX_DESC_BMC(pdesc, 1);
+        }
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
+}
+
+void rtl92ee_tx_fill_cmddesc(struct ieee80211_hw *hw,
+                             u8 *pdesc, bool firstseg,
+                             bool lastseg, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u8 fw_queue = QSLT_BEACON;
+        dma_addr_t mapping = pci_map_single(rtlpci->pdev,
+                                            skb->data, skb->len,
+                                            PCI_DMA_TODEVICE);
+        u8 txdesc_len = 40;
+
+        if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "DMA mapping error");
+                return;
+        }
+        CLEAR_PCI_TX_DESC_CONTENT(pdesc, txdesc_len);
+
+        if (firstseg)
+                SET_TX_DESC_OFFSET(pdesc, txdesc_len);
+
+        SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
+
+        SET_TX_DESC_SEQ(pdesc, 0);
+
+        SET_TX_DESC_LINIP(pdesc, 0);
+
+        SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
+
+        SET_TX_DESC_FIRST_SEG(pdesc, 1);
+        SET_TX_DESC_LAST_SEG(pdesc, 1);
+
+        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)(skb->len));
+
+        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+
+        SET_TX_DESC_RATE_ID(pdesc, 7);
+        SET_TX_DESC_MACID(pdesc, 0);
+
+        SET_TX_DESC_OWN(pdesc, 1);
+
+        SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
+
+        SET_TX_DESC_FIRST_SEG(pdesc, 1);
+        SET_TX_DESC_LAST_SEG(pdesc, 1);
+
+        SET_TX_DESC_OFFSET(pdesc, 40);
+
+        SET_TX_DESC_USE_RATE(pdesc, 1);
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
+                      "H2C Tx Cmd Content\n", pdesc, txdesc_len);
+}
+
+void rtl92ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
+                      u8 desc_name, u8 *val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u16 cur_tx_rp = 0;
+        u16 cur_tx_wp = 0;
+        static u16 last_txw_point;
+        static bool over_run;
+        u32 tmp = 0;
+        u8 q_idx = *val;
+
+        if (istx) {
+                switch (desc_name) {
+                case HW_DESC_TX_NEXTDESC_ADDR:
+                        SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *)val);
+                        break;
+                case HW_DESC_OWN:{
+                        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+                        struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[q_idx];
+                        u16 max_tx_desc = ring->entries;
+
+                        if (q_idx == BEACON_QUEUE) {
+                                ring->cur_tx_wp = 0;
+                                ring->cur_tx_rp = 0;
+                                SET_TX_BUFF_DESC_OWN(pdesc, 1);
+                                return;
+                        }
+
+                        ring->cur_tx_wp = ((ring->cur_tx_wp + 1) % max_tx_desc);
+
+                        if (over_run) {
+                                ring->cur_tx_wp = 0;
+                                over_run = false;
+                        }
+                        if (ring->avl_desc > 1) {
+                                ring->avl_desc--;
+
+                                rtl_write_word(rtlpriv,
+                                               get_desc_addr_fr_q_idx(q_idx),
+                                               ring->cur_tx_wp);
+
+                                if (q_idx == 1)
+                                        last_txw_point = cur_tx_wp;
+                        }
+
+                        if (ring->avl_desc < (max_tx_desc - 15)) {
+                                u16 point_diff = 0;
+
+                                tmp =
+                                  rtl_read_dword(rtlpriv,
+                                                 get_desc_addr_fr_q_idx(q_idx));
+                                cur_tx_rp = (u16)((tmp >> 16) & 0x0fff);
+                                cur_tx_wp = (u16)(tmp & 0x0fff);
+
+                                ring->cur_tx_wp = cur_tx_wp;
+                                ring->cur_tx_rp = cur_tx_rp;
+                                point_diff = ((cur_tx_rp > cur_tx_wp) ?
+                                              (cur_tx_rp - cur_tx_wp) :
+                                              (TX_DESC_NUM_92E - 1 -
+                                               cur_tx_wp + cur_tx_rp));
+
+                                ring->avl_desc = point_diff;
+                        }
+                }
+                break;
+                }
+        } else {
+                switch (desc_name) {
+                case HW_DESC_RX_PREPARE:
+                        SET_RX_BUFFER_DESC_LS(pdesc, 0);
+                        SET_RX_BUFFER_DESC_FS(pdesc, 0);
+                        SET_RX_BUFFER_DESC_TOTAL_LENGTH(pdesc, 0);
+
+                        SET_RX_BUFFER_DESC_DATA_LENGTH(pdesc,
+                                                       MAX_RECEIVE_BUFFER_SIZE +
+                                                       RX_DESC_SIZE);
+
+                        SET_RX_BUFFER_PHYSICAL_LOW(pdesc, *(u32 *)val);
+                        break;
+                case HW_DESC_RXERO:
+                        SET_RX_DESC_EOR(pdesc, 1);
+                        break;
+                default:
+                        RT_ASSERT(false,
+                                  "ERR rxdesc :%d not process\n", desc_name);
+                        break;
+                }
+        }
+}
+
+u32 rtl92ee_get_desc(u8 *pdesc, bool istx, u8 desc_name)
+{
+        u32 ret = 0;
+
+        if (istx) {
+                switch (desc_name) {
+                case HW_DESC_OWN:
+                        ret = GET_TX_DESC_OWN(pdesc);
+                        break;
+                case HW_DESC_TXBUFF_ADDR:
+                        ret = GET_TXBUFFER_DESC_ADDR_LOW(pdesc, 1);
+                        break;
+                default:
+                        RT_ASSERT(false,
+                                  "ERR txdesc :%d not process\n", desc_name);
+                        break;
+                }
+        } else {
+                switch (desc_name) {
+                case HW_DESC_OWN:
+                        ret = GET_RX_DESC_OWN(pdesc);
+                        break;
+                case HW_DESC_RXPKT_LEN:
+                        ret = GET_RX_DESC_PKT_LEN(pdesc);
+                        break;
+                case HW_DESC_RXBUFF_ADDR:
+                        ret = GET_RX_DESC_BUFF_ADDR(pdesc);
+                        break;
+                default:
+                        RT_ASSERT(false,
+                                  "ERR rxdesc :%d not process\n", desc_name);
+                        break;
+                }
+        }
+        return ret;
+}
+
+bool rtl92ee_is_tx_desc_closed(struct ieee80211_hw *hw, u8 hw_queue, u16 index)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u16 read_point, write_point, available_desc_num;
+        bool ret = false;
+        static u8 stop_report_cnt;
+        struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue];
+
+        /*checking Read/Write Point each interrupt wastes CPU */
+        if (stop_report_cnt > 15 || !rtlpriv->link_info.busytraffic) {
+                u16 point_diff = 0;
+                u16 cur_tx_rp, cur_tx_wp;
+                u32 tmpu32 = 0;
+
+                tmpu32 =
+                  rtl_read_dword(rtlpriv,
+                                 get_desc_addr_fr_q_idx(hw_queue));
+                cur_tx_rp = (u16)((tmpu32 >> 16) & 0x0fff);
+                cur_tx_wp = (u16)(tmpu32 & 0x0fff);
+
+                ring->cur_tx_wp = cur_tx_wp;
+                ring->cur_tx_rp = cur_tx_rp;
+                point_diff = ((cur_tx_rp > cur_tx_wp) ?
+                              (cur_tx_rp - cur_tx_wp) :
+                              (TX_DESC_NUM_92E - cur_tx_wp + cur_tx_rp));
+
+                ring->avl_desc = point_diff;
+        }
+
+        read_point = ring->cur_tx_rp;
+        write_point = ring->cur_tx_wp;
+        available_desc_num = ring->avl_desc;
+
+        if (write_point > read_point) {
+                if (index < write_point && index >= read_point)
+                        ret = false;
+                else
+                        ret = true;
+        } else if (write_point < read_point) {
+                if (index > write_point && index < read_point)
+                        ret = true;
+                else
+                        ret = false;
+        } else {
+                if (index != read_point)
+                        ret = true;
+        }
+
+        if (hw_queue == BEACON_QUEUE)
+                ret = true;
+
+        if (rtlpriv->rtlhal.driver_is_goingto_unload ||
+            rtlpriv->psc.rfoff_reason > RF_CHANGE_BY_PS)
+                ret = true;
+
+        if (hw_queue < BEACON_QUEUE) {
+                if (!ret)
+                        stop_report_cnt++;
+                else
+                        stop_report_cnt = 0;
+        }
+
+        return ret;
+}
+
+void rtl92ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
+{
+}
+
+u32 rtl92ee_rx_command_packet(struct ieee80211_hw *hw,
+                              struct rtl_stats status,
+                              struct sk_buff *skb)
+{
+        u32 result = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        switch (status.packet_report_type) {
+        case NORMAL_RX:
+                result = 0;
+                break;
+        case C2H_PACKET:
+                rtl92ee_c2h_packet_handler(hw, skb->data, (u8)skb->len);
+                result = 1;
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_RECV, DBG_TRACE,
+                         "Unknown packet type %d\n", status.packet_report_type);
+                break;
+        }
+
+        return result;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
new file mode 100644
index 000000000000..6f9be1c7515c
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
@@ -0,0 +1,860 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL92E_TRX_H__
+#define __RTL92E_TRX_H__
+
+#if (DMA_IS_64BIT == 1)
+#if (RTL8192EE_SEG_NUM == 2)
+#define TX_BD_DESC_SIZE                                 128
+#elif (RTL8192EE_SEG_NUM == 1)
+#define TX_BD_DESC_SIZE                                 64
+#elif (RTL8192EE_SEG_NUM == 0)
+#define TX_BD_DESC_SIZE                                 32
+#endif
+#else
+#if (RTL8192EE_SEG_NUM == 2)
+#define TX_BD_DESC_SIZE                                 64
+#elif (RTL8192EE_SEG_NUM == 1)
+#define TX_BD_DESC_SIZE                                 32
+#elif (RTL8192EE_SEG_NUM == 0)
+#define TX_BD_DESC_SIZE                                 16
+#endif
+#endif
+
+#define TX_DESC_SIZE                                    64
+
+#define RX_DRV_INFO_SIZE_UNIT                           8
+
+#define TX_DESC_NEXT_DESC_OFFSET                        40
+#define USB_HWDESC_HEADER_LEN                           40
+
+#define RX_DESC_SIZE                                    24
+#define MAX_RECEIVE_BUFFER_SIZE                         8192
+
+#define SET_TX_DESC_PKT_SIZE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 0, 16, __val)
+#define SET_TX_DESC_OFFSET(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 16, 8, __val)
+#define SET_TX_DESC_BMC(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 24, 1, __val)
+#define SET_TX_DESC_HTC(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 25, 1, __val)
+#define SET_TX_DESC_LAST_SEG(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 26, 1, __val)
+#define SET_TX_DESC_FIRST_SEG(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val)
+#define SET_TX_DESC_LINIP(__pdesc, __val)               \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val)
+#define SET_TX_DESC_NO_ACM(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 29, 1, __val)
+#define SET_TX_DESC_GF(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
+#define SET_TX_DESC_OWN(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
+
+#define GET_TX_DESC_PKT_SIZE(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc, 0, 16)
+#define GET_TX_DESC_OFFSET(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc, 16, 8)
+#define GET_TX_DESC_BMC(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 24, 1)
+#define GET_TX_DESC_HTC(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 25, 1)
+#define GET_TX_DESC_LAST_SEG(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc, 26, 1)
+#define GET_TX_DESC_FIRST_SEG(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc, 27, 1)
+#define GET_TX_DESC_LINIP(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 28, 1)
+#define GET_TX_DESC_NO_ACM(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc, 29, 1)
+#define GET_TX_DESC_GF(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc, 30, 1)
+#define GET_TX_DESC_OWN(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 31, 1)
+
+#define SET_TX_DESC_MACID(__pdesc, __val)               \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 7, __val)
+#define SET_TX_DESC_QUEUE_SEL(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val)
+#define SET_TX_DESC_RDG_NAV_EXT(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 13, 1, __val)
+#define SET_TX_DESC_LSIG_TXOP_EN(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 14, 1, __val)
+#define SET_TX_DESC_PIFS(__pdesc, __val)                \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 15, 1, __val)
+#define SET_TX_DESC_RATE_ID(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 5, __val)
+#define SET_TX_DESC_EN_DESC_ID(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 21, 1, __val)
+#define SET_TX_DESC_SEC_TYPE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 22, 2, __val)
+#define SET_TX_DESC_PKT_OFFSET(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 24, 5, __val)
+#define SET_TX_DESC_MORE_DATA(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 29, 1, __val)
+#define SET_TX_DESC_TXOP_PS_CAP(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 30, 1, __val)
+#define SET_TX_DESC_TXOP_PS_MODE(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 31, 1, __val)
+
+#define GET_TX_DESC_MACID(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+4, 0, 5)
+#define GET_TX_DESC_AGG_ENABLE(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 5, 1)
+#define GET_TX_DESC_AGG_BREAK(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+4, 6, 1)
+#define GET_TX_DESC_RDG_ENABLE(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 7, 1)
+#define GET_TX_DESC_QUEUE_SEL(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+4, 8, 5)
+#define GET_TX_DESC_RDG_NAV_EXT(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+4, 13, 1)
+#define GET_TX_DESC_LSIG_TXOP_EN(__pdesc)               \
+        LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
+#define GET_TX_DESC_PIFS(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+4, 15, 1)
+#define GET_TX_DESC_RATE_ID(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc+4, 16, 4)
+#define GET_TX_DESC_NAV_USE_HDR(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+4, 20, 1)
+#define GET_TX_DESC_EN_DESC_ID(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 21, 1)
+#define GET_TX_DESC_SEC_TYPE(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc+4, 22, 2)
+#define GET_TX_DESC_PKT_OFFSET(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 24, 5)
+
+#define SET_TX_DESC_PAID(__pdesc, __val)                \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 0, 9, __val)
+#define SET_TX_DESC_CCA_RTS(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 10, 2, __val)
+#define SET_TX_DESC_AGG_ENABLE(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 12, 1, __val)
+#define SET_TX_DESC_RDG_ENABLE(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 13, 1, __val)
+#define SET_TX_DESC_NULL_0(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 14, 1, __val)
+#define SET_TX_DESC_NULL_1(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 15, 1, __val)
+#define SET_TX_DESC_BK(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 16, 1, __val)
+#define SET_TX_DESC_MORE_FRAG(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 17, 1, __val)
+#define SET_TX_DESC_RAW(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 18, 1, __val)
+#define SET_TX_DESC_SPE_RPT(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 19, 1, __val)
+#define SET_TX_DESC_AMPDU_DENSITY(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 20, 3, __val)
+#define SET_TX_DESC_BT_NULL(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 23, 1, __val)
+#define SET_TX_DESC_GID(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 24, 6, __val)
+
+#define SET_TX_DESC_WHEADER_LEN(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 0, 4, __val)
+#define SET_TX_DESC_CHK_EN(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 4, 1, __val)
+#define SET_TX_DESC_EARLY_RATE(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 5, 1, __val)
+#define SET_TX_DESC_HWSEQ_SEL(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 6, 2, __val)
+#define SET_TX_DESC_USE_RATE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 8, 1, __val)
+#define SET_TX_DESC_DISABLE_RTS_FB(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 9, 1, __val)
+#define SET_TX_DESC_DISABLE_FB(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 10, 1, __val)
+#define SET_TX_DESC_CTS2SELF(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 11, 1, __val)
+#define SET_TX_DESC_RTS_ENABLE(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 12, 1, __val)
+#define SET_TX_DESC_HW_RTS_ENABLE(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 13, 1, __val)
+#define SET_TX_DESC_HW_PORT_ID(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 14, 1, __val)
+#define SET_TX_DESC_NAV_USE_HDR(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 15, 1, __val)
+#define SET_TX_DESC_USE_MAX_LEN(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 16, 1, __val)
+#define SET_TX_DESC_MAX_AGG_NUM(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 17, 5, __val)
+#define SET_TX_DESC_NDPA(__pdesc, __val)                \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 22, 2, __val)
+#define SET_TX_DESC_AMPDU_MAX_TIME(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 24, 8, __val)
+
+/* Dword 4 */
+#define SET_TX_DESC_TX_RATE(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 7, __val)
+#define SET_TX_DESC_TRY_RATE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 7, 1, __val)
+#define SET_TX_DESC_DATA_RATE_FB_LIMIT(__pdesc, __val)  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 8, 5, __val)
+#define SET_TX_DESC_RTS_RATE_FB_LIMIT(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 13, 4, __val)
+#define SET_TX_DESC_RETRY_LIMIT_ENABLE(__pdesc, __val)  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 17, 1, __val)
+#define SET_TX_DESC_DATA_RETRY_LIMIT(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 18, 6, __val)
+#define SET_TX_DESC_RTS_RATE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 24, 5, __val)
+#define SET_TX_DESC_PCTS_ENABLE(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 29, 1, __val)
+#define SET_TX_DESC_PCTS_MASK_IDX(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 30, 2, __val)
+
+/* Dword 5 */
+#define SET_TX_DESC_TX_SUB_CARRIER(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 4, __val)
+#define SET_TX_DESC_DATA_SHORT(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 4, 1, __val)
+#define SET_TX_DESC_DATA_BW(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 5, 2, __val)
+#define SET_TX_DESC_DATA_LDPC(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 7, 1, __val)
+#define SET_TX_DESC_DATA_STBC(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 8, 2, __val)
+#define SET_TX_DESC_VCS_STBC(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 10, 2, __val)
+#define SET_TX_DESC_RTS_SHORT(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 12, 1, __val)
+#define SET_TX_DESC_RTS_SC(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val)
+#define SET_TX_DESC_TX_ANT(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 24, 4, __val)
+#define SET_TX_DESC_TX_POWER_0_PSET(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 28, 3, __val)
+
+/* Dword 6 */
+#define SET_TX_DESC_SW_DEFINE(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 12, __val)
+#define SET_TX_DESC_ANTSEL_A(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 16, 3, __val)
+#define SET_TX_DESC_ANTSEL_B(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 19, 3, __val)
+#define SET_TX_DESC_ANTSEL_C(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 22, 3, __val)
+#define SET_TX_DESC_ANTSEL_D(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 25, 3, __val)
+
+/* Dword 7 */
+#define SET_TX_DESC_TX_BUFFER_SIZE(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val)
+#define SET_TX_DESC_USB_TXAGG_NUM(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 24, 8, __val)
+
+/* Dword 8 */
+#define SET_TX_DESC_RTS_RC(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 0, 6, __val)
+#define SET_TX_DESC_BAR_RTY_TH(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 6, 2, __val)
+#define SET_TX_DESC_DATA_RC(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 8, 6, __val)
+#define SET_TX_DESC_ENABLE_HW_SELECT(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 15, 1, __val)
+#define SET_TX_DESC_NEXT_HEAD_PAGE(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 16, 8, __val)
+#define SET_TX_DESC_TAIL_PAGE(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 24, 8, __val)
+
+/* Dword 9 */
+#define SET_TX_DESC_PADDING_LENGTH(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+36, 0, 11, __val)
+#define SET_TX_DESC_TXBF_PATH(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+36, 11, 1, __val)
+#define SET_TX_DESC_SEQ(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+36, 12, 12, __val)
+#define SET_TX_DESC_FINAL_DATA_RATE(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+36, 24, 8, __val)
+
+/* Dword 10 */
+#define SET_TX_DESC_TX_BUFFER_ADDRESS(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+40, 0, 32, __val)
+
+/* Dword 11*/
+#define SET_TX_DESC_NEXT_DESC_ADDRESS(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+48, 0, 32, __val)
+
+#define SET_EARLYMODE_PKTNUM(__paddr, __val)            \
+        SET_BITS_TO_LE_4BYTE(__paddr, 0, 4, __val)
+#define SET_EARLYMODE_LEN0(__paddr, __val)              \
+        SET_BITS_TO_LE_4BYTE(__paddr, 4, 15, __val)
+#define SET_EARLYMODE_LEN1(__paddr, __val)              \
+        SET_BITS_TO_LE_4BYTE(__paddr, 16, 2, __val)
+#define SET_EARLYMODE_LEN1_1(__paddr, __val)            \
+        SET_BITS_TO_LE_4BYTE(__paddr, 19, 13, __val)
+#define SET_EARLYMODE_LEN1_2(__paddr, __val)            \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 0, 2, __val)
+#define SET_EARLYMODE_LEN2(__paddr, __val)              \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 2, 15,  __val)
+#define SET_EARLYMODE_LEN2_1(__paddr, __val)            \
+        SET_BITS_TO_LE_4BYTE(__paddr, 2, 4,  __val)
+#define SET_EARLYMODE_LEN2_2(__paddr, __val)            \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 0, 8,  __val)
+#define SET_EARLYMODE_LEN3(__paddr, __val)              \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 17, 15, __val)
+#define SET_EARLYMODE_LEN4(__paddr, __val)              \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 20, 12, __val)
+
+/* TX/RX buffer descriptor */
+
+#define SET_TX_EXTBUFF_DESC_LEN(__pdesc, __val, __set)  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__set*16), 0, 16, __val)
+#define SET_TX_EXTBUFF_DESC_ADDR_LOW(__pdesc, __val, __set)\
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__set*16)+4, 0, 32, __val)
+#define SET_TX_EXTBUFF_DESC_ADDR_HIGH(__pdesc, __val, __set)\
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__set*16)+8, 0, 32, __val)
+
+/* for Txfilldescroptor92ee, fill the desc content. */
+#if (DMA_IS_64BIT == 1)
+#define SET_TXBUFFER_DESC_LEN_WITH_OFFSET(__pdesc, __offset, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__offset*16), 0, 16, __val)
+#define SET_TXBUFFER_DESC_AMSDU_WITH_OFFSET(__pdesc, __offset, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__offset*16), 31, 1, __val)
+#define SET_TXBUFFER_DESC_ADD_LOW_WITH_OFFSET(__pdesc, __offset, __val) \
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__offset*16)+4, 0, 32, __val)
+#define SET_TXBUFFER_DESC_ADD_HIGT_WITH_OFFSET(__pdesc, __offset, __val)\
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__offset*16)+8, 0, 32, __val)
+#define GET_TXBUFFER_DESC_ADDR_LOW(__pdesc, __offset)                   \
+        LE_BITS_TO_4BYTE(__pdesc+(__offset*16)+4, 0, 32)
+#else
+#define SET_TXBUFFER_DESC_LEN_WITH_OFFSET(__pdesc, __offset, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__offset*8), 0, 16, __val)
+#define SET_TXBUFFER_DESC_AMSDU_WITH_OFFSET(__pdesc, __offset, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__offset*8), 31, 1, __val)
+#define SET_TXBUFFER_DESC_ADD_LOW_WITH_OFFSET(__pdesc, __offset, __val) \
+        SET_BITS_TO_LE_4BYTE(__pdesc+(__offset*8)+4, 0, 32, __val)
+#define SET_TXBUFFER_DESC_ADD_HIGT_WITH_OFFSET(__pdesc, __offset, __val)
+#define GET_TXBUFFER_DESC_ADDR_LOW(__pdesc, __offset)                   \
+        LE_BITS_TO_4BYTE(__pdesc+(__offset*8)+4, 0, 32)
+#endif
+
+/* Dword 0 */
+#define SET_TX_BUFF_DESC_LEN_0(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 0, 14, __val)
+#define SET_TX_BUFF_DESC_PSB(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 16, 15, __val)
+#define SET_TX_BUFF_DESC_OWN(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
+
+/* Dword 1 */
+#define SET_TX_BUFF_DESC_ADDR_LOW_0(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 32, __val)
+#if (DMA_IS_64BIT == 1)
+/* Dword 2 */
+#define SET_TX_BUFF_DESC_ADDR_HIGH_0(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 0, 32, __val)
+/* Dword 3 / RESERVED 0 */
+/* Dword 4 */
+#define SET_TX_BUFF_DESC_LEN_1(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 16, __val)
+#define SET_TX_BUFF_DESC_AMSDU_1(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 31, 1, __val)
+/* Dword 5 */
+#define SET_TX_BUFF_DESC_ADDR_LOW_1(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 32, __val)
+/* Dword 6 */
+#define SET_TX_BUFF_DESC_ADDR_HIGH_1(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val)
+/* Dword 7 / RESERVED 0 */
+/* Dword 8 */
+#define SET_TX_BUFF_DESC_LEN_2(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 0, 16, __val)
+#define SET_TX_BUFF_DESC_AMSDU_2(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 31, 1, __val)
+/* Dword 9 */
+#define SET_TX_BUFF_DESC_ADDR_LOW_2(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+36, 0, 32, __val)
+/* Dword 10 */
+#define SET_TX_BUFF_DESC_ADDR_HIGH_2(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+40, 0, 32, __val)
+/* Dword 11 / RESERVED 0 */
+/* Dword 12 */
+#define SET_TX_BUFF_DESC_LEN_3(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+48, 0, 16, __val)
+#define SET_TX_BUFF_DESC_AMSDU_3(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+48, 31, 1, __val)
+/* Dword 13 */
+#define SET_TX_BUFF_DESC_ADDR_LOW_3(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+52, 0, 32, __val)
+/* Dword 14 */
+#define SET_TX_BUFF_DESC_ADDR_HIGH_3(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+56, 0, 32, __val)
+/* Dword 15 / RESERVED 0 */
+#else
+#define SET_TX_BUFF_DESC_ADDR_HIGH_0(__pdesc, __val)
+/* Dword 2 */
+#define SET_TX_BUFF_DESC_LEN_1(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 0, 16, __val)
+#define SET_TX_BUFF_DESC_AMSDU_1(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 31, 1, __val)
+/* Dword 3 */
+#define SET_TX_BUFF_DESC_ADDR_LOW_1(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 0, 32, __val)
+#define SET_TX_BUFF_DESC_ADDR_HIGH_1(__pdesc, __val)
+/* Dword 4 */
+#define SET_TX_BUFF_DESC_LEN_2(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 16, __val)
+#define SET_TX_BUFF_DESC_AMSDU_2(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 31, 1, __val)
+/* Dword 5 */
+#define SET_TX_BUFF_DESC_ADDR_LOW_2(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 32, __val)
+#define SET_TX_BUFF_DESC_ADDR_HIGH_2(__pdesc, __val)
+/* Dword 6 */
+#define SET_TX_BUFF_DESC_LEN_3(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 16, __val)
+#define SET_TX_BUFF_DESC_AMSDU_3(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 31, 1, __val)
+/* Dword 7 */
+#define SET_TX_BUFF_DESC_ADDR_LOW_3(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 32, __val)
+#define SET_TX_BUFF_DESC_ADDR_HIGH_3(__pdesc, __val)
+#endif
+
+/* RX buffer  */
+
+/* DWORD 0 */
+#define SET_RX_BUFFER_DESC_DATA_LENGTH(__status, __val) \
+        SET_BITS_TO_LE_4BYTE(__status, 0, 14, __val)
+#define SET_RX_BUFFER_DESC_LS(__status, __val)          \
+        SET_BITS_TO_LE_4BYTE(__status, 15, 1, __val)
+#define SET_RX_BUFFER_DESC_FS(__status, __val)          \
+        SET_BITS_TO_LE_4BYTE(__status, 16, 1, __val)
+#define SET_RX_BUFFER_DESC_TOTAL_LENGTH(__status, __val)        \
+        SET_BITS_TO_LE_4BYTE(__status, 16, 15, __val)
+
+#define GET_RX_BUFFER_DESC_OWN(__status)                        \
+        LE_BITS_TO_4BYTE(__status, 31, 1)
+#define GET_RX_BUFFER_DESC_LS(__status)                 \
+        LE_BITS_TO_4BYTE(__status, 15, 1)
+#define GET_RX_BUFFER_DESC_FS(__status)                 \
+        LE_BITS_TO_4BYTE(__status, 16, 1)
+#define GET_RX_BUFFER_DESC_TOTAL_LENGTH(__status)       \
+        LE_BITS_TO_4BYTE(__status, 16, 15)
+
+/* DWORD 1 */
+#define SET_RX_BUFFER_PHYSICAL_LOW(__status, __val)     \
+        SET_BITS_TO_LE_4BYTE(__status+4, 0, 32, __val)
+
+/* DWORD 2 */
+#define SET_RX_BUFFER_PHYSICAL_HIGH(__status, __val)    \
+        SET_BITS_TO_LE_4BYTE(__status+8, 0, 32, __val)
+
+#define GET_RX_DESC_PKT_LEN(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc, 0, 14)
+#define GET_RX_DESC_CRC32(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 14, 1)
+#define GET_RX_DESC_ICV(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 15, 1)
+#define GET_RX_DESC_DRV_INFO_SIZE(__pdesc)              \
+        LE_BITS_TO_4BYTE(__pdesc, 16, 4)
+#define GET_RX_DESC_SECURITY(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc, 20, 3)
+#define GET_RX_DESC_QOS(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 23, 1)
+#define GET_RX_DESC_SHIFT(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 24, 2)
+#define GET_RX_DESC_PHYST(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 26, 1)
+#define GET_RX_DESC_SWDEC(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc, 27, 1)
+#define GET_RX_DESC_LS(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc, 28, 1)
+#define GET_RX_DESC_FS(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc, 29, 1)
+#define GET_RX_DESC_EOR(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 30, 1)
+#define GET_RX_DESC_OWN(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc, 31, 1)
+
+#define SET_RX_DESC_PKT_LEN(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 0, 14, __val)
+#define SET_RX_DESC_EOR(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
+#define SET_RX_DESC_OWN(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
+
+#define GET_RX_DESC_MACID(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+4, 0, 7)
+#define GET_RX_DESC_TID(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+4, 8, 4)
+#define GET_RX_DESC_MACID_VLD(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+4, 12, 1)
+#define GET_RX_DESC_AMSDU(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+4, 13, 1)
+#define GET_RX_DESC_RXID_MATCH(__pdesc)                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
+#define GET_RX_DESC_PAGGR(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+4, 15, 1)
+#define GET_RX_DESC_A1_FIT(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+4, 16, 4)
+#define GET_RX_DESC_TCPOFFLOAD_CHKERR(__pdesc)          \
+        LE_BITS_TO_4BYTE(__pdesc+4, 20, 1)
+#define GET_RX_DESC_TCPOFFLOAD_IPVER(__pdesc)           \
+        LE_BITS_TO_4BYTE(__pdesc+4, 21, 1)
+#define GET_RX_DESC_TCPOFFLOAD_IS_TCPUDP(__pdesc)       \
+        LE_BITS_TO_4BYTE(__pdesc+4, 22, 1)
+#define GET_RX_DESC_TCPOFFLOAD_CHK_VLD(__pdesc)         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 23, 1)
+#define GET_RX_DESC_PAM(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+4, 24, 1)
+#define GET_RX_DESC_PWR(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+4, 25, 1)
+#define GET_RX_DESC_MD(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 26, 1)
+#define GET_RX_DESC_MF(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 27, 1)
+#define GET_RX_DESC_TYPE(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+4, 28, 2)
+#define GET_RX_DESC_MC(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 30, 1)
+#define GET_RX_DESC_BC(__pdesc)                         \
+        LE_BITS_TO_4BYTE(__pdesc+4, 31, 1)
+#define GET_RX_DESC_SEQ(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+8, 0, 12)
+#define GET_RX_DESC_FRAG(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+8, 12, 4)
+#define GET_RX_DESC_RX_IS_QOS(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+8, 16, 1)
+
+#define GET_RX_DESC_RXMCS(__pdesc)                      \
+        LE_BITS_TO_4BYTE(__pdesc+12, 0, 7)
+#define GET_RX_DESC_HTC(__pdesc)                        \
+        LE_BITS_TO_4BYTE(__pdesc+12, 10, 1)
+#define GET_RX_STATUS_DESC_EOSP(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+12, 11, 1)
+#define GET_RX_STATUS_DESC_BSSID_FIT(__pdesc)           \
+        LE_BITS_TO_4BYTE(__pdesc+12, 12, 2)
+#define GET_RX_STATUS_DESC_DMA_AGG_NUM(__pdesc)         \
+        LE_BITS_TO_4BYTE(__pdesc+12, 16, 8)
+#define GET_RX_STATUS_DESC_PATTERN_MATCH(__pdesc)       \
+        LE_BITS_TO_4BYTE(__pdesc+12, 29, 1)
+#define GET_RX_STATUS_DESC_UNICAST_MATCH(__pdesc)       \
+        LE_BITS_TO_4BYTE(__pdesc+12, 30, 1)
+#define GET_RX_STATUS_DESC_MAGIC_MATCH(__pdesc)         \
+        LE_BITS_TO_4BYTE(__pdesc+12, 31, 1)
+
+#define GET_RX_DESC_TSFL(__pdesc)                       \
+        LE_BITS_TO_4BYTE(__pdesc+20, 0, 32)
+
+#define GET_RX_DESC_BUFF_ADDR(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+24, 0, 32)
+#define GET_RX_DESC_BUFF_ADDR64(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+28, 0, 32)
+
+#define SET_RX_DESC_BUFF_ADDR(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val)
+#define SET_RX_DESC_BUFF_ADDR64(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 32, __val)
+
+/* TX report 2 format in Rx desc*/
+
+#define GET_RX_RPT2_DESC_PKT_LEN(__status)      \
+        LE_BITS_TO_4BYTE(__status, 0, 9)
+#define GET_RX_RPT2_DESC_MACID_VALID_1(__status)        \
+        LE_BITS_TO_4BYTE(__status+16, 0, 32)
+#define GET_RX_RPT2_DESC_MACID_VALID_2(__status)        \
+        LE_BITS_TO_4BYTE(__status+20, 0, 32)
+
+#define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)               \
+do {                                                            \
+        if (_size > TX_DESC_NEXT_DESC_OFFSET)                   \
+                memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
+        else                                                    \
+                memset(__pdesc, 0, _size);                      \
+} while (0)
+
+#define RTL92EE_RX_HAL_IS_CCK_RATE(rxmcs)\
+        (rxmcs == DESC92C_RATE1M ||\
+         rxmcs == DESC92C_RATE2M ||\
+         rxmcs == DESC92C_RATE5_5M ||\
+         rxmcs == DESC92C_RATE11M)
+
+#define IS_LITTLE_ENDIAN        1
+
+struct phy_rx_agc_info_t {
+        #if IS_LITTLE_ENDIAN
+                u8 gain:7, trsw:1;
+        #else
+                u8 trsw:1, gain:7;
+        #endif
+};
+
+struct phy_status_rpt {
+        struct phy_rx_agc_info_t path_agc[2];
+        u8 ch_corr[2];
+        u8 cck_sig_qual_ofdm_pwdb_all;
+        u8 cck_agc_rpt_ofdm_cfosho_a;
+        u8 cck_rpt_b_ofdm_cfosho_b;
+        u8 rsvd_1;
+        u8 noise_power_db_msb;
+        u8 path_cfotail[2];
+        u8 pcts_mask[2];
+        u8 stream_rxevm[2];
+        u8 path_rxsnr[2];
+        u8 noise_power_db_lsb;
+        u8 rsvd_2[3];
+        u8 stream_csi[2];
+        u8 stream_target_csi[2];
+        u8 sig_evm;
+        u8 rsvd_3;
+#if IS_LITTLE_ENDIAN
+        u8 antsel_rx_keep_2:1;  /*ex_intf_flg:1;*/
+        u8 sgi_en:1;
+        u8 rxsc:2;
+        u8 idle_long:1;
+        u8 r_ant_train_en:1;
+        u8 ant_sel_b:1;
+        u8 ant_sel:1;
+#else   /* _BIG_ENDIAN_ */
+        u8 ant_sel:1;
+        u8 ant_sel_b:1;
+        u8 r_ant_train_en:1;
+        u8 idle_long:1;
+        u8 rxsc:2;
+        u8 sgi_en:1;
+        u8 antsel_rx_keep_2:1;  /*ex_intf_flg:1;*/
+#endif
+} __packed;
+
+struct rx_fwinfo {
+        u8 gain_trsw[4];
+        u8 pwdb_all;
+        u8 cfosho[4];
+        u8 cfotail[4];
+        char rxevm[2];
+        char rxsnr[4];
+        u8 pdsnr[2];
+        u8 csi_current[2];
+        u8 csi_target[2];
+        u8 sigevm;
+        u8 max_ex_pwr;
+        u8 ex_intf_flag:1;
+        u8 sgi_en:1;
+        u8 rxsc:2;
+        u8 reserve:4;
+} __packed;
+
+struct tx_desc {
+        u32 pktsize:16;
+        u32 offset:8;
+        u32 bmc:1;
+        u32 htc:1;
+        u32 lastseg:1;
+        u32 firstseg:1;
+        u32 linip:1;
+        u32 noacm:1;
+        u32 gf:1;
+        u32 own:1;
+
+        u32 macid:6;
+        u32 rsvd0:2;
+        u32 queuesel:5;
+        u32 rd_nav_ext:1;
+        u32 lsig_txop_en:1;
+        u32 pifs:1;
+        u32 rateid:4;
+        u32 nav_usehdr:1;
+        u32 en_descid:1;
+        u32 sectype:2;
+        u32 pktoffset:8;
+
+        u32 rts_rc:6;
+        u32 data_rc:6;
+        u32 agg_en:1;
+        u32 rdg_en:1;
+        u32 bar_retryht:2;
+        u32 agg_break:1;
+        u32 morefrag:1;
+        u32 raw:1;
+        u32 ccx:1;
+        u32 ampdudensity:3;
+        u32 bt_int:1;
+        u32 ant_sela:1;
+        u32 ant_selb:1;
+        u32 txant_cck:2;
+        u32 txant_l:2;
+        u32 txant_ht:2;
+
+        u32 nextheadpage:8;
+        u32 tailpage:8;
+        u32 seq:12;
+        u32 cpu_handle:1;
+        u32 tag1:1;
+        u32 trigger_int:1;
+        u32 hwseq_en:1;
+
+        u32 rtsrate:5;
+        u32 apdcfe:1;
+        u32 qos:1;
+        u32 hwseq_ssn:1;
+        u32 userrate:1;
+        u32 dis_rtsfb:1;
+        u32 dis_datafb:1;
+        u32 cts2self:1;
+        u32 rts_en:1;
+        u32 hwrts_en:1;
+        u32 portid:1;
+        u32 pwr_status:3;
+        u32 waitdcts:1;
+        u32 cts2ap_en:1;
+        u32 txsc:2;
+        u32 stbc:2;
+        u32 txshort:1;
+        u32 txbw:1;
+        u32 rtsshort:1;
+        u32 rtsbw:1;
+        u32 rtssc:2;
+        u32 rtsstbc:2;
+
+        u32 txrate:6;
+        u32 shortgi:1;
+        u32 ccxt:1;
+        u32 txrate_fb_lmt:5;
+        u32 rtsrate_fb_lmt:4;
+        u32 retrylmt_en:1;
+        u32 txretrylmt:6;
+        u32 usb_txaggnum:8;
+
+        u32 txagca:5;
+        u32 txagcb:5;
+        u32 usemaxlen:1;
+        u32 maxaggnum:5;
+        u32 mcsg1maxlen:4;
+        u32 mcsg2maxlen:4;
+        u32 mcsg3maxlen:4;
+        u32 mcs7sgimaxlen:4;
+
+        u32 txbuffersize:16;
+        u32 sw_offset30:8;
+        u32 sw_offset31:4;
+        u32 rsvd1:1;
+        u32 antsel_c:1;
+        u32 null_0:1;
+        u32 null_1:1;
+
+        u32 txbuffaddr;
+        u32 txbufferaddr64;
+        u32 nextdescaddress;
+        u32 nextdescaddress64;
+
+        u32 reserve_pass_pcie_mm_limit[4];
+} __packed;
+
+struct rx_desc {
+        u32 length:14;
+        u32 crc32:1;
+        u32 icverror:1;
+        u32 drv_infosize:4;
+        u32 security:3;
+        u32 qos:1;
+        u32 shift:2;
+        u32 phystatus:1;
+        u32 swdec:1;
+        u32 lastseg:1;
+        u32 firstseg:1;
+        u32 eor:1;
+        u32 own:1;
+
+        u32 macid:6;
+        u32 tid:4;
+        u32 hwrsvd:5;
+        u32 paggr:1;
+        u32 faggr:1;
+        u32 a1_fit:4;
+        u32 a2_fit:4;
+        u32 pam:1;
+        u32 pwr:1;
+        u32 moredata:1;
+        u32 morefrag:1;
+        u32 type:2;
+        u32 mc:1;
+        u32 bc:1;
+
+        u32 seq:12;
+        u32 frag:4;
+        u32 nextpktlen:14;
+        u32 nextind:1;
+        u32 rsvd:1;
+
+        u32 rxmcs:6;
+        u32 rxht:1;
+        u32 amsdu:1;
+        u32 splcp:1;
+        u32 bandwidth:1;
+        u32 htc:1;
+        u32 tcpchk_rpt:1;
+        u32 ipcchk_rpt:1;
+        u32 tcpchk_valid:1;
+        u32 hwpcerr:1;
+        u32 hwpcind:1;
+        u32 iv0:16;
+
+        u32 iv1;
+
+        u32 tsfl;
+
+        u32 bufferaddress;
+        u32 bufferaddress64;
+
+} __packed;
+
+void rtl92ee_rx_check_dma_ok(struct ieee80211_hw *hw, u8 *header_desc,
+                             u8 queue_index);
+u16     rtl92ee_rx_desc_buff_remained_cnt(struct ieee80211_hw *hw,
+                                          u8 queue_index);
+void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 queue_index);
+void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
+                                 u8 *tx_bd_desc, u8 *desc, u8 queue_index,
+                                 struct sk_buff *skb, dma_addr_t addr);
+
+void rtl92ee_tx_fill_desc(struct ieee80211_hw *hw,
+                          struct ieee80211_hdr *hdr, u8 *pdesc_tx,
+                          u8 *pbd_desc_tx,
+                          struct ieee80211_tx_info *info,
+                          struct ieee80211_sta *sta,
+                          struct sk_buff *skb,
+                          u8 hw_queue, struct rtl_tcb_desc *ptcb_desc);
+bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,
+                           struct rtl_stats *status,
+                           struct ieee80211_rx_status *rx_status,
+                           u8 *pdesc, struct sk_buff *skb);
+void rtl92ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
+                      u8 desc_name, u8 *val);
+
+u32 rtl92ee_get_desc(u8 *pdesc, bool istx, u8 desc_name);
+bool rtl92ee_is_tx_desc_closed(struct ieee80211_hw *hw, u8 hw_queue, u16 index);
+void rtl92ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
+void rtl92ee_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
+                             bool firstseg, bool lastseg,
+                             struct sk_buff *skb);
+u32 rtl92ee_rx_command_packet(struct ieee80211_hw *hw,
+                              struct rtl_stats status,
+                              struct sk_buff *skb);
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
index d53f4332464d..b1e44b86e8ed 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
@@ -336,7 +336,6 @@ enum fw_h2c_cmd {
         H2C_TMP3,
         H2C_WOWLAN_UPDATE_IV_CMD,                       /*50*/
         H2C_TMP4,
-        MAX_H2CCMD                                      /*52*/
 };
 
 /* The following macros are used for FW
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 2b3c78baa9f8..b358ebce8942 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -312,10 +312,6 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
                 hdr = (struct ieee80211_hdr *)(skb->data +
                        stats->rx_drvinfo_size + stats->rx_bufshift);
 
-                if (!hdr) {
-                        /* during testing, hdr was NULL here */
-                        return false;
-                }
                 if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
                         (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/btc.h b/drivers/net/wireless/rtlwifi/rtl8723ae/btc.h
index 417afeed36af..06c448c010fd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/btc.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/btc.h
@@ -11,10 +11,6 @@
  ** FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  ** more details.
  **
- ** You should have received a copy of the GNU General Public License along with
- ** this program; if not, write to the Free Software Foundation, Inc.,
- ** 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- **
  ** The full GNU General Public License is included in this distribution in the
  ** file called LICENSE.
  **
@@ -24,8 +20,7 @@
  ** Hsinchu 300, Taiwan.
  ** Larry Finger <Larry.Finger@lwfinger.net>
  **
- *****************************************************************************
- */
+ ******************************************************************************/
 
 #ifndef __RTL8723E_BTC_H__
 #define __RTL8723E_BTC_H__
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/def.h b/drivers/net/wireless/rtlwifi/rtl8723ae/def.h
index debe261a7eeb..94bdd4bbca5d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/def.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -25,55 +21,145 @@
  *
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
- ****************************************************************************
- */
+ *****************************************************************************/
 
 #ifndef __RTL8723E_DEF_H__
 #define __RTL8723E_DEF_H__
 
+#define HAL_RETRY_LIMIT_INFRA                           48
+#define HAL_RETRY_LIMIT_AP_ADHOC                        7
+
+#define RESET_DELAY_8185                                        20
+
+#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
+#define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
+
+#define NUM_OF_FIRMWARE_QUEUE                           10
+#define NUM_OF_PAGES_IN_FW                                      0x100
+#define NUM_OF_PAGE_IN_FW_QUEUE_BK                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_BE                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_VI                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_VO                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA            0x0
+#define NUM_OF_PAGE_IN_FW_QUEUE_CMD                     0x0
+#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT            0x02
+#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH            0x02
+#define NUM_OF_PAGE_IN_FW_QUEUE_BCN                     0x2
+#define NUM_OF_PAGE_IN_FW_QUEUE_PUB                     0xA1
+
+#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM          0x026
+#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM          0x048
+#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM          0x048
+#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM          0x026
+#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM         0x00
+
+#define MAX_LINES_HWCONFIG_TXT                          1000
+#define MAX_BYTES_LINE_HWCONFIG_TXT                     256
+
+#define SW_THREE_WIRE                                           0
+#define HW_THREE_WIRE                                           2
+
+#define BT_DEMO_BOARD                                           0
+#define BT_QA_BOARD                                                     1
+#define BT_FPGA                                                         2
+
+#define HAL_PRIME_CHNL_OFFSET_DONT_CARE         0
 #define HAL_PRIME_CHNL_OFFSET_LOWER                     1
+#define HAL_PRIME_CHNL_OFFSET_UPPER                     2
 
-#define RX_MPDU_QUEUE                                   0
+#define MAX_H2C_QUEUE_NUM                                       10
 
-#define CHIP_8723                       BIT(0)
-#define NORMAL_CHIP                     BIT(3)
-#define RF_TYPE_1T2R                    BIT(4)
-#define RF_TYPE_2T2R                    BIT(5)
-#define CHIP_VENDOR_UMC                 BIT(7)
-#define B_CUT_VERSION                   BIT(12)
-#define C_CUT_VERSION                   BIT(13)
-#define D_CUT_VERSION                   ((BIT(12)|BIT(13)))
-#define E_CUT_VERSION                   BIT(14)
-#define RF_RL_ID                        (BIT(31)|BIT(30)|BIT(29)|BIT(28))
+#define RX_MPDU_QUEUE                                           0
+#define RX_CMD_QUEUE                                            1
+#define RX_MAX_QUEUE                                            2
+#define AC2QUEUEID(_AC)                                         (_AC)
 
+#define C2H_RX_CMD_HDR_LEN                                      8
+#define GET_C2H_CMD_CMD_LEN(__prxhdr)           \
+        LE_BITS_TO_4BYTE((__prxhdr), 0, 16)
+#define GET_C2H_CMD_ELEMENT_ID(__prxhdr)        \
+        LE_BITS_TO_4BYTE((__prxhdr), 16, 8)
+#define GET_C2H_CMD_CMD_SEQ(__prxhdr)           \
+        LE_BITS_TO_4BYTE((__prxhdr), 24, 7)
+#define GET_C2H_CMD_CONTINUE(__prxhdr)          \
+        LE_BITS_TO_4BYTE((__prxhdr), 31, 1)
+#define GET_C2H_CMD_CONTENT(__prxhdr)           \
+        ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN)
+
+#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID(__pcmdfbhdr)    \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8)
+#define GET_C2H_CMD_FEEDBACK_CCX_LEN(__pcmdfbhdr)               \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8)
+#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT(__pcmdfbhdr)   \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16)
+#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID(__pcmdfbhdr)    \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5)
+#define GET_C2H_CMD_FEEDBACK_CCX_VALID(__pcmdfbhdr)             \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1)
+#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT(__pcmdfbhdr) \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5)
+#define GET_C2H_CMD_FEEDBACK_CCX_TOK(__pcmdfbhdr)               \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1)
+#define GET_C2H_CMD_FEEDBACK_CCX_QSEL(__pcmdfbhdr)              \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)
+#define GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)               \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)
+
+#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
+#define CHIP_BONDING_92C_1T2R           0x1
+
+#define CHIP_8723               BIT(0)
+#define NORMAL_CHIP             BIT(3)
+#define RF_TYPE_1T1R            (~(BIT(4)|BIT(5)|BIT(6)))
+#define RF_TYPE_1T2R            BIT(4)
+#define RF_TYPE_2T2R            BIT(5)
+#define CHIP_VENDOR_UMC         BIT(7)
+#define B_CUT_VERSION           BIT(12)
+#define C_CUT_VERSION           BIT(13)
+#define D_CUT_VERSION           ((BIT(12)|BIT(13)))
+#define E_CUT_VERSION           BIT(14)
+#define RF_RL_ID                (BIT(31)|BIT(30)|BIT(29)|BIT(28))
 
 /* MASK */
-#define IC_TYPE_MASK                    (BIT(0)|BIT(1)|BIT(2))
-#define CHIP_TYPE_MASK                  BIT(3)
-#define RF_TYPE_MASK                    (BIT(4)|BIT(5)|BIT(6))
-#define MANUFACTUER_MASK                BIT(7)
-#define ROM_VERSION_MASK                (BIT(11)|BIT(10)|BIT(9)|BIT(8))
-#define CUT_VERSION_MASK                (BIT(15)|BIT(14)|BIT(13)|BIT(12))
+#define IC_TYPE_MASK            (BIT(0)|BIT(1)|BIT(2))
+#define CHIP_TYPE_MASK          BIT(3)
+#define RF_TYPE_MASK            (BIT(4)|BIT(5)|BIT(6))
+#define MANUFACTUER_MASK        BIT(7)
+#define ROM_VERSION_MASK        (BIT(11)|BIT(10)|BIT(9)|BIT(8))
+#define CUT_VERSION_MASK        (BIT(15)|BIT(14)|BIT(13)|BIT(12))
 
 /* Get element */
 #define GET_CVID_IC_TYPE(version)       ((version) & IC_TYPE_MASK)
+#define GET_CVID_CHIP_TYPE(version)     ((version) & CHIP_TYPE_MASK)
+#define GET_CVID_RF_TYPE(version)       ((version) & RF_TYPE_MASK)
 #define GET_CVID_MANUFACTUER(version)   ((version) & MANUFACTUER_MASK)
+#define GET_CVID_ROM_VERSION(version)   ((version) & ROM_VERSION_MASK)
 #define GET_CVID_CUT_VERSION(version)   ((version) & CUT_VERSION_MASK)
 
-#define IS_81XXC(version)               ((GET_CVID_IC_TYPE(version) == 0) ?\
-                                        true : false)
-#define IS_8723_SERIES(version)                                         \
-                ((GET_CVID_IC_TYPE(version) == CHIP_8723) ? true : false)
-#define IS_CHIP_VENDOR_UMC(version)                                     \
-                ((GET_CVID_MANUFACTUER(version)) ? true : false)
-
-#define IS_VENDOR_UMC_A_CUT(version)    ((IS_CHIP_VENDOR_UMC(version)) ? \
-                ((GET_CVID_CUT_VERSION(version)) ? false : true) : false)
-#define IS_VENDOR_8723_A_CUT(version)   ((IS_8723_SERIES(version)) ?    \
-                ((GET_CVID_CUT_VERSION(version)) ? false : true) : false)
-#define IS_81xxC_VENDOR_UMC_B_CUT(version)      ((IS_CHIP_VENDOR_UMC(version)) \
-                ? ((GET_CVID_CUT_VERSION(version) == B_CUT_VERSION) ? \
-                true : false) : false)
+#define IS_81XXC(version)       ((GET_CVID_IC_TYPE(version) == 0) ?\
+                                                true : false)
+#define IS_8723_SERIES(version) ((GET_CVID_IC_TYPE(version) == CHIP_8723) ? \
+                                                true : false)
+#define IS_1T1R(version)        ((GET_CVID_RF_TYPE(version)) ? false : true)
+#define IS_1T2R(version)        ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R)\
+                                                ? true : false)
+#define IS_2T2R(version)        ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R)\
+                                                ? true : false)
+#define IS_CHIP_VENDOR_UMC(version)     ((GET_CVID_MANUFACTUER(version)) ? \
+                                                true : false)
+
+#define IS_VENDOR_UMC_A_CUT(version)    ((IS_CHIP_VENDOR_UMC(version))\
+                                        ? ((GET_CVID_CUT_VERSION(version)) ? \
+                                        false : true) : false)
+#define IS_VENDOR_8723_A_CUT(version)   ((IS_8723_SERIES(version))\
+                                        ? ((GET_CVID_CUT_VERSION(version)) ? \
+                                        false : true) : false)
+#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))\
+                ? ((GET_CVID_CUT_VERSION(version) == \
+                B_CUT_VERSION) ? true : false) : false)
 
 enum rf_optype {
         RF_OP_BY_SW_3WIRE = 0,
@@ -93,7 +179,7 @@ enum power_save_mode {
         POWER_SAVE_MODE_SAVE,
 };
 
-enum power_polocy_config {
+enum power_policy_config {
         POWERCFG_MAX_POWER_SAVINGS,
         POWERCFG_GLOBAL_POWER_SAVINGS,
         POWERCFG_LOCAL_POWER_SAVINGS,
@@ -143,6 +229,41 @@ enum rtl_desc_qsel {
         QSLT_CMD = 0x13,
 };
 
+enum rtl_desc8723e_rate {
+        DESC92C_RATE1M = 0x00,
+        DESC92C_RATE2M = 0x01,
+        DESC92C_RATE5_5M = 0x02,
+        DESC92C_RATE11M = 0x03,
+
+        DESC92C_RATE6M = 0x04,
+        DESC92C_RATE9M = 0x05,
+        DESC92C_RATE12M = 0x06,
+        DESC92C_RATE18M = 0x07,
+        DESC92C_RATE24M = 0x08,
+        DESC92C_RATE36M = 0x09,
+        DESC92C_RATE48M = 0x0a,
+        DESC92C_RATE54M = 0x0b,
+
+        DESC92C_RATEMCS0 = 0x0c,
+        DESC92C_RATEMCS1 = 0x0d,
+        DESC92C_RATEMCS2 = 0x0e,
+        DESC92C_RATEMCS3 = 0x0f,
+        DESC92C_RATEMCS4 = 0x10,
+        DESC92C_RATEMCS5 = 0x11,
+        DESC92C_RATEMCS6 = 0x12,
+        DESC92C_RATEMCS7 = 0x13,
+        DESC92C_RATEMCS8 = 0x14,
+        DESC92C_RATEMCS9 = 0x15,
+        DESC92C_RATEMCS10 = 0x16,
+        DESC92C_RATEMCS11 = 0x17,
+        DESC92C_RATEMCS12 = 0x18,
+        DESC92C_RATEMCS13 = 0x19,
+        DESC92C_RATEMCS14 = 0x1a,
+        DESC92C_RATEMCS15 = 0x1b,
+        DESC92C_RATEMCS15_SG = 0x1c,
+        DESC92C_RATEMCS32 = 0x20,
+};
+
 struct phy_sts_cck_8723e_t {
         u8 adc_pwdb_X[4];
         u8 sq_rpt;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
index 25cc83058b01..a0e86922780a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -25,8 +21,7 @@
  *
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
- ****************************************************************************
- */
+ *****************************************************************************/
 
 #include "../wifi.h"
 #include "../base.h"
@@ -151,7 +146,7 @@ static const u8 cckswing_table_ch14[CCK_TABLE_SIZE][8] = {
         {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00}
 };
 
-static void rtl8723ae_dm_diginit(struct ieee80211_hw *hw)
+static void rtl8723e_dm_diginit(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
@@ -176,7 +171,7 @@ static void rtl8723ae_dm_diginit(struct ieee80211_hw *hw)
         dm_digtable->cur_cck_pd_state = CCK_PD_STAGE_MAX;
 }
 
-static u8 rtl_init_gain_min_pwdb(struct ieee80211_hw *hw)
+static u8 rtl8723e_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
@@ -195,14 +190,15 @@ static u8 rtl_init_gain_min_pwdb(struct ieee80211_hw *hw)
         } else if (dm_digtable->cursta_cstate == DIG_STA_CONNECT ||
                    dm_digtable->cursta_cstate == DIG_STA_BEFORE_CONNECT) {
                 rssi_val_min = rtlpriv->dm.undec_sm_pwdb;
-        } else if (dm_digtable->curmultista_cstate == DIG_MULTISTA_CONNECT) {
+        } else if (dm_digtable->curmultista_cstate ==
+                DIG_MULTISTA_CONNECT) {
                 rssi_val_min = rtlpriv->dm.entry_min_undec_sm_pwdb;
         }
 
         return (u8) rssi_val_min;
 }
 
-static void rtl8723ae_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
+static void rtl8723e_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
 {
         u32 ret_value;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -239,8 +235,7 @@ static void rtl8723ae_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, 0x0000c000, 2);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, "
-                 "cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
+                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
                  falsealm_cnt->cnt_parity_fail,
                  falsealm_cnt->cnt_rate_illegal,
                  falsealm_cnt->cnt_crc8_fail, falsealm_cnt->cnt_mcs_fail);
@@ -263,52 +258,60 @@ static void rtl92c_dm_ctrl_initgain_by_fa(struct ieee80211_hw *hw)
                 value_igi += 0;
         else if (rtlpriv->falsealm_cnt.cnt_all < DM_DIG_FA_TH2)
                 value_igi++;
-        else
+        else if (rtlpriv->falsealm_cnt.cnt_all >= DM_DIG_FA_TH2)
                 value_igi += 2;
-
-        value_igi = clamp(value_igi, (u8)DM_DIG_FA_LOWER, (u8)DM_DIG_FA_UPPER);
+        if (value_igi > DM_DIG_FA_UPPER)
+                value_igi = DM_DIG_FA_UPPER;
+        else if (value_igi < DM_DIG_FA_LOWER)
+                value_igi = DM_DIG_FA_LOWER;
         if (rtlpriv->falsealm_cnt.cnt_all > 10000)
                 value_igi = 0x32;
 
         dm_digtable->cur_igvalue = value_igi;
-        rtl8723ae_dm_write_dig(hw);
+        rtl8723e_dm_write_dig(hw);
 }
 
 static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct dig_t *dgtbl = &rtlpriv->dm_digtable;
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
-        if (rtlpriv->falsealm_cnt.cnt_all > dgtbl->fa_highthresh) {
-                if ((dgtbl->back_val - 2) < dgtbl->back_range_min)
-                        dgtbl->back_val = dgtbl->back_range_min;
+        if (rtlpriv->falsealm_cnt.cnt_all > dm_digtable->fa_highthresh) {
+                if ((dm_digtable->back_val - 2) <
+                    dm_digtable->back_range_min)
+                        dm_digtable->back_val =
+                            dm_digtable->back_range_min;
                 else
-                        dgtbl->back_val -= 2;
-        } else if (rtlpriv->falsealm_cnt.cnt_all < dgtbl->fa_lowthresh) {
-                if ((dgtbl->back_val + 2) > dgtbl->back_range_max)
-                        dgtbl->back_val = dgtbl->back_range_max;
+                        dm_digtable->back_val -= 2;
+        } else if (rtlpriv->falsealm_cnt.cnt_all < dm_digtable->fa_lowthresh) {
+                if ((dm_digtable->back_val + 2) >
+                    dm_digtable->back_range_max)
+                        dm_digtable->back_val =
+                            dm_digtable->back_range_max;
                 else
-                        dgtbl->back_val += 2;
+                        dm_digtable->back_val += 2;
         }
 
-        if ((dgtbl->rssi_val_min + 10 - dgtbl->back_val) >
-            dgtbl->rx_gain_max)
-                dgtbl->cur_igvalue = dgtbl->rx_gain_max;
-        else if ((dgtbl->rssi_val_min + 10 -
-                  dgtbl->back_val) < dgtbl->rx_gain_min)
-                dgtbl->cur_igvalue = dgtbl->rx_gain_min;
+        if ((dm_digtable->rssi_val_min + 10 - dm_digtable->back_val) >
+            dm_digtable->rx_gain_max)
+                dm_digtable->cur_igvalue = dm_digtable->rx_gain_max;
+        else if ((dm_digtable->rssi_val_min + 10 -
+                  dm_digtable->back_val) < dm_digtable->rx_gain_min)
+                dm_digtable->cur_igvalue = dm_digtable->rx_gain_min;
         else
-                dgtbl->cur_igvalue = dgtbl->rssi_val_min + 10 - dgtbl->back_val;
+                dm_digtable->cur_igvalue = dm_digtable->rssi_val_min + 10 -
+                    dm_digtable->back_val;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
                  "rssi_val_min = %x back_val %x\n",
-                 dgtbl->rssi_val_min, dgtbl->back_val);
+                  dm_digtable->rssi_val_min, dm_digtable->back_val);
 
-        rtl8723ae_dm_write_dig(hw);
+        rtl8723e_dm_write_dig(hw);
 }
 
-static void rtl8723ae_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
+static void rtl8723e_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
 {
+        static u8 binitialized;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
@@ -318,16 +321,15 @@ static void rtl8723ae_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
         if (mac->opmode == NL80211_IFTYPE_ADHOC)
                 multi_sta = true;
 
-        if ((!multi_sta) ||
-            (dm_digtable->cursta_cstate != DIG_STA_DISCONNECT)) {
-                rtlpriv->initialized = false;
+        if (!multi_sta || (dm_digtable->cursta_cstate != DIG_STA_DISCONNECT)) {
+                binitialized = false;
                 dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
                 return;
-        } else if (!rtlpriv->initialized) {
-                rtlpriv->initialized = true;
+        } else if (!binitialized) {
+                binitialized = true;
                 dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_0;
                 dm_digtable->cur_igvalue = 0x20;
-                rtl8723ae_dm_write_dig(hw);
+                rtl8723e_dm_write_dig(hw);
         }
 
         if (dm_digtable->curmultista_cstate == DIG_MULTISTA_CONNECT) {
@@ -337,7 +339,7 @@ static void rtl8723ae_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
                         if (dm_digtable->dig_ext_port_stage ==
                             DIG_EXT_PORT_STAGE_2) {
                                 dm_digtable->cur_igvalue = 0x20;
-                                rtl8723ae_dm_write_dig(hw);
+                                rtl8723e_dm_write_dig(hw);
                         }
 
                         dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_1;
@@ -348,7 +350,7 @@ static void rtl8723ae_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
         } else if (dm_digtable->dig_ext_port_stage != DIG_EXT_PORT_STAGE_0) {
                 dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_0;
                 dm_digtable->cur_igvalue = 0x20;
-                rtl8723ae_dm_write_dig(hw);
+                rtl8723e_dm_write_dig(hw);
         }
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
@@ -357,22 +359,22 @@ static void rtl8723ae_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
                  dm_digtable->dig_ext_port_stage);
 }
 
-static void rtl8723ae_dm_initial_gain_sta(struct ieee80211_hw *hw)
+static void rtl8723e_dm_initial_gain_sta(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
                  "presta_cstate = %x, cursta_cstate = %x\n",
-                 dm_digtable->presta_cstate,
-                 dm_digtable->cursta_cstate);
+                  dm_digtable->presta_cstate,
+                  dm_digtable->cursta_cstate);
 
         if (dm_digtable->presta_cstate == dm_digtable->cursta_cstate ||
             dm_digtable->cursta_cstate == DIG_STA_BEFORE_CONNECT ||
             dm_digtable->cursta_cstate == DIG_STA_CONNECT) {
-
                 if (dm_digtable->cursta_cstate != DIG_STA_DISCONNECT) {
-                        dm_digtable->rssi_val_min = rtl_init_gain_min_pwdb(hw);
+                        dm_digtable->rssi_val_min =
+                            rtl8723e_dm_initial_gain_min_pwdb(hw);
                         rtl92c_dm_ctrl_initgain_by_rssi(hw);
                 }
         } else {
@@ -381,16 +383,17 @@ static void rtl8723ae_dm_initial_gain_sta(struct ieee80211_hw *hw)
                 dm_digtable->back_val = DM_DIG_BACKOFF_DEFAULT;
                 dm_digtable->cur_igvalue = 0x20;
                 dm_digtable->pre_igvalue = 0;
-                rtl8723ae_dm_write_dig(hw);
+                rtl8723e_dm_write_dig(hw);
         }
 }
-static void rtl8723ae_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
+
+static void rtl8723e_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         if (dm_digtable->cursta_cstate == DIG_STA_CONNECT) {
-                dm_digtable->rssi_val_min = rtl_init_gain_min_pwdb(hw);
+                dm_digtable->rssi_val_min = rtl8723e_dm_initial_gain_min_pwdb(hw);
 
                 if (dm_digtable->pre_cck_pd_state == CCK_PD_STAGE_LowRssi) {
                         if (dm_digtable->rssi_val_min <= 25)
@@ -418,12 +421,11 @@ static void rtl8723ae_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                                     CCK_FA_STAGE_High;
                         else
                                 dm_digtable->cur_cck_fa_state =
-                                                         CCK_FA_STAGE_Low;
-
+                                    CCK_FA_STAGE_LOW;
                         if (dm_digtable->pre_cck_fa_state !=
                             dm_digtable->cur_cck_fa_state) {
                                 if (dm_digtable->cur_cck_fa_state ==
-                                    CCK_FA_STAGE_Low)
+                                    CCK_FA_STAGE_LOW)
                                         rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2,
                                                       0x83);
                                 else
@@ -449,13 +451,13 @@ static void rtl8723ae_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
 
 }
 
-static void rtl8723ae_dm_ctrl_initgain_by_twoport(struct ieee80211_hw *hw)
+static void rtl8723e_dm_ctrl_initgain_by_twoport(struct ieee80211_hw *hw)
 {
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
-        if (mac->act_scanning == true)
+        if (mac->act_scanning)
                 return;
 
         if (mac->link_state >= MAC80211_LINKED)
@@ -463,28 +465,29 @@ static void rtl8723ae_dm_ctrl_initgain_by_twoport(struct ieee80211_hw *hw)
         else
                 dm_digtable->cursta_cstate = DIG_STA_DISCONNECT;
 
-        rtl8723ae_dm_initial_gain_sta(hw);
-        rtl8723ae_dm_initial_gain_multi_sta(hw);
-        rtl8723ae_dm_cck_packet_detection_thresh(hw);
+        rtl8723e_dm_initial_gain_sta(hw);
+        rtl8723e_dm_initial_gain_multi_sta(hw);
+        rtl8723e_dm_cck_packet_detection_thresh(hw);
 
         dm_digtable->presta_cstate = dm_digtable->cursta_cstate;
 
 }
 
-static void rtl8723ae_dm_dig(struct ieee80211_hw *hw)
+static void rtl8723e_dm_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
-        if (rtlpriv->dm.dm_initialgain_enable == false)
+        if (!rtlpriv->dm.dm_initialgain_enable)
                 return;
-        if (dm_digtable->dig_enable_flag == false)
+        if (!dm_digtable->dig_enable_flag)
                 return;
 
-        rtl8723ae_dm_ctrl_initgain_by_twoport(hw);
+        rtl8723e_dm_ctrl_initgain_by_twoport(hw);
+
 }
 
-static void rtl8723ae_dm_dynamic_txpower(struct ieee80211_hw *hw)
+static void rtl8723e_dm_dynamic_txpower(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -502,7 +505,7 @@ static void rtl8723ae_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         "Not connected\n");
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -512,18 +515,21 @@ static void rtl8723ae_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
         if (mac->link_state >= MAC80211_LINKED) {
                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
-                        undec_sm_pwdb = rtlpriv->dm.entry_min_undec_sm_pwdb;
+                        undec_sm_pwdb =
+                            rtlpriv->dm.entry_min_undec_sm_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                                  "AP Client PWDB = 0x%lx\n",
-                                 undec_sm_pwdb);
+                                  undec_sm_pwdb);
                 } else {
-                        undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
+                        undec_sm_pwdb =
+                            rtlpriv->dm.undec_sm_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                                  "STA Default Port PWDB = 0x%lx\n",
-                                 undec_sm_pwdb);
+                                  undec_sm_pwdb);
                 }
         } else {
-                undec_sm_pwdb = rtlpriv->dm.entry_min_undec_sm_pwdb;
+                undec_sm_pwdb =
+                    rtlpriv->dm.entry_min_undec_sm_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "AP Ext Port PWDB = 0x%lx\n",
@@ -534,37 +540,39 @@ static void rtl8723ae_dm_dynamic_txpower(struct ieee80211_hw *hw)
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
-        } else if ((undec_sm_pwdb < (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
-                   (undec_sm_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL1)) {
+        } else if ((undec_sm_pwdb <
+                    (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
+                   (undec_sm_pwdb >=
+                    TX_POWER_NEAR_FIELD_THRESH_LVL1)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
-        } else if (undec_sm_pwdb < (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
+        } else if (undec_sm_pwdb <
+                   (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
-        if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
+        if (rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
                          "PHY_SetTxPowerLevel8192S() Channel = %d\n",
                           rtlphy->current_channel);
-                rtl8723ae_phy_set_txpower_level(hw, rtlphy->current_channel);
+                rtl8723e_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
 
         rtlpriv->dm.last_dtp_lvl = rtlpriv->dm.dynamic_txhighpower_lvl;
 }
 
-void rtl8723ae_dm_write_dig(struct ieee80211_hw *hw)
+void rtl8723e_dm_write_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 "cur_igvalue = 0x%x, "
-                 "pre_igvalue = 0x%x, back_val = %d\n",
-                 dm_digtable->cur_igvalue, dm_digtable->pre_igvalue,
-                 dm_digtable->back_val);
+                 "cur_igvalue = 0x%x, pre_igvalue = 0x%x, back_val = %d\n",
+                  dm_digtable->cur_igvalue, dm_digtable->pre_igvalue,
+                  dm_digtable->back_val);
 
         if (dm_digtable->pre_igvalue != dm_digtable->cur_igvalue) {
                 rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f,
@@ -576,32 +584,39 @@ void rtl8723ae_dm_write_dig(struct ieee80211_hw *hw)
         }
 }
 
-static void rtl8723ae_dm_check_edca_turbo(struct ieee80211_hw *hw)
+static void rtl8723e_dm_pwdb_monitor(struct ieee80211_hw *hw)
+{
+}
+
+static void rtl8723e_dm_check_edca_turbo(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
+        static u64 last_txok_cnt;
+        static u64 last_rxok_cnt;
+        static u32 last_bt_edca_ul;
+        static u32 last_bt_edca_dl;
         u64 cur_txok_cnt = 0;
         u64 cur_rxok_cnt = 0;
         u32 edca_be_ul = 0x5ea42b;
         u32 edca_be_dl = 0x5ea42b;
         bool bt_change_edca = false;
 
-        if ((mac->last_bt_edca_ul != rtlpcipriv->bt_coexist.bt_edca_ul) ||
-            (mac->last_bt_edca_dl != rtlpcipriv->bt_coexist.bt_edca_dl)) {
+        if ((last_bt_edca_ul != rtlpriv->btcoexist.bt_edca_ul) ||
+            (last_bt_edca_dl != rtlpriv->btcoexist.bt_edca_dl)) {
                 rtlpriv->dm.current_turbo_edca = false;
-                mac->last_bt_edca_ul = rtlpcipriv->bt_coexist.bt_edca_ul;
-                mac->last_bt_edca_dl = rtlpcipriv->bt_coexist.bt_edca_dl;
+                last_bt_edca_ul = rtlpriv->btcoexist.bt_edca_ul;
+                last_bt_edca_dl = rtlpriv->btcoexist.bt_edca_dl;
         }
 
-        if (rtlpcipriv->bt_coexist.bt_edca_ul != 0) {
-                edca_be_ul = rtlpcipriv->bt_coexist.bt_edca_ul;
+        if (rtlpriv->btcoexist.bt_edca_ul != 0) {
+                edca_be_ul = rtlpriv->btcoexist.bt_edca_ul;
                 bt_change_edca = true;
         }
 
-        if (rtlpcipriv->bt_coexist.bt_edca_dl != 0) {
-                edca_be_ul = rtlpcipriv->bt_coexist.bt_edca_dl;
+        if (rtlpriv->btcoexist.bt_edca_dl != 0) {
+                edca_be_ul = rtlpriv->btcoexist.bt_edca_dl;
                 bt_change_edca = true;
         }
 
@@ -609,22 +624,11 @@ static void rtl8723ae_dm_check_edca_turbo(struct ieee80211_hw *hw)
                 rtlpriv->dm.current_turbo_edca = false;
                 return;
         }
-
-        if ((!mac->ht_enable) && (!rtlpcipriv->bt_coexist.bt_coexistence)) {
-                if (!(edca_be_ul & 0xffff0000))
-                        edca_be_ul |= 0x005e0000;
-
-                if (!(edca_be_dl & 0xffff0000))
-                        edca_be_dl |= 0x005e0000;
-        }
-
         if ((bt_change_edca) || ((!rtlpriv->dm.is_any_nonbepkts) &&
              (!rtlpriv->dm.disable_framebursting))) {
 
-                cur_txok_cnt = rtlpriv->stats.txbytesunicast -
-                               mac->last_txok_cnt;
-                cur_rxok_cnt = rtlpriv->stats.rxbytesunicast -
-                               mac->last_rxok_cnt;
+                cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok_cnt;
+                cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rxok_cnt;
 
                 if (cur_rxok_cnt > 4 * cur_txok_cnt) {
                         if (!rtlpriv->dm.is_cur_rdlstate ||
@@ -647,18 +651,20 @@ static void rtl8723ae_dm_check_edca_turbo(struct ieee80211_hw *hw)
         } else {
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
-                                                      &tmp);
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_AC_PARAM,
+                                                      (u8 *)(&tmp));
                         rtlpriv->dm.current_turbo_edca = false;
                 }
         }
 
         rtlpriv->dm.is_any_nonbepkts = false;
-        mac->last_txok_cnt = rtlpriv->stats.txbytesunicast;
-        mac->last_rxok_cnt = rtlpriv->stats.rxbytesunicast;
+        last_txok_cnt = rtlpriv->stats.txbytesunicast;
+        last_rxok_cnt = rtlpriv->stats.rxbytesunicast;
 }
 
-static void rtl8723ae_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
+static void rtl8723e_dm_initialize_txpower_tracking_thermalmeter(
+                                struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
@@ -667,10 +673,20 @@ static void rtl8723ae_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                  "pMgntInfo->txpower_tracking = %d\n",
-                 rtlpriv->dm.txpower_tracking);
+                  rtlpriv->dm.txpower_tracking);
 }
 
-void rtl8723ae_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
+static void rtl8723e_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
+{
+        rtl8723e_dm_initialize_txpower_tracking_thermalmeter(hw);
+}
+
+void rtl8723e_dm_check_txpower_tracking(struct ieee80211_hw *hw)
+{
+        return;
+}
+
+void rtl8723e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rate_adaptive *p_ra = &(rtlpriv->ra);
@@ -682,101 +698,32 @@ void rtl8723ae_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
                 rtlpriv->dm.useramask = true;
         else
                 rtlpriv->dm.useramask = false;
-}
 
-static void rtl8723ae_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct rate_adaptive *p_ra = &(rtlpriv->ra);
-        u32 low_rssithresh_for_ra, high_rssithresh_for_ra;
-        struct ieee80211_sta *sta = NULL;
-
-        if (is_hal_stop(rtlhal)) {
-                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                         " driver is going to unload\n");
-                return;
-        }
-
-        if (!rtlpriv->dm.useramask) {
-                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                         " driver does not control rate adaptive mask\n");
-                return;
-        }
-
-        if (mac->link_state == MAC80211_LINKED &&
-            mac->opmode == NL80211_IFTYPE_STATION) {
-                switch (p_ra->pre_ratr_state) {
-                case DM_RATR_STA_HIGH:
-                        high_rssithresh_for_ra = 50;
-                        low_rssithresh_for_ra = 20;
-                        break;
-                case DM_RATR_STA_MIDDLE:
-                        high_rssithresh_for_ra = 55;
-                        low_rssithresh_for_ra = 20;
-                        break;
-                case DM_RATR_STA_LOW:
-                        high_rssithresh_for_ra = 50;
-                        low_rssithresh_for_ra = 25;
-                        break;
-                default:
-                        high_rssithresh_for_ra = 50;
-                        low_rssithresh_for_ra = 20;
-                        break;
-                }
-
-                if (rtlpriv->dm.undec_sm_pwdb > high_rssithresh_for_ra)
-                        p_ra->ratr_state = DM_RATR_STA_HIGH;
-                else if (rtlpriv->dm.undec_sm_pwdb > low_rssithresh_for_ra)
-                        p_ra->ratr_state = DM_RATR_STA_MIDDLE;
-                else
-                        p_ra->ratr_state = DM_RATR_STA_LOW;
-
-                if (p_ra->pre_ratr_state != p_ra->ratr_state) {
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 "RSSI = %ld\n",
-                                 rtlpriv->dm.undec_sm_pwdb);
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 "PreState = %d, CurState = %d\n",
-                                 p_ra->pre_ratr_state, p_ra->ratr_state);
-
-                        rcu_read_lock();
-                        sta = rtl_find_sta(hw, mac->bssid);
-                        if (sta)
-                                rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
-                                                           p_ra->ratr_state);
-                        rcu_read_unlock();
-
-                        p_ra->pre_ratr_state = p_ra->ratr_state;
-                }
-        }
 }
 
-void rtl8723ae_dm_rf_saving(struct ieee80211_hw *hw, u8 force_in_normal)
+void rtl8723e_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct ps_t *dm_pstable = &rtlpriv->dm_pstable;
+        static u8 initialize;
+        static u32 reg_874, reg_c70, reg_85c, reg_a74;
 
-        if (!rtlpriv->reg_init) {
-                rtlpriv->reg_874 = (rtl_get_bbreg(hw, RFPGA0_XCD_RFINTERFACESW,
-                                    MASKDWORD) & 0x1CC000) >> 14;
+        if (initialize == 0) {
+                reg_874 = (rtl_get_bbreg(hw, RFPGA0_XCD_RFINTERFACESW,
+                                         MASKDWORD) & 0x1CC000) >> 14;
 
-                rtlpriv->reg_c70 = (rtl_get_bbreg(hw, ROFDM0_AGCPARAMETER1,
-                                    MASKDWORD) & BIT(3)) >> 3;
+                reg_c70 = (rtl_get_bbreg(hw, ROFDM0_AGCPARAMETER1,
+                                         MASKDWORD) & BIT(3)) >> 3;
 
-                rtlpriv->reg_85c = (rtl_get_bbreg(hw, RFPGA0_XCD_SWITCHCONTROL,
-                                    MASKDWORD) & 0xFF000000) >> 24;
+                reg_85c = (rtl_get_bbreg(hw, RFPGA0_XCD_SWITCHCONTROL,
+                                         MASKDWORD) & 0xFF000000) >> 24;
 
-                rtlpriv->reg_a74 = (rtl_get_bbreg(hw, 0xa74, MASKDWORD) &
-                                   0xF000) >> 12;
+                reg_a74 = (rtl_get_bbreg(hw, 0xa74, MASKDWORD) & 0xF000) >> 12;
 
-                rtlpriv->reg_init = true;
+                initialize = 1;
         }
 
-        if (!force_in_normal) {
+        if (!bforce_in_normal) {
                 if (dm_pstable->rssi_val_min != 0) {
                         if (dm_pstable->pre_rfstate == RF_NORMAL) {
                                 if (dm_pstable->rssi_val_min >= 30)
@@ -798,7 +745,6 @@ void rtl8723ae_dm_rf_saving(struct ieee80211_hw *hw, u8 force_in_normal)
 
         if (dm_pstable->pre_rfstate != dm_pstable->cur_rfstate) {
                 if (dm_pstable->cur_rfstate == RF_SAVE) {
-
                         rtl_set_bbreg(hw, RFPGA0_XCD_RFINTERFACESW,
                                       BIT(5), 0x1);
                         rtl_set_bbreg(hw, RFPGA0_XCD_RFINTERFACESW,
@@ -813,12 +759,12 @@ void rtl8723ae_dm_rf_saving(struct ieee80211_hw *hw, u8 force_in_normal)
                         rtl_set_bbreg(hw, 0x818, BIT(28), 0x1);
                 } else {
                         rtl_set_bbreg(hw, RFPGA0_XCD_RFINTERFACESW,
-                                      0x1CC000, rtlpriv->reg_874);
+                                      0x1CC000, reg_874);
                         rtl_set_bbreg(hw, ROFDM0_AGCPARAMETER1, BIT(3),
-                                      rtlpriv->reg_c70);
+                                      reg_c70);
                         rtl_set_bbreg(hw, RFPGA0_XCD_SWITCHCONTROL, 0xFF000000,
-                                      rtlpriv->reg_85c);
-                        rtl_set_bbreg(hw, 0xa74, 0xF000, rtlpriv->reg_a74);
+                                      reg_85c);
+                        rtl_set_bbreg(hw, 0xa74, 0xF000, reg_a74);
                         rtl_set_bbreg(hw, 0x818, BIT(28), 0x0);
                         rtl_set_bbreg(hw, RFPGA0_XCD_RFINTERFACESW,
                                       BIT(5), 0x0);
@@ -828,7 +774,7 @@ void rtl8723ae_dm_rf_saving(struct ieee80211_hw *hw, u8 force_in_normal)
         }
 }
 
-static void rtl8723ae_dm_dynamic_bpowersaving(struct ieee80211_hw *hw)
+static void rtl8723e_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -847,48 +793,49 @@ static void rtl8723ae_dm_dynamic_bpowersaving(struct ieee80211_hw *hw)
                             rtlpriv->dm.entry_min_undec_sm_pwdb;
                         RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
                                  "AP Client PWDB = 0x%lx\n",
-                                 dm_pstable->rssi_val_min);
+                                  dm_pstable->rssi_val_min);
                 } else {
-                        dm_pstable->rssi_val_min = rtlpriv->dm.undec_sm_pwdb;
+                        dm_pstable->rssi_val_min =
+                            rtlpriv->dm.undec_sm_pwdb;
                         RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
                                  "STA Default Port PWDB = 0x%lx\n",
-                                 dm_pstable->rssi_val_min);
+                                  dm_pstable->rssi_val_min);
                 }
         } else {
-                dm_pstable->rssi_val_min = rtlpriv->dm.entry_min_undec_sm_pwdb;
+                dm_pstable->rssi_val_min =
+                    rtlpriv->dm.entry_min_undec_sm_pwdb;
 
                 RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
                          "AP Ext Port PWDB = 0x%lx\n",
-                         dm_pstable->rssi_val_min);
+                          dm_pstable->rssi_val_min);
         }
 
-        rtl8723ae_dm_rf_saving(hw, false);
+        rtl8723e_dm_rf_saving(hw, false);
 }
 
-void rtl8723ae_dm_init(struct ieee80211_hw *hw)
+void rtl8723e_dm_init(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         rtlpriv->dm.dm_type = DM_TYPE_BYDRIVER;
-        rtl8723ae_dm_diginit(hw);
+        rtl8723e_dm_diginit(hw);
         rtl8723_dm_init_dynamic_txpower(hw);
         rtl8723_dm_init_edca_turbo(hw);
-        rtl8723ae_dm_init_rate_adaptive_mask(hw);
-        rtl8723ae_dm_initialize_txpower_tracking(hw);
+        rtl8723e_dm_init_rate_adaptive_mask(hw);
+        rtl8723e_dm_initialize_txpower_tracking(hw);
         rtl8723_dm_init_dynamic_bb_powersaving(hw);
 }
 
-void rtl8723ae_dm_watchdog(struct ieee80211_hw *hw)
+void rtl8723e_dm_watchdog(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         bool fw_current_inpsmode = false;
         bool fw_ps_awake = true;
         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
-                                      (u8 *) (&fw_current_inpsmode));
+                                      (u8 *)(&fw_current_inpsmode));
         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
-                                      (u8 *) (&fw_ps_awake));
+                                      (u8 *)(&fw_ps_awake));
 
         if (ppsc->p2p_ps_info.p2p_ps_mode)
                 fw_ps_awake = false;
@@ -896,58 +843,57 @@ void rtl8723ae_dm_watchdog(struct ieee80211_hw *hw)
         if ((ppsc->rfpwr_state == ERFON) &&
             ((!fw_current_inpsmode) && fw_ps_awake) &&
             (!ppsc->rfchange_inprogress)) {
-                rtl8723ae_dm_dig(hw);
-                rtl8723ae_dm_false_alarm_counter_statistics(hw);
-                rtl8723ae_dm_dynamic_bpowersaving(hw);
-                rtl8723ae_dm_dynamic_txpower(hw);
-                rtl8723ae_dm_refresh_rate_adaptive_mask(hw);
-                rtl8723ae_dm_bt_coexist(hw);
-                rtl8723ae_dm_check_edca_turbo(hw);
+                rtl8723e_dm_pwdb_monitor(hw);
+                rtl8723e_dm_dig(hw);
+                rtl8723e_dm_false_alarm_counter_statistics(hw);
+                rtl8723e_dm_dynamic_bb_powersaving(hw);
+                rtl8723e_dm_dynamic_txpower(hw);
+                rtl8723e_dm_check_txpower_tracking(hw);
+                /* rtl92c_dm_refresh_rate_adaptive_mask(hw); */
+                rtl8723e_dm_bt_coexist(hw);
+                rtl8723e_dm_check_edca_turbo(hw);
         }
-        if (rtlpcipriv->bt_coexist.init_set)
+        if (rtlpriv->btcoexist.init_set)
                 rtl_write_byte(rtlpriv, 0x76e, 0xc);
 }
 
-static void rtl8723ae_dm_init_bt_coexist(struct ieee80211_hw *hw)
+static void rtl8723e_dm_init_bt_coexist(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
 
-        rtlpcipriv->bt_coexist.bt_rfreg_origin_1e
+        rtlpriv->btcoexist.bt_rfreg_origin_1e
                 = rtl_get_rfreg(hw, (enum radio_path)0, RF_RCK1, 0xfffff);
-        rtlpcipriv->bt_coexist.bt_rfreg_origin_1f
+        rtlpriv->btcoexist.bt_rfreg_origin_1f
                 = rtl_get_rfreg(hw, (enum radio_path)0, RF_RCK2, 0xf0);
 
-        rtlpcipriv->bt_coexist.cstate = 0;
-        rtlpcipriv->bt_coexist.previous_state = 0;
-        rtlpcipriv->bt_coexist.cstate_h = 0;
-        rtlpcipriv->bt_coexist.previous_state_h = 0;
-        rtlpcipriv->bt_coexist.lps_counter = 0;
+        rtlpriv->btcoexist.cstate = 0;
+        rtlpriv->btcoexist.previous_state = 0;
+        rtlpriv->btcoexist.cstate_h = 0;
+        rtlpriv->btcoexist.previous_state_h = 0;
+        rtlpriv->btcoexist.lps_counter = 0;
 
         /*  Enable counter statistics */
         rtl_write_byte(rtlpriv, 0x76e, 0x4);
         rtl_write_byte(rtlpriv, 0x778, 0x3);
         rtl_write_byte(rtlpriv, 0x40, 0x20);
 
-        rtlpcipriv->bt_coexist.init_set = true;
+        rtlpriv->btcoexist.init_set = true;
 }
 
-void rtl8723ae_dm_bt_coexist(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_coexist(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         u8 tmp_byte = 0;
-        if (!rtlpcipriv->bt_coexist.bt_coexistence) {
+        if (!rtlpriv->btcoexist.bt_coexistence) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
                          "[DM]{BT], BT not exist!!\n");
                 return;
         }
 
-        if (!rtlpcipriv->bt_coexist.init_set) {
+        if (!rtlpriv->btcoexist.init_set) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
-                         "[DM][BT], rtl8723ae_dm_bt_coexist()\n");
-
-                rtl8723ae_dm_init_bt_coexist(hw);
+                         "[DM][BT], rtl8723e_dm_bt_coexist()\n");
+                rtl8723e_dm_init_bt_coexist(hw);
         }
 
         tmp_byte = rtl_read_byte(rtlpriv, 0x40);
@@ -955,5 +901,5 @@ void rtl8723ae_dm_bt_coexist(struct ieee80211_hw *hw)
                  "[DM][BT], 0x40 is 0x%x", tmp_byte);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                  "[DM][BT], bt_dm_coexist start");
-        rtl8723ae_dm_bt_coexist_8723(hw);
+        rtl8723e_dm_bt_coexist_8723(hw);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
index d253bb53d03e..6fa0feb05f6d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
@@ -25,17 +25,23 @@
  *
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
- ****************************************************************************
- */
+ *****************************************************************************/
 
 #ifndef __RTL8723E_DM_H__
 #define __RTL8723E_DM_H__
 
+#define HAL_DM_DIG_DISABLE                      BIT(0)
 #define HAL_DM_HIPWR_DISABLE                    BIT(1)
 
+#define OFDM_TABLE_LENGTH                       37
+#define CCK_TABLE_LENGTH                        33
+
 #define OFDM_TABLE_SIZE                         37
 #define CCK_TABLE_SIZE                          33
 
+#define BW_AUTO_SWITCH_HIGH_LOW                 25
+#define BW_AUTO_SWITCH_LOW_HIGH                 30
+
 #define DM_DIG_THRESH_HIGH                      40
 #define DM_DIG_THRESH_LOW                       35
 
@@ -63,12 +69,18 @@
 #define DM_RATR_STA_MIDDLE                      2
 #define DM_RATR_STA_LOW                         3
 
+#define CTS2SELF_THVAL                          30
+#define REGC38_TH                               20
+
+#define WAIOTTHVAL                              25
+
 #define TXHIGHPWRLEVEL_NORMAL                   0
 #define TXHIGHPWRLEVEL_LEVEL1                   1
 #define TXHIGHPWRLEVEL_LEVEL2                   2
 #define TXHIGHPWRLEVEL_BT1                      3
 #define TXHIGHPWRLEVEL_BT2                      4
 
+#define DM_TYPE_BYFW                            0
 #define DM_TYPE_BYDRIVER                        1
 
 #define TX_POWER_NEAR_FIELD_THRESH_LVL2         74
@@ -82,6 +94,7 @@ struct swat_t {
         long trying_threshold;
         u8 cur_antenna;
         u8 pre_antenna;
+
 };
 
 enum tag_dynamic_init_gain_operation_type_definition {
@@ -98,7 +111,7 @@ enum tag_dynamic_init_gain_operation_type_definition {
 enum tag_cck_packet_detection_threshold_type_definition {
         CCK_PD_STAGE_LowRssi = 0,
         CCK_PD_STAGE_HighRssi = 1,
-        CCK_FA_STAGE_Low = 2,
+        CCK_FA_STAGE_LOW = 2,
         CCK_FA_STAGE_High = 3,
         CCK_PD_STAGE_MAX = 4,
 };
@@ -138,17 +151,24 @@ enum dm_dig_connect_e {
         DIG_CONNECT_MAX
 };
 
+#define BT_RSSI_STATE_NORMAL_POWER      BIT_OFFSET_LEN_MASK_32(0, 1)
+#define BT_RSSI_STATE_AMDPU_OFF         BIT_OFFSET_LEN_MASK_32(1, 1)
+#define BT_RSSI_STATE_SPECIAL_LOW       BIT_OFFSET_LEN_MASK_32(2, 1)
+#define BT_RSSI_STATE_BG_EDCA_LOW       BIT_OFFSET_LEN_MASK_32(3, 1)
+#define BT_RSSI_STATE_TXPOWER_LOW       BIT_OFFSET_LEN_MASK_32(4, 1)
 #define GET_UNDECORATED_AVERAGE_RSSI(_priv)     \
-        ((((struct rtl_priv *)(_priv))->mac80211.opmode ==      \
-        NL80211_IFTYPE_ADHOC) ?  \
-        (((struct rtl_priv *)(_priv))->dm.entry_min_undec_sm_pwdb) \
-        : (((struct rtl_priv *)(_priv))->dm.undec_sm_pwdb))
-
-void rtl8723ae_dm_init(struct ieee80211_hw *hw);
-void rtl8723ae_dm_watchdog(struct ieee80211_hw *hw);
-void rtl8723ae_dm_write_dig(struct ieee80211_hw *hw);
-void rtl8723ae_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw);
-void rtl8723ae_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal);
-void rtl8723ae_dm_bt_coexist(struct ieee80211_hw *hw);
-
+        ( \
+        (((struct rtl_priv *)(_priv))->mac80211.opmode ==               \
+                             NL80211_IFTYPE_ADHOC) ?                    \
+        (((struct rtl_priv *)(_priv))->dm.entry_min_undec_sm_pwdb) :    \
+        (((struct rtl_priv *)(_priv))->dm.undec_sm_pwdb)                \
+        )
+
+void rtl8723e_dm_init(struct ieee80211_hw *hw);
+void rtl8723e_dm_watchdog(struct ieee80211_hw *hw);
+void rtl8723e_dm_write_dig(struct ieee80211_hw *hw);
+void rtl8723e_dm_check_txpower_tracking(struct ieee80211_hw *hw);
+void rtl8723e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw);
+void rtl8723e_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal);
+void rtl8723e_dm_bt_coexist(struct ieee80211_hw *hw);
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
index 728b7563ad36..b7c0d38ee5b5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -25,18 +21,19 @@
  *
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
- ****************************************************************************
- */
+ *****************************************************************************/
 
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "fw.h"
 #include "../rtl8723com/fw_common.h"
 
-static bool rtl8723ae_check_fw_read_last_h2c(struct ieee80211_hw *hw, u8 boxnum)
+static bool _rtl8723e_check_fw_read_last_h2c(struct ieee80211_hw *hw,
+                                             u8 boxnum)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 val_hmetfr, val_mcutst_1;
@@ -50,17 +47,17 @@ static bool rtl8723ae_check_fw_read_last_h2c(struct ieee80211_hw *hw, u8 boxnum)
         return result;
 }
 
-static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
-                                        u8 element_id, u32 cmd_len,
-                                        u8 *p_cmdbuffer)
+static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
+                                       u32 cmd_len, u8 *cmdbuffer)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 boxnum;
         u16 box_reg = 0, box_extreg = 0;
-        u8 u1tmp;
-        bool isfw_rd = false;
-        bool bwrite_success = false;
+        u8 u1b_tmp;
+        bool isfw_read = false;
+        u8 buf_index = 0;
+        bool bwrite_sucess = false;
         u8 wait_h2c_limmit = 100;
         u8 wait_writeh2c_limmit = 100;
         u8 boxcontent[4], boxextcontent[2];
@@ -83,7 +80,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                                 h2c_waitcounter++;
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                                          "Wait 100 us (%d times)...\n",
-                                         h2c_waitcounter);
+                                          h2c_waitcounter);
                                 udelay(100);
 
                                 if (h2c_waitcounter > 1000)
@@ -99,12 +96,11 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                 }
         }
 
-        while (!bwrite_success) {
+        while (!bwrite_sucess) {
                 wait_writeh2c_limmit--;
                 if (wait_writeh2c_limmit == 0) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "Write H2C fail because no trigger "
-                                 "for FW INT!\n");
+                                 "Write H2C fail because no trigger for FW INT!\n");
                         break;
                 }
 
@@ -128,34 +124,35 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                                 "switch case not process\n");
                         break;
                 }
 
-                isfw_rd = rtl8723ae_check_fw_read_last_h2c(hw, boxnum);
-                while (!isfw_rd) {
+                isfw_read = _rtl8723e_check_fw_read_last_h2c(hw, boxnum);
+                while (!isfw_read) {
 
                         wait_h2c_limmit--;
                         if (wait_h2c_limmit == 0) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         "Waiting too long for FW read clear HMEBox(%d)!\n",
+                                         "Wating too long for FW read clear HMEBox(%d)!\n",
                                          boxnum);
                                 break;
                         }
 
                         udelay(10);
 
-                        isfw_rd = rtl8723ae_check_fw_read_last_h2c(hw, boxnum);
-                        u1tmp = rtl_read_byte(rtlpriv, 0x1BF);
+                        isfw_read = _rtl8723e_check_fw_read_last_h2c(hw,
+                                                                boxnum);
+                        u1b_tmp = rtl_read_byte(rtlpriv, 0x1BF);
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "Waiting for FW read clear HMEBox(%d)!!! "
-                                 "0x1BF = %2x\n", boxnum, u1tmp);
+                                 "Waiting for FW read clear HMEBox(%d)!!! 0x1BF = %2x\n",
+                                 boxnum, u1b_tmp);
                 }
 
-                if (!isfw_rd) {
+                if (!isfw_read) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "Write H2C register BOX[%d] fail!!!!! "
-                                 "Fw do not read.\n", boxnum);
+                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
+                                 boxnum);
                         break;
                 }
 
@@ -169,8 +166,8 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                 switch (cmd_len) {
                 case 1:
                         boxcontent[0] &= ~(BIT(7));
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer, 1);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, 1);
 
                         for (idx = 0; idx < 4; idx++) {
                                 rtl_write_byte(rtlpriv, box_reg + idx,
@@ -179,8 +176,8 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 case 2:
                         boxcontent[0] &= ~(BIT(7));
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer, 2);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, 2);
 
                         for (idx = 0; idx < 4; idx++) {
                                 rtl_write_byte(rtlpriv, box_reg + idx,
@@ -189,8 +186,8 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 case 3:
                         boxcontent[0] &= ~(BIT(7));
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer, 3);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, 3);
 
                         for (idx = 0; idx < 4; idx++) {
                                 rtl_write_byte(rtlpriv, box_reg + idx,
@@ -199,10 +196,10 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 case 4:
                         boxcontent[0] |= (BIT(7));
-                        memcpy((u8 *) (boxextcontent),
-                               p_cmdbuffer, 2);
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer + 2, 2);
+                        memcpy((u8 *)(boxextcontent),
+                               cmdbuffer + buf_index, 2);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index + 2, 2);
 
                         for (idx = 0; idx < 2; idx++) {
                                 rtl_write_byte(rtlpriv, box_extreg + idx,
@@ -216,10 +213,10 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 case 5:
                         boxcontent[0] |= (BIT(7));
-                        memcpy((u8 *) (boxextcontent),
-                               p_cmdbuffer, 2);
-                        memcpy((u8 *) (boxcontent) + 1,
-                               p_cmdbuffer + 2, 3);
+                        memcpy((u8 *)(boxextcontent),
+                               cmdbuffer + buf_index, 2);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index + 2, 3);
 
                         for (idx = 0; idx < 2; idx++) {
                                 rtl_write_byte(rtlpriv, box_extreg + idx,
@@ -237,7 +234,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 }
 
-                bwrite_success = true;
+                bwrite_sucess = true;
 
                 rtlhal->last_hmeboxnum = boxnum + 1;
                 if (rtlhal->last_hmeboxnum == 4)
@@ -245,7 +242,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
 
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                          "pHalData->last_hmeboxnum  = %d\n",
-                         rtlhal->last_hmeboxnum);
+                          rtlhal->last_hmeboxnum);
         }
 
         spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
@@ -255,52 +252,49 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
 }
 
-void rtl8723ae_fill_h2c_cmd(struct ieee80211_hw *hw,
-                            u8 element_id, u32 cmd_len, u8 *p_cmdbuffer)
+void rtl8723e_fill_h2c_cmd(struct ieee80211_hw *hw,
+                           u8 element_id, u32 cmd_len, u8 *cmdbuffer)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 tmp_cmdbuf[2];
 
-        if (rtlhal->fw_ready == false) {
+        if (!rtlhal->fw_ready) {
                 RT_ASSERT(false,
-                         "return H2C cmd because of Fw download fail!!!\n");
+                          "return H2C cmd because of Fw download fail!!!\n");
                 return;
         }
-
-        _rtl8723ae_fill_h2c_command(hw, element_id, cmd_len, p_cmdbuffer);
-        return;
+        memset(tmp_cmdbuf, 0, 8);
+        memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
+        _rtl8723e_fill_h2c_command(hw, element_id, cmd_len,
+                                   (u8 *)&tmp_cmdbuf);
 }
 
-static bool _rtl8723ae_cmd_send_packet(struct ieee80211_hw *hw,
-                                       struct sk_buff *skb)
+void rtl8723e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        struct rtl8192_tx_ring *ring;
-        struct rtl_tx_desc *pdesc;
-        unsigned long flags;
-        struct sk_buff *pskb = NULL;
-
-        ring = &rtlpci->tx_ring[BEACON_QUEUE];
-
-        pskb = __skb_dequeue(&ring->queue);
-        if (pskb)
-                kfree_skb(pskb);
-
-        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
-
-        pdesc = &ring->desc[0];
+        u8 u1_h2c_set_pwrmode[3] = { 0 };
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
 
-        rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *) pdesc, 1, 1, skb);
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
-        __skb_queue_tail(&ring->queue, skb);
+        SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);
+        SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
+                (rtlpriv->mac80211.p2p) ? ppsc->smart_ps : 1);
+        SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(u1_h2c_set_pwrmode,
+                                              ppsc->reg_max_lps_awakeintvl);
 
-        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                      "rtl8723e_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n",
+                      u1_h2c_set_pwrmode, 3);
+        rtl8723e_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);
+}
 
-        rtlpriv->cfg->ops->tx_polling(hw, BEACON_QUEUE);
+#define BEACON_PG               0 /* ->1 */
+#define PSPOLL_PG               2
+#define NULL_PG                 3
+#define PROBERSP_PG             4 /* ->5 */
 
-        return true;
-}
+#define TOTAL_RESERVED_PKT_LEN  768
 
 static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = {
         /* page 0 beacon */
@@ -412,111 +406,111 @@ static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-void rtl8723ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
+void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct sk_buff *skb = NULL;
-
         u32 totalpacketlen;
         bool rtstatus;
-        u8 u1RsvdPageLoc[3] = { 0 };
-        bool dlok = false;
-
+        u8 u1rsvdpageloc[3] = { 0 };
+        bool b_dlok = false;
         u8 *beacon;
         u8 *p_pspoll;
         u8 *nullfunc;
         u8 *p_probersp;
+
         /*---------------------------------------------------------
-                                (1) beacon
-        ---------------------------------------------------------
-        */
+         *                      (1) beacon
+         *---------------------------------------------------------
+         */
         beacon = &reserved_page_packet[BEACON_PG * 128];
         SET_80211_HDR_ADDRESS2(beacon, mac->mac_addr);
         SET_80211_HDR_ADDRESS3(beacon, mac->bssid);
 
         /*-------------------------------------------------------
-                                (2) ps-poll
-        --------------------------------------------------------
-        */
+         *                      (2) ps-poll
+         *--------------------------------------------------------
+         */
         p_pspoll = &reserved_page_packet[PSPOLL_PG * 128];
         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
-        ---------------------------------------------------------i
-        */
+         *                      (3) null data
+         *---------------------------------------------------------
+         */
         nullfunc = &reserved_page_packet[NULL_PG * 128];
         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
-        ----------------------------------------------------------
-        */
+         *                      (4) probe response
+         *----------------------------------------------------------
+         */
         p_probersp = &reserved_page_packet[PROBERSP_PG * 128];
         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,
-                      "rtl8723ae_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl8723e_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl8723ae_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
-                      u1RsvdPageLoc, 3);
+                      "rtl8723e_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      u1rsvdpageloc, 3);
 
         skb = dev_alloc_skb(totalpacketlen);
-        memcpy((u8 *) skb_put(skb, totalpacketlen),
+        memcpy((u8 *)skb_put(skb, totalpacketlen),
                &reserved_page_packet, totalpacketlen);
 
-        rtstatus = _rtl8723ae_cmd_send_packet(hw, skb);
+        rtstatus = rtl_cmd_send_packet(hw, skb);
 
         if (rtstatus)
-                dlok = true;
+                b_dlok = true;
 
-        if (dlok) {
+        if (b_dlok) {
                 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, 3);
-                rtl8723ae_fill_h2c_cmd(hw, H2C_RSVDPAGE,
-                                       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
+                              "H2C_RSVDPAGE:\n",
+                              u1rsvdpageloc, 3);
+                rtl8723e_fill_h2c_cmd(hw, H2C_RSVDPAGE,
+                                      sizeof(u1rsvdpageloc), u1rsvdpageloc);
         } else
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Set RSVD page location to Fw FAIL!!!!!!.\n");
 }
 
-void rtl8723ae_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
+void rtl8723e_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
 {
         u8 u1_joinbssrpt_parm[1] = { 0 };
 
         SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(u1_joinbssrpt_parm, mstatus);
 
-        rtl8723ae_fill_h2c_cmd(hw, H2C_JOINBSSRPT, 1, u1_joinbssrpt_parm);
+        rtl8723e_fill_h2c_cmd(hw, H2C_JOINBSSRPT, 1, u1_joinbssrpt_parm);
 }
 
 static void rtl8723e_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw,
                                             u8 ctwindow)
 {
-        u8 u1_ctwindow_period[1] = {ctwindow};
+        u8 u1_ctwindow_period[1] = { ctwindow};
+
+        rtl8723e_fill_h2c_cmd(hw, H2C_P2P_PS_CTW_CMD, 1, u1_ctwindow_period);
 
-        rtl8723ae_fill_h2c_cmd(hw, H2C_P2P_PS_CTW_CMD, 1, u1_ctwindow_period);
 }
 
-void rtl8723ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
+void rtl8723e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw));
@@ -530,7 +524,7 @@ void rtl8723ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
         switch (p2p_ps_state) {
         case P2P_PS_DISABLE:
                 RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
-                memset(p2p_ps_offload, 0, sizeof(struct p2p_ps_offload_t));
+                memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));
                 break;
         case P2P_PS_ENABLE:
                 RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
@@ -542,7 +536,7 @@ void rtl8723ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
                 }
 
                 /* hw only support 2 set of NoA */
-                for (i = 0; i < p2pinfo->noa_num; i++) {
+                for (i = 0 ; i < p2pinfo->noa_num ; i++) {
                         /* To control the register setting for which NOA*/
                         rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
                         if (i == 0)
@@ -561,27 +555,33 @@ void rtl8723ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
 
                         start_time = p2pinfo->noa_start_time[i];
                         if (p2pinfo->noa_count_type[i] != 1) {
-                                while (start_time <= (tsf_low+(50*1024))) {
-                                        start_time += p2pinfo->noa_interval[i];
+                                while (start_time <=
+                                        (tsf_low+(50*1024))) {
+                                        start_time +=
+                                                p2pinfo->noa_interval[i];
                                         if (p2pinfo->noa_count_type[i] != 255)
                                                 p2pinfo->noa_count_type[i]--;
                                 }
                         }
                         rtl_write_dword(rtlpriv, 0x5E8, start_time);
                         rtl_write_dword(rtlpriv, 0x5EC,
-                                        p2pinfo->noa_count_type[i]);
+                                p2pinfo->noa_count_type[i]);
+
                 }
+
                 if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
                         /* rst p2p circuit */
                         rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, BIT(4));
 
                         p2p_ps_offload->offload_en = 1;
+
                         if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
                                 p2p_ps_offload->role = 1;
                                 p2p_ps_offload->allstasleep = 0;
                         } else {
                                 p2p_ps_offload->role = 0;
                         }
+
                         p2p_ps_offload->discovery = 0;
                 }
                 break;
@@ -597,26 +597,7 @@ void rtl8723ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
         default:
                 break;
         }
-        rtl8723ae_fill_h2c_cmd(hw, H2C_P2P_PS_OFFLOAD, 1, (u8 *)p2p_ps_offload);
-}
-
-void rtl8723ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 u1_h2c_set_pwrmode[3] = { 0 };
-        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-
-        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
-        SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);
-        SET_H2CCMD_PWRMODE_PARM_SMART_PS_23A(u1_h2c_set_pwrmode,
-                                             (rtlpriv->mac80211.p2p) ?
-                                             ppsc->smart_ps : 1);
-        SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(u1_h2c_set_pwrmode,
-                                              ppsc->reg_max_lps_awakeintvl);
+        rtl8723e_fill_h2c_cmd(hw, H2C_P2P_PS_OFFLOAD, 1, (u8 *)p2p_ps_offload);
 
-        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl8723ae_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n",
-                      u1_h2c_set_pwrmode, 3);
-        rtl8723ae_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.h b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.h
index d355b85dd9fe..9d1fe25db953 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.h
@@ -24,50 +24,27 @@
  * Hsinchu 300, Taiwan.
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
- ****************************************************************************
- */
+ *****************************************************************************/
 
 #ifndef __RTL92C__FW__H__
 #define __RTL92C__FW__H__
 
+#define FW_8192C_SIZE                                   0x3000
 #define FW_8192C_START_ADDRESS                  0x1000
 #define FW_8192C_END_ADDRESS                    0x3FFF
-#define FW_8192C_PAGE_SIZE                      4096
+#define FW_8192C_PAGE_SIZE                              4096
 #define FW_8192C_POLLING_DELAY                  5
-#define FW_8192C_POLLING_TIMEOUT_COUNT          6000
 
-#define BEACON_PG                               0
-#define PSPOLL_PG                               2
-#define NULL_PG                                 3
-#define PROBERSP_PG                             4 /* ->5 */
+#define IS_FW_HEADER_EXIST(_pfwhdr)     \
+        ((_pfwhdr->signature&0xFFFF) == 0x2300 ||\
+        (_pfwhdr->signature&0xFFFF) == 0x2301 ||\
+        (_pfwhdr->signature&0xFFFF) == 0x2302)
 
-#define TOTAL_RESERVED_PKT_LEN                  768
-
-#define IS_FW_HEADER_EXIST(_pfwhdr)             \
-        ((_pfwhdr->signature&0xFF00) == 0x2300)
-
-struct rtl8723ae_firmware_header {
-        u16 signature;
-        u8 category;
-        u8 function;
-        u16 version;
-        u8 subversion;
-        u8 rsvd1;
-        u8 month;
-        u8 date;
-        u8 hour;
-        u8 minute;
-        u16 ramcodeSize;
-        u16 rsvd2;
-        u32 svnindex;
-        u32 rsvd3;
-        u32 rsvd4;
-        u32 rsvd5;
-};
+#define pagenum_128(_len)       (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))
 
 #define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val)                  \
         SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
-#define SET_H2CCMD_PWRMODE_PARM_SMART_PS_23A(__ph2ccmd, __val)          \
+#define SET_H2CCMD_PWRMODE_PARM_SMART_PS(__ph2ccmd, __val)              \
         SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
 #define SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(__ph2ccmd, __val) \
         SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
@@ -80,11 +57,10 @@ struct rtl8723ae_firmware_header {
 #define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val)             \
         SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
 
-void rtl8723ae_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
-                            u32 cmd_len, u8 *p_cmdbuffer);
-void rtl8723ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
-void rtl8723ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
-void rtl8723ae_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);
-void rtl8723ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
-
+void rtl8723e_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
+                           u32 cmd_len, u8 *p_cmdbuffer);
+void rtl8723e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
+void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
+void rtl8723e_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);
+void rtl8723e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c
index 5b4a714f3c8c..5aac45d5a974 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -31,96 +27,102 @@
 #include "../pci.h"
 #include "dm.h"
 #include "fw.h"
-#include "../rtl8723com/fw_common.h"
 #include "phy.h"
 #include "reg.h"
 #include "hal_btc.h"
 
-void rtl8723ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw,
-                                                 bool reject)
+static bool bt_operation_on;
+
+void rtl8723e_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw,
+                                                bool b_reject)
 {
 }
 
 void _rtl8723_dm_bt_check_wifi_state(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
         if (rtlpriv->link_info.busytraffic) {
-                rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_WIFI_IDLE;
+                rtlpriv->btcoexist.cstate &=
+                        ~BT_COEX_STATE_WIFI_IDLE;
 
                 if (rtlpriv->link_info.tx_busy_traffic)
-                        rtlpcipriv->bt_coexist.cstate |=
-                                        BT_COEX_STATE_WIFI_UPLINK;
+                        rtlpriv->btcoexist.cstate |=
+                                BT_COEX_STATE_WIFI_UPLINK;
                 else
-                        rtlpcipriv->bt_coexist.cstate &=
-                                        ~BT_COEX_STATE_WIFI_UPLINK;
+                        rtlpriv->btcoexist.cstate &=
+                                ~BT_COEX_STATE_WIFI_UPLINK;
 
                 if (rtlpriv->link_info.rx_busy_traffic)
-                        rtlpcipriv->bt_coexist.cstate |=
-                                        BT_COEX_STATE_WIFI_DOWNLINK;
+                        rtlpriv->btcoexist.cstate |=
+                                BT_COEX_STATE_WIFI_DOWNLINK;
                 else
-                        rtlpcipriv->bt_coexist.cstate &=
-                                        ~BT_COEX_STATE_WIFI_DOWNLINK;
+                        rtlpriv->btcoexist.cstate &=
+                                ~BT_COEX_STATE_WIFI_DOWNLINK;
         } else {
-                rtlpcipriv->bt_coexist.cstate |= BT_COEX_STATE_WIFI_IDLE;
-                rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_WIFI_UPLINK;
-                rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_WIFI_DOWNLINK;
+                rtlpriv->btcoexist.cstate |= BT_COEX_STATE_WIFI_IDLE;
+                rtlpriv->btcoexist.cstate &=
+                        ~BT_COEX_STATE_WIFI_UPLINK;
+                rtlpriv->btcoexist.cstate &=
+                        ~BT_COEX_STATE_WIFI_DOWNLINK;
         }
 
         if (rtlpriv->mac80211.mode == WIRELESS_MODE_G ||
             rtlpriv->mac80211.mode == WIRELESS_MODE_B) {
-                rtlpcipriv->bt_coexist.cstate |= BT_COEX_STATE_WIFI_LEGACY;
-                rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_WIFI_HT20;
-                rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_WIFI_HT40;
+                rtlpriv->btcoexist.cstate |=
+                        BT_COEX_STATE_WIFI_LEGACY;
+                rtlpriv->btcoexist.cstate &=
+                        ~BT_COEX_STATE_WIFI_HT20;
+                rtlpriv->btcoexist.cstate &=
+                        ~BT_COEX_STATE_WIFI_HT40;
         } else {
-                rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_WIFI_LEGACY;
+                rtlpriv->btcoexist.cstate &=
+                        ~BT_COEX_STATE_WIFI_LEGACY;
                 if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
-                        rtlpcipriv->bt_coexist.cstate |=
-                                        BT_COEX_STATE_WIFI_HT40;
-                        rtlpcipriv->bt_coexist.cstate &=
-                                        ~BT_COEX_STATE_WIFI_HT20;
+                        rtlpriv->btcoexist.cstate |=
+                                BT_COEX_STATE_WIFI_HT40;
+                        rtlpriv->btcoexist.cstate &=
+                                ~BT_COEX_STATE_WIFI_HT20;
                 } else {
-                        rtlpcipriv->bt_coexist.cstate |=
-                                        BT_COEX_STATE_WIFI_HT20;
-                        rtlpcipriv->bt_coexist.cstate &=
-                                        ~BT_COEX_STATE_WIFI_HT40;
+                        rtlpriv->btcoexist.cstate |=
+                                BT_COEX_STATE_WIFI_HT20;
+                        rtlpriv->btcoexist.cstate &=
+                                ~BT_COEX_STATE_WIFI_HT40;
                 }
         }
 
-        if (rtlpriv->bt_operation_on)
-                rtlpcipriv->bt_coexist.cstate |= BT_COEX_STATE_BT30;
+        if (bt_operation_on)
+                rtlpriv->btcoexist.cstate |= BT_COEX_STATE_BT30;
         else
-                rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_BT30;
+                rtlpriv->btcoexist.cstate &= ~BT_COEX_STATE_BT30;
 }
 
-u8 rtl8723ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
-                                          u8 level_num, u8 rssi_thresh,
-                                          u8 rssi_thresh1)
+u8 rtl8723e_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
+                                         u8 level_num, u8 rssi_thresh,
+                                         u8 rssi_thresh1)
 
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        long smooth;
+        long undecoratedsmoothed_pwdb;
         u8 bt_rssi_state = 0;
 
-        smooth =  rtl8723ae_dm_bt_get_rx_ss(hw);
+        undecoratedsmoothed_pwdb = rtl8723e_dm_bt_get_rx_ss(hw);
 
         if (level_num == 2) {
-                rtlpcipriv->bt_coexist.cstate &=
-                                ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;
-
-                if ((rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                    BT_RSSI_STATE_LOW) ||
-                    (rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                    BT_RSSI_STATE_STAY_LOW)) {
-                        if (smooth >= (rssi_thresh +
-                            BT_FW_COEX_THRESH_TOL)) {
+                rtlpriv->btcoexist.cstate &=
+                        ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;
+
+                if ((rtlpriv->btcoexist.bt_pre_rssi_state ==
+                     BT_RSSI_STATE_LOW) ||
+                    (rtlpriv->btcoexist.bt_pre_rssi_state ==
+                     BT_RSSI_STATE_STAY_LOW)) {
+                        if (undecoratedsmoothed_pwdb >=
+                            (rssi_thresh + BT_FW_COEX_THRESH_TOL)) {
                                 bt_rssi_state = BT_RSSI_STATE_HIGH;
-                                rtlpcipriv->bt_coexist.cstate |=
+                                rtlpriv->btcoexist.cstate |=
                                         BT_COEX_STATE_WIFI_RSSI_1_HIGH;
-                                rtlpcipriv->bt_coexist.cstate &=
+                                rtlpriv->btcoexist.cstate &=
                                         ~BT_COEX_STATE_WIFI_RSSI_1_LOW;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI_1 state switch to High\n");
@@ -130,12 +132,12 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
                                          "[DM][BT], RSSI_1 state stay at Low\n");
                         }
                 } else {
-                        if (smooth < rssi_thresh) {
+                        if (undecoratedsmoothed_pwdb < rssi_thresh) {
                                 bt_rssi_state = BT_RSSI_STATE_LOW;
-                                rtlpcipriv->bt_coexist.cstate |=
-                                         BT_COEX_STATE_WIFI_RSSI_1_LOW;
-                                rtlpcipriv->bt_coexist.cstate &=
-                                         ~BT_COEX_STATE_WIFI_RSSI_1_HIGH;
+                                rtlpriv->btcoexist.cstate |=
+                                        BT_COEX_STATE_WIFI_RSSI_1_LOW;
+                                rtlpriv->btcoexist.cstate &=
+                                        ~BT_COEX_STATE_WIFI_RSSI_1_HIGH;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI_1 state switch to Low\n");
                         } else {
@@ -148,22 +150,22 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
                 if (rssi_thresh > rssi_thresh1) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                  "[DM][BT], RSSI_1 thresh error!!\n");
-                        return rtlpcipriv->bt_coexist.bt_pre_rssi_state;
+                        return rtlpriv->btcoexist.bt_pre_rssi_state;
                 }
 
-                if ((rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                    BT_RSSI_STATE_LOW) ||
-                    (rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                    BT_RSSI_STATE_STAY_LOW)) {
-                        if (smooth >=
+                if ((rtlpriv->btcoexist.bt_pre_rssi_state ==
+                     BT_RSSI_STATE_LOW) ||
+                    (rtlpriv->btcoexist.bt_pre_rssi_state ==
+                     BT_RSSI_STATE_STAY_LOW)) {
+                        if (undecoratedsmoothed_pwdb >=
                             (rssi_thresh+BT_FW_COEX_THRESH_TOL)) {
                                 bt_rssi_state = BT_RSSI_STATE_MEDIUM;
-                                rtlpcipriv->bt_coexist.cstate |=
-                                         BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;
-                                rtlpcipriv->bt_coexist.cstate &=
-                                         ~BT_COEX_STATE_WIFI_RSSI_1_LOW;
-                                rtlpcipriv->bt_coexist.cstate &=
-                                         ~BT_COEX_STATE_WIFI_RSSI_1_HIGH;
+                                rtlpriv->btcoexist.cstate |=
+                                        BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;
+                                rtlpriv->btcoexist.cstate &=
+                                        ~BT_COEX_STATE_WIFI_RSSI_1_LOW;
+                                rtlpriv->btcoexist.cstate &=
+                                        ~BT_COEX_STATE_WIFI_RSSI_1_HIGH;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI_1 state switch to Medium\n");
                         } else {
@@ -171,28 +173,28 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI_1 state stay at Low\n");
                         }
-                } else if ((rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                           BT_RSSI_STATE_MEDIUM) ||
-                           (rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                           BT_RSSI_STATE_STAY_MEDIUM)) {
-                        if (smooth >= (rssi_thresh1 +
-                            BT_FW_COEX_THRESH_TOL)) {
+                } else if ((rtlpriv->btcoexist.bt_pre_rssi_state ==
+                            BT_RSSI_STATE_MEDIUM) ||
+                           (rtlpriv->btcoexist.bt_pre_rssi_state ==
+                            BT_RSSI_STATE_STAY_MEDIUM)) {
+                        if (undecoratedsmoothed_pwdb >=
+                            (rssi_thresh1 + BT_FW_COEX_THRESH_TOL)) {
                                 bt_rssi_state = BT_RSSI_STATE_HIGH;
-                                rtlpcipriv->bt_coexist.cstate |=
-                                         BT_COEX_STATE_WIFI_RSSI_1_HIGH;
-                                rtlpcipriv->bt_coexist.cstate &=
-                                         ~BT_COEX_STATE_WIFI_RSSI_1_LOW;
-                                rtlpcipriv->bt_coexist.cstate &=
-                                         ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;
+                                rtlpriv->btcoexist.cstate |=
+                                        BT_COEX_STATE_WIFI_RSSI_1_HIGH;
+                                rtlpriv->btcoexist.cstate &=
+                                        ~BT_COEX_STATE_WIFI_RSSI_1_LOW;
+                                rtlpriv->btcoexist.cstate &=
+                                        ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI_1 state switch to High\n");
-                        } else if (smooth < rssi_thresh) {
+                        } else if (undecoratedsmoothed_pwdb < rssi_thresh) {
                                 bt_rssi_state = BT_RSSI_STATE_LOW;
-                                rtlpcipriv->bt_coexist.cstate |=
+                                rtlpriv->btcoexist.cstate |=
                                         BT_COEX_STATE_WIFI_RSSI_1_LOW;
-                                rtlpcipriv->bt_coexist.cstate &=
+                                rtlpriv->btcoexist.cstate &=
                                         ~BT_COEX_STATE_WIFI_RSSI_1_HIGH;
-                                rtlpcipriv->bt_coexist.cstate &=
+                                rtlpriv->btcoexist.cstate &=
                                         ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI_1 state switch to Low\n");
@@ -202,13 +204,13 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
                                          "[DM][BT], RSSI_1 state stay at Medium\n");
                         }
                 } else {
-                        if (smooth < rssi_thresh1) {
+                        if (undecoratedsmoothed_pwdb < rssi_thresh1) {
                                 bt_rssi_state = BT_RSSI_STATE_MEDIUM;
-                                rtlpcipriv->bt_coexist.cstate |=
+                                rtlpriv->btcoexist.cstate |=
                                         BT_COEX_STATE_WIFI_RSSI_1_MEDIUM;
-                                rtlpcipriv->bt_coexist.cstate &=
+                                rtlpriv->btcoexist.cstate &=
                                         ~BT_COEX_STATE_WIFI_RSSI_1_HIGH;
-                                rtlpcipriv->bt_coexist.cstate &=
+                                rtlpriv->btcoexist.cstate &=
                                         ~BT_COEX_STATE_WIFI_RSSI_1_LOW;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI_1 state switch to Medium\n");
@@ -219,38 +221,37 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
                         }
                 }
         }
-
-        rtlpcipriv->bt_coexist.bt_pre_rssi_state1 = bt_rssi_state;
+        rtlpriv->btcoexist.bt_pre_rssi_state1 = bt_rssi_state;
 
         return bt_rssi_state;
 }
 
-u8 rtl8723ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
-                                         u8 level_num, u8 rssi_thresh,
-                                         u8 rssi_thresh1)
+u8 rtl8723e_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
+                                        u8 level_num,
+                                        u8 rssi_thresh,
+                                        u8 rssi_thresh1)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        long smooth;
+        long undecoratedsmoothed_pwdb = 0;
         u8 bt_rssi_state = 0;
 
-        smooth = rtl8723ae_dm_bt_get_rx_ss(hw);
+        undecoratedsmoothed_pwdb = rtl8723e_dm_bt_get_rx_ss(hw);
 
         if (level_num == 2) {
-                rtlpcipriv->bt_coexist.cstate &=
-                                         ~BT_COEX_STATE_WIFI_RSSI_MEDIUM;
-
-                if ((rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                    BT_RSSI_STATE_LOW) ||
-                    (rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                    BT_RSSI_STATE_STAY_LOW)){
-                        if (smooth >=
+                rtlpriv->btcoexist.cstate &=
+                        ~BT_COEX_STATE_WIFI_RSSI_MEDIUM;
+
+                if ((rtlpriv->btcoexist.bt_pre_rssi_state ==
+                     BT_RSSI_STATE_LOW) ||
+                    (rtlpriv->btcoexist.bt_pre_rssi_state ==
+                     BT_RSSI_STATE_STAY_LOW)) {
+                        if (undecoratedsmoothed_pwdb >=
                             (rssi_thresh + BT_FW_COEX_THRESH_TOL)) {
                                 bt_rssi_state = BT_RSSI_STATE_HIGH;
-                                rtlpcipriv->bt_coexist.cstate |=
-                                        BT_COEX_STATE_WIFI_RSSI_HIGH;
-                                rtlpcipriv->bt_coexist.cstate &=
-                                        ~BT_COEX_STATE_WIFI_RSSI_LOW;
+                                rtlpriv->btcoexist.cstate
+                                        |= BT_COEX_STATE_WIFI_RSSI_HIGH;
+                                rtlpriv->btcoexist.cstate
+                                        &= ~BT_COEX_STATE_WIFI_RSSI_LOW;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI state switch to High\n");
                         } else {
@@ -259,12 +260,12 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
                                          "[DM][BT], RSSI state stay at Low\n");
                         }
                 } else {
-                        if (smooth < rssi_thresh) {
+                        if (undecoratedsmoothed_pwdb < rssi_thresh) {
                                 bt_rssi_state = BT_RSSI_STATE_LOW;
-                                rtlpcipriv->bt_coexist.cstate |=
-                                        BT_COEX_STATE_WIFI_RSSI_LOW;
-                                rtlpcipriv->bt_coexist.cstate &=
-                                        ~BT_COEX_STATE_WIFI_RSSI_HIGH;
+                                rtlpriv->btcoexist.cstate
+                                        |= BT_COEX_STATE_WIFI_RSSI_LOW;
+                                rtlpriv->btcoexist.cstate
+                                        &= ~BT_COEX_STATE_WIFI_RSSI_HIGH;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI state switch to Low\n");
                         } else {
@@ -277,20 +278,20 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
                 if (rssi_thresh > rssi_thresh1) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                  "[DM][BT], RSSI thresh error!!\n");
-                        return rtlpcipriv->bt_coexist.bt_pre_rssi_state;
+                        return rtlpriv->btcoexist.bt_pre_rssi_state;
                 }
-                if ((rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                    BT_RSSI_STATE_LOW) ||
-                    (rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                    BT_RSSI_STATE_STAY_LOW)) {
-                        if (smooth >=
+                if ((rtlpriv->btcoexist.bt_pre_rssi_state ==
+                     BT_RSSI_STATE_LOW) ||
+                    (rtlpriv->btcoexist.bt_pre_rssi_state ==
+                     BT_RSSI_STATE_STAY_LOW)) {
+                        if (undecoratedsmoothed_pwdb >=
                             (rssi_thresh + BT_FW_COEX_THRESH_TOL)) {
                                 bt_rssi_state = BT_RSSI_STATE_MEDIUM;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         |= BT_COEX_STATE_WIFI_RSSI_MEDIUM;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         &= ~BT_COEX_STATE_WIFI_RSSI_LOW;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         &= ~BT_COEX_STATE_WIFI_RSSI_HIGH;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI state switch to Medium\n");
@@ -299,28 +300,28 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI state stay at Low\n");
                         }
-                } else if ((rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                           BT_RSSI_STATE_MEDIUM) ||
-                           (rtlpcipriv->bt_coexist.bt_pre_rssi_state ==
-                           BT_RSSI_STATE_STAY_MEDIUM)) {
-                        if (smooth >=
+                } else if ((rtlpriv->btcoexist.bt_pre_rssi_state ==
+                                BT_RSSI_STATE_MEDIUM) ||
+                        (rtlpriv->btcoexist.bt_pre_rssi_state ==
+                                BT_RSSI_STATE_STAY_MEDIUM)) {
+                        if (undecoratedsmoothed_pwdb >=
                             (rssi_thresh1 + BT_FW_COEX_THRESH_TOL)) {
                                 bt_rssi_state = BT_RSSI_STATE_HIGH;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         |= BT_COEX_STATE_WIFI_RSSI_HIGH;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         &= ~BT_COEX_STATE_WIFI_RSSI_LOW;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         &= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI state switch to High\n");
-                        } else if (smooth < rssi_thresh) {
+                        } else if (undecoratedsmoothed_pwdb < rssi_thresh) {
                                 bt_rssi_state = BT_RSSI_STATE_LOW;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         |= BT_COEX_STATE_WIFI_RSSI_LOW;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         &= ~BT_COEX_STATE_WIFI_RSSI_HIGH;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         &= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI state switch to Low\n");
@@ -330,13 +331,13 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
                                          "[DM][BT], RSSI state stay at Medium\n");
                         }
                 } else {
-                        if (smooth < rssi_thresh1) {
+                        if (undecoratedsmoothed_pwdb < rssi_thresh1) {
                                 bt_rssi_state = BT_RSSI_STATE_MEDIUM;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         |= BT_COEX_STATE_WIFI_RSSI_MEDIUM;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         &= ~BT_COEX_STATE_WIFI_RSSI_HIGH;
-                                rtlpcipriv->bt_coexist.cstate
+                                rtlpriv->btcoexist.cstate
                                         &= ~BT_COEX_STATE_WIFI_RSSI_LOW;
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                          "[DM][BT], RSSI state switch to Medium\n");
@@ -347,31 +348,32 @@ u8 rtl8723ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
                         }
                 }
         }
-
-        rtlpcipriv->bt_coexist.bt_pre_rssi_state = bt_rssi_state;
+        rtlpriv->btcoexist.bt_pre_rssi_state = bt_rssi_state;
         return bt_rssi_state;
 }
 
-long rtl8723ae_dm_bt_get_rx_ss(struct ieee80211_hw *hw)
+long rtl8723e_dm_bt_get_rx_ss(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        long smooth = 0;
-
-        if (rtlpriv->mac80211.link_state >= MAC80211_LINKED)
-                smooth = GET_UNDECORATED_AVERAGE_RSSI(rtlpriv);
-        else
-                smooth = rtlpriv->dm.entry_min_undec_sm_pwdb;
+        long undecoratedsmoothed_pwdb = 0;
 
+        if (rtlpriv->mac80211.link_state >= MAC80211_LINKED) {
+                undecoratedsmoothed_pwdb =
+                        GET_UNDECORATED_AVERAGE_RSSI(rtlpriv);
+        } else {
+                undecoratedsmoothed_pwdb
+                        = rtlpriv->dm.entry_min_undec_sm_pwdb;
+        }
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "rtl8723ae_dm_bt_get_rx_ss() = %ld\n", smooth);
+                 "rtl8723e_dm_bt_get_rx_ss() = %ld\n",
+                 undecoratedsmoothed_pwdb);
 
-        return smooth;
+        return undecoratedsmoothed_pwdb;
 }
 
-void rtl8723ae_dm_bt_balance(struct ieee80211_hw *hw,
-                             bool balance_on, u8 ms0, u8 ms1)
+void rtl8723e_dm_bt_balance(struct ieee80211_hw *hw,
+                            bool balance_on, u8 ms0, u8 ms1)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 h2c_parameter[3] = {0};
 
@@ -379,27 +381,26 @@ void rtl8723ae_dm_bt_balance(struct ieee80211_hw *hw,
                 h2c_parameter[2] = 1;
                 h2c_parameter[1] = ms1;
                 h2c_parameter[0] = ms0;
-                rtlpcipriv->bt_coexist.fw_coexist_all_off = false;
+                rtlpriv->btcoexist.fw_coexist_all_off = false;
         } else {
                 h2c_parameter[2] = 0;
                 h2c_parameter[1] = 0;
                 h2c_parameter[0] = 0;
         }
-        rtlpcipriv->bt_coexist.balance_on = balance_on;
+        rtlpriv->btcoexist.balance_on = balance_on;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                  "[DM][BT], Balance=[%s:%dms:%dms], write 0xc=0x%x\n",
-                 balance_on ? "ON" : "OFF", ms0, ms1,
-                 h2c_parameter[0]<<16 | h2c_parameter[1]<<8 | h2c_parameter[2]);
+                 balance_on ? "ON" : "OFF", ms0, ms1, h2c_parameter[0]<<16 |
+                 h2c_parameter[1]<<8 | h2c_parameter[2]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0xc, 3, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0xc, 3, h2c_parameter);
 }
 
 
-void rtl8723ae_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type)
+void rtl8723e_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
 
         if (type == BT_AGCTABLE_OFF) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
@@ -410,15 +411,15 @@ void rtl8723ae_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type)
                 rtl_write_dword(rtlpriv, 0xc78, 0x611f0001);
                 rtl_write_dword(rtlpriv, 0xc78, 0x60200001);
 
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_AGC_HP, 0xfffff, 0x32000);
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_AGC_HP, 0xfffff, 0x71000);
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_AGC_HP, 0xfffff, 0xb0000);
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_AGC_HP, 0xfffff, 0xfc000);
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_G1, 0xfffff, 0x30355);
         } else if (type == BT_AGCTABLE_ON) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
@@ -429,25 +430,24 @@ void rtl8723ae_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type)
                 rtl_write_dword(rtlpriv, 0xc78, 0x4b1f0001);
                 rtl_write_dword(rtlpriv, 0xc78, 0x4a200001);
 
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_AGC_HP, 0xfffff, 0xdc000);
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_AGC_HP, 0xfffff, 0x90000);
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_AGC_HP, 0xfffff, 0x51000);
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_AGC_HP, 0xfffff, 0x12000);
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A,
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A,
                                         RF_RX_G1, 0xfffff, 0x00355);
 
-                rtlpcipriv->bt_coexist.sw_coexist_all_off = false;
+                rtlpriv->btcoexist.sw_coexist_all_off = false;
         }
 }
 
-void rtl8723ae_dm_bt_bback_off_level(struct ieee80211_hw *hw, u8 type)
+void rtl8723e_dm_bt_bb_back_off_level(struct ieee80211_hw *hw, u8 type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
 
         if (type == BT_BB_BACKOFF_OFF) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
@@ -457,87 +457,81 @@ void rtl8723ae_dm_bt_bback_off_level(struct ieee80211_hw *hw, u8 type)
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "[BT]BBBackOffLevel On!\n");
                 rtl_write_dword(rtlpriv, 0xc04, 0x3a07611);
-                rtlpcipriv->bt_coexist.sw_coexist_all_off = false;
+                rtlpriv->btcoexist.sw_coexist_all_off = false;
         }
 }
 
-void rtl8723ae_dm_bt_fw_coex_all_off(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_fw_coex_all_off(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "rtl8723ae_dm_bt_fw_coex_all_off()\n");
+                 "rtl8723e_dm_bt_fw_coex_all_off()\n");
 
-        if (rtlpcipriv->bt_coexist.fw_coexist_all_off)
+        if (rtlpriv->btcoexist.fw_coexist_all_off)
                 return;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "rtl8723ae_dm_bt_fw_coex_all_off(), real Do\n");
-        rtl8723ae_dm_bt_fw_coex_all_off_8723a(hw);
-        rtlpcipriv->bt_coexist.fw_coexist_all_off = true;
+                 "rtl8723e_dm_bt_fw_coex_all_off(), real Do\n");
+        rtl8723e_dm_bt_fw_coex_all_off_8723a(hw);
+        rtlpriv->btcoexist.fw_coexist_all_off = true;
 }
 
-void rtl8723ae_dm_bt_sw_coex_all_off(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_sw_coex_all_off(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "rtl8723ae_dm_bt_sw_coex_all_off()\n");
+                 "rtl8723e_dm_bt_sw_coex_all_off()\n");
 
-        if (rtlpcipriv->bt_coexist.sw_coexist_all_off)
+        if (rtlpriv->btcoexist.sw_coexist_all_off)
                 return;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "rtl8723ae_dm_bt_sw_coex_all_off(), real Do\n");
-        rtl8723ae_dm_bt_sw_coex_all_off_8723a(hw);
-        rtlpcipriv->bt_coexist.sw_coexist_all_off = true;
+                 "rtl8723e_dm_bt_sw_coex_all_off(), real Do\n");
+        rtl8723e_dm_bt_sw_coex_all_off_8723a(hw);
+        rtlpriv->btcoexist.sw_coexist_all_off = true;
 }
 
-void rtl8723ae_dm_bt_hw_coex_all_off(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_hw_coex_all_off(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "rtl8723ae_dm_bt_hw_coex_all_off()\n");
+                 "rtl8723e_dm_bt_hw_coex_all_off()\n");
 
-        if (rtlpcipriv->bt_coexist.hw_coexist_all_off)
+        if (rtlpriv->btcoexist.hw_coexist_all_off)
                 return;
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "rtl8723ae_dm_bt_hw_coex_all_off(), real Do\n");
+                 "rtl8723e_dm_bt_hw_coex_all_off(), real Do\n");
 
-        rtl8723ae_dm_bt_hw_coex_all_off_8723a(hw);
+        rtl8723e_dm_bt_hw_coex_all_off_8723a(hw);
 
-        rtlpcipriv->bt_coexist.hw_coexist_all_off = true;
+        rtlpriv->btcoexist.hw_coexist_all_off = true;
 }
 
-void rtl8723ae_btdm_coex_all_off(struct ieee80211_hw *hw)
+void rtl8723e_btdm_coex_all_off(struct ieee80211_hw *hw)
 {
-        rtl8723ae_dm_bt_fw_coex_all_off(hw);
-        rtl8723ae_dm_bt_sw_coex_all_off(hw);
-        rtl8723ae_dm_bt_hw_coex_all_off(hw);
+        rtl8723e_dm_bt_fw_coex_all_off(hw);
+        rtl8723e_dm_bt_sw_coex_all_off(hw);
+        rtl8723e_dm_bt_hw_coex_all_off(hw);
 }
 
-bool rtl8723ae_dm_bt_is_coexist_state_changed(struct ieee80211_hw *hw)
+bool rtl8723e_dm_bt_is_coexist_state_changed(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        if ((rtlpcipriv->bt_coexist.previous_state ==
-            rtlpcipriv->bt_coexist.cstate) &&
-            (rtlpcipriv->bt_coexist.previous_state_h ==
-            rtlpcipriv->bt_coexist.cstate_h))
+        if ((rtlpriv->btcoexist.previous_state == rtlpriv->btcoexist.cstate) &&
+            (rtlpriv->btcoexist.previous_state_h ==
+             rtlpriv->btcoexist.cstate_h))
                 return false;
-        else
-                return true;
+        return true;
 }
 
-bool rtl8723ae_dm_bt_is_wifi_up_link(struct ieee80211_hw *hw)
+bool rtl8723e_dm_bt_is_wifi_up_link(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         if (rtlpriv->link_info.tx_busy_traffic)
                 return true;
-        else
-                return false;
+        return false;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.h b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.h
index 76f4d122dbc1..bcd64a22acc0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.h
@@ -53,8 +53,8 @@
 #define BT_COEX_STATE_WIFI_LEGACY               BIT(3)
 
 #define BT_COEX_STATE_WIFI_RSSI_LOW             BIT(4)
-#define BT_COEX_STATE_WIFI_RSSI_MEDIUM          BIT(5)
-#define BT_COEX_STATE_WIFI_RSSI_HIGH            BIT(6)
+#define BT_COEX_STATE_WIFI_RSSI_MEDIUM  BIT(5)
+#define BT_COEX_STATE_WIFI_RSSI_HIGH    BIT(6)
 #define BT_COEX_STATE_DEC_BT_POWER              BIT(7)
 
 #define BT_COEX_STATE_WIFI_IDLE                 BIT(8)
@@ -78,7 +78,7 @@
 #define BT_COEX_STATE_WIFI_RSSI_1_MEDIUM        BIT(25)
 #define BT_COEX_STATE_WIFI_RSSI_1_HIGH          BIT(26)
 
-#define BT_COEX_STATE_BTINFO_COMMON             BIT(30)
+#define BT_COEX_STATE_BTINFO_COMMON                     BIT(30)
 #define BT_COEX_STATE_BTINFO_B_HID_SCOESCO      BIT(31)
 #define BT_COEX_STATE_BTINFO_B_FTP_A2DP         BIT(29)
 
@@ -133,28 +133,26 @@
 #define BTINFO_B_SCO_ESCO                       BIT(1)
 #define BTINFO_B_CONNECTION                     BIT(0)
 
+void rtl8723e_btdm_coex_all_off(struct ieee80211_hw *hw);
+void rtl8723e_dm_bt_fw_coex_all_off(struct ieee80211_hw *hw);
 
-void rtl8723ae_btdm_coex_all_off(struct ieee80211_hw *hw);
-void rtl8723ae_dm_bt_fw_coex_all_off(struct ieee80211_hw *hw);
-
-void rtl8723ae_dm_bt_sw_coex_all_off(struct ieee80211_hw *hw);
-void rtl8723ae_dm_bt_hw_coex_all_off(struct ieee80211_hw *hw);
-long rtl8723ae_dm_bt_get_rx_ss(struct ieee80211_hw *hw);
-void rtl8723ae_dm_bt_balance(struct ieee80211_hw *hw,
+void rtl8723e_dm_bt_sw_coex_all_off(struct ieee80211_hw *hw);
+void rtl8723e_dm_bt_hw_coex_all_off(struct ieee80211_hw *hw);
+long rtl8723e_dm_bt_get_rx_ss(struct ieee80211_hw *hw);
+void rtl8723e_dm_bt_balance(struct ieee80211_hw *hw,
                             bool balance_on, u8 ms0, u8 ms1);
-void rtl8723ae_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type);
-void rtl8723ae_dm_bt_bback_off_level(struct ieee80211_hw *hw, u8 type);
-u8 rtl8723ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
+void rtl8723e_dm_bt_agc_table(struct ieee80211_hw *hw, u8 tyep);
+void rtl8723e_dm_bt_bb_back_off_level(struct ieee80211_hw *hw, u8 type);
+u8 rtl8723e_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw,
                                         u8 level_num, u8 rssi_thresh,
                                         u8 rssi_thresh1);
-u8 rtl8723ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
-                                         u8  level_num, u8 rssi_thresh,
+u8 rtl8723e_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
+                                         u8 level_num, u8 rssi_thresh,
                                          u8 rssi_thresh1);
 void _rtl8723_dm_bt_check_wifi_state(struct ieee80211_hw *hw);
-void rtl8723ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw,
-                                                bool reject);
-
-bool rtl8723ae_dm_bt_is_coexist_state_changed(struct ieee80211_hw *hw);
-bool rtl8723ae_dm_bt_is_wifi_up_link(struct ieee80211_hw *hw);
+void rtl8723e_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw,
+                                                bool b_reject);
+bool rtl8723e_dm_bt_is_coexist_state_changed(struct ieee80211_hw *hw);
+bool rtl8723e_dm_bt_is_wifi_up_link(struct ieee80211_hw *hw);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c
index f76c50f5ab80..00a0531cc5f4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -25,34 +21,33 @@
  *
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
- ****************************************************************************
- */
+ *****************************************************************************/
 #include "hal_btc.h"
 #include "../pci.h"
 #include "phy.h"
-#include "../rtl8723com/phy_common.h"
 #include "fw.h"
-#include "../rtl8723com/fw_common.h"
 #include "reg.h"
 #include "def.h"
+#include "../rtl8723com/phy_common.h"
+
+static struct bt_coexist_8723 hal_coex_8723;
 
-void rtl8723ae_bt_coex_off_before_lps(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_turn_off_bt_coexist_before_enter_lps(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
 
-        if (!rtlpcipriv->bt_coexist.bt_coexistence)
+        if (!rtlpriv->btcoexist.bt_coexistence)
                 return;
 
         if (ppsc->inactiveps) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BT][DM], Before enter IPS, turn off all Coexist DM\n");
-                rtlpcipriv->bt_coexist.cstate = 0;
-                rtlpcipriv->bt_coexist.previous_state = 0;
-                rtlpcipriv->bt_coexist.cstate_h = 0;
-                rtlpcipriv->bt_coexist.previous_state_h = 0;
-                rtl8723ae_btdm_coex_all_off(hw);
+                        "[BT][DM], Before enter IPS, turn off all Coexist DM\n");
+                rtlpriv->btcoexist.cstate = 0;
+                rtlpriv->btcoexist.previous_state = 0;
+                rtlpriv->btcoexist.cstate_h = 0;
+                rtlpriv->btcoexist.previous_state_h = 0;
+                rtl8723e_btdm_coex_all_off(hw);
         }
 }
 
@@ -60,10 +55,8 @@ static enum rt_media_status mgnt_link_status_query(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        enum rt_media_status m_status = RT_MEDIA_DISCONNECT;
-
+        enum rt_media_status    m_status = RT_MEDIA_DISCONNECT;
         u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;
-
         if (bibss || rtlpriv->mac80211.link_state >= MAC80211_LINKED)
                 m_status = RT_MEDIA_CONNECT;
 
@@ -71,15 +64,14 @@ static enum rt_media_status mgnt_link_status_query(struct ieee80211_hw *hw)
 }
 
 void rtl_8723e_bt_wifi_media_status_notify(struct ieee80211_hw *hw,
-                                           bool mstatus)
+                                                bool mstatus)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         u8 h2c_parameter[3] = {0};
         u8 chnl;
 
-        if (!rtlpcipriv->bt_coexist.bt_coexistence)
+        if (!rtlpriv->btcoexist.bt_coexistence)
                 return;
 
         if (RT_MEDIA_CONNECT == mstatus)
@@ -98,14 +90,13 @@ void rtl_8723e_bt_wifi_media_status_notify(struct ieee80211_hw *hw,
                 h2c_parameter[2] = 0x20;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                 "[BTCoex], FW write 0x19 = 0x%x\n",
+                 "[BTCoex], FW write 0x19=0x%x\n",
                  h2c_parameter[0]<<16|h2c_parameter[1]<<8|h2c_parameter[2]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x19, 3, h2c_parameter);
-
+        rtl8723e_fill_h2c_cmd(hw, 0x19, 3, h2c_parameter);
 }
 
-static bool rtl8723ae_dm_bt_is_wifi_busy(struct ieee80211_hw *hw)
+static bool rtl8723e_dm_bt_is_wifi_busy(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         if (rtlpriv->link_info.busytraffic ||
@@ -116,12 +107,12 @@ static bool rtl8723ae_dm_bt_is_wifi_busy(struct ieee80211_hw *hw)
                 return false;
 }
 
-static void rtl8723ae_dm_bt_set_fw_3a(struct ieee80211_hw *hw,
-                                      u8 byte1, u8 byte2, u8 byte3,
-                                      u8 byte4, u8 byte5)
+static void rtl8723e_dm_bt_set_fw_3a(struct ieee80211_hw *hw,
+                                     u8 byte1, u8 byte2, u8 byte3, u8 byte4,
+                                     u8 byte5)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 h2c_parameter[5] = {0};
+        u8 h2c_parameter[5];
 
         h2c_parameter[0] = byte1;
         h2c_parameter[1] = byte2;
@@ -129,37 +120,37 @@ static void rtl8723ae_dm_bt_set_fw_3a(struct ieee80211_hw *hw,
         h2c_parameter[3] = byte4;
         h2c_parameter[4] = byte5;
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], FW write 0x3a(4bytes) = 0x%x%8x\n",
-                 h2c_parameter[0], h2c_parameter[1]<<24 | h2c_parameter[2]<<16 |
-                 h2c_parameter[3]<<8 | h2c_parameter[4]);
-        rtl8723ae_fill_h2c_cmd(hw, 0x3a, 5, h2c_parameter);
+                "[BTCoex], FW write 0x3a(4bytes)=0x%x%8x\n",
+                h2c_parameter[0], h2c_parameter[1]<<24 |
+                h2c_parameter[2]<<16 | h2c_parameter[3]<<8 |
+                h2c_parameter[4]);
+        rtl8723e_fill_h2c_cmd(hw, 0x3a, 5, h2c_parameter);
 }
 
-static bool rtl8723ae_dm_bt_need_to_dec_bt_pwr(struct ieee80211_hw *hw)
+static bool rtl8723e_dm_bt_need_to_dec_bt_pwr(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         if (mgnt_link_status_query(hw) == RT_MEDIA_CONNECT) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "Need to decrease bt power\n");
-                rtlpcipriv->bt_coexist.cstate |= BT_COEX_STATE_DEC_BT_POWER;
-                return true;
+                        "Need to decrease bt power\n");
+                        rtlpriv->btcoexist.cstate |=
+                        BT_COEX_STATE_DEC_BT_POWER;
+                        return true;
         }
 
-        rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_DEC_BT_POWER;
+        rtlpriv->btcoexist.cstate &= ~BT_COEX_STATE_DEC_BT_POWER;
         return false;
 }
 
-static bool rtl8723ae_dm_bt_is_same_coexist_state(struct ieee80211_hw *hw)
+static bool rtl8723e_dm_bt_is_same_coexist_state(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
 
-        if ((rtlpcipriv->bt_coexist.previous_state ==
-            rtlpcipriv->bt_coexist.cstate) &&
-            (rtlpcipriv->bt_coexist.previous_state_h ==
-            rtlpcipriv->bt_coexist.cstate_h)) {
+        if ((rtlpriv->btcoexist.previous_state ==
+             rtlpriv->btcoexist.cstate) &&
+            (rtlpriv->btcoexist.previous_state_h ==
+             rtlpriv->btcoexist.cstate_h)) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "[DM][BT], Coexist state do not chang!!\n");
                 return true;
@@ -170,86 +161,84 @@ static bool rtl8723ae_dm_bt_is_same_coexist_state(struct ieee80211_hw *hw)
         }
 }
 
-static void rtl8723ae_dm_bt_set_coex_table(struct ieee80211_hw *hw,
-                                           u32 val_0x6c0, u32 val_0x6c8,
-                                           u32 val_0x6cc)
+static void rtl8723e_dm_bt_set_coex_table(struct ieee80211_hw *hw,
+                                          u32 val_0x6c0, u32 val_0x6c8,
+                                          u32 val_0x6cc)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "set coex table, set 0x6c0 = 0x%x\n", val_0x6c0);
+                 "set coex table, set 0x6c0=0x%x\n", val_0x6c0);
         rtl_write_dword(rtlpriv, 0x6c0, val_0x6c0);
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "set coex table, set 0x6c8 = 0x%x\n", val_0x6c8);
+                 "set coex table, set 0x6c8=0x%x\n", val_0x6c8);
         rtl_write_dword(rtlpriv, 0x6c8, val_0x6c8);
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "set coex table, set 0x6cc = 0x%x\n", val_0x6cc);
+                 "set coex table, set 0x6cc=0x%x\n", val_0x6cc);
         rtl_write_byte(rtlpriv, 0x6cc, val_0x6cc);
 }
 
-static void rtl8723ae_dm_bt_set_hw_pta_mode(struct ieee80211_hw *hw, bool mode)
+static void rtl8723e_dm_bt_set_hw_pta_mode(struct ieee80211_hw *hw, bool b_mode)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        if (BT_PTA_MODE_ON == mode) {
+        if (BT_PTA_MODE_ON == b_mode) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE, "PTA mode on, ");
                 /*  Enable GPIO 0/1/2/3/8 pins for bt */
                 rtl_write_byte(rtlpriv, 0x40, 0x20);
-                rtlpcipriv->bt_coexist.hw_coexist_all_off = false;
+                rtlpriv->btcoexist.hw_coexist_all_off = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE, "PTA mode off\n");
                 rtl_write_byte(rtlpriv, 0x40, 0x0);
         }
 }
 
-static void rtl8723ae_dm_bt_set_sw_rf_rx_lpf_corner(struct ieee80211_hw *hw,
-                                                    u8 type)
+static void rtl8723e_dm_bt_set_sw_rf_rx_lpf_corner(struct ieee80211_hw *hw,
+                                                   u8 type)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         if (BT_RF_RX_LPF_CORNER_SHRINK == type) {
-                /* Shrink RF Rx LPF corner, 0x1e[7:4]=1111 ==> [11:4] by Jenyu*/
+                /* Shrink RF Rx LPF corner, 0x1e[7:4]=1111 ==> [11:4] */
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "Shrink RF Rx LPF corner!!\n");
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A, 0x1e, 0xfffff,
-                                        0xf0ff7);
-                rtlpcipriv->bt_coexist.sw_coexist_all_off = false;
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A, 0x1e,
+                                        0xfffff, 0xf0ff7);
+                rtlpriv->btcoexist.sw_coexist_all_off = false;
         } else if (BT_RF_RX_LPF_CORNER_RESUME == type) {
                 /*Resume RF Rx LPF corner*/
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "Resume RF Rx LPF corner!!\n");
-                rtl8723ae_phy_set_rf_reg(hw, RF90_PATH_A, 0x1e, 0xfffff,
-                        rtlpcipriv->bt_coexist.bt_rfreg_origin_1e);
+                rtl8723e_phy_set_rf_reg(hw, RF90_PATH_A, 0x1e, 0xfffff,
+                                        rtlpriv->btcoexist.bt_rfreg_origin_1e);
         }
 }
 
-static void rtl8723ae_bt_set_penalty_tx_rate_adap(struct ieee80211_hw *hw,
-                                                  u8 ra_type)
+static void dm_bt_set_sw_penalty_tx_rate_adapt(struct ieee80211_hw *hw,
+                                               u8 ra_type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
-        u8 tmu1;
+        u8 tmp_u1;
 
-        tmu1 = rtl_read_byte(rtlpriv, 0x4fd);
-        tmu1 |= BIT(0);
+        tmp_u1 = rtl_read_byte(rtlpriv, 0x4fd);
+        tmp_u1 |= BIT(0);
         if (BT_TX_RATE_ADAPTIVE_LOW_PENALTY == ra_type) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "Tx rate adaptive, set low penalty!!\n");
-                tmu1 &= ~BIT(2);
-                rtlpcipriv->bt_coexist.sw_coexist_all_off = false;
+                        "Tx rate adaptive, set low penalty!!\n");
+                tmp_u1 &= ~BIT(2);
+                rtlpriv->btcoexist.sw_coexist_all_off = false;
         } else if (BT_TX_RATE_ADAPTIVE_NORMAL == ra_type) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "Tx rate adaptive, set normal!!\n");
-                tmu1 |= BIT(2);
+                        "Tx rate adaptive, set normal!!\n");
+                tmp_u1 |= BIT(2);
         }
-        rtl_write_byte(rtlpriv, 0x4fd, tmu1);
+
+        rtl_write_byte(rtlpriv, 0x4fd, tmp_u1);
 }
 
-static void rtl8723ae_dm_bt_btdm_structure_reload(struct ieee80211_hw *hw,
+static void rtl8723e_dm_bt_btdm_structure_reload(struct ieee80211_hw *hw,
                                                  struct btdm_8723 *btdm)
 {
         btdm->all_off = false;
@@ -292,32 +281,31 @@ static void rtl8723ae_dm_bt_btdm_structure_reload(struct ieee80211_hw *hw,
         btdm->dec_bt_pwr = false;
 }
 
-static void dm_bt_btdm_structure_reload_all_off(struct ieee80211_hw *hw,
-                                                struct btdm_8723 *btdm)
+static void rtl8723e_dm_bt_btdm_structure_reload_all_off(struct ieee80211_hw *hw,
+                                                         struct btdm_8723 *btdm)
 {
-        rtl8723ae_dm_bt_btdm_structure_reload(hw, btdm);
+        rtl8723e_dm_bt_btdm_structure_reload(hw, btdm);
         btdm->all_off = true;
         btdm->pta_on = false;
         btdm->wlan_act_hi = 0x10;
 }
 
-static bool rtl8723ae_dm_bt_is_2_ant_common_action(struct ieee80211_hw *hw)
+static bool rtl8723e_dm_bt_is_2_ant_common_action(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct btdm_8723 btdm8723;
-        bool common = false;
+        bool b_common = false;
 
-        rtl8723ae_dm_bt_btdm_structure_reload(hw, &btdm8723);
+        rtl8723e_dm_bt_btdm_structure_reload(hw, &btdm8723);
 
-        if (!rtl8723ae_dm_bt_is_wifi_busy(hw)
-            && !rtlpcipriv->bt_coexist.bt_busy) {
+        if (!rtl8723e_dm_bt_is_wifi_busy(hw) &&
+            !rtlpriv->btcoexist.bt_busy) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "Wifi idle + Bt idle, bt coex mechanism always off!!\n");
-                dm_bt_btdm_structure_reload_all_off(hw, &btdm8723);
-                common = true;
-        } else if (rtl8723ae_dm_bt_is_wifi_busy(hw)
-                   && !rtlpcipriv->bt_coexist.bt_busy) {
+                rtl8723e_dm_bt_btdm_structure_reload_all_off(hw, &btdm8723);
+                b_common = true;
+        } else if (rtl8723e_dm_bt_is_wifi_busy(hw) &&
+                   !rtlpriv->btcoexist.bt_busy) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "Wifi non-idle + Bt disabled/idle!!\n");
                 btdm8723.low_penalty_rate_adaptive = true;
@@ -338,17 +326,17 @@ static bool rtl8723ae_dm_bt_is_2_ant_common_action(struct ieee80211_hw *hw)
                 btdm8723.tdma_dac_swing = TDMA_DAC_SWING_OFF;
                 btdm8723.b2_ant_hid_en = false;
 
-                common = true;
-        } else if (rtlpcipriv->bt_coexist.bt_busy) {
+                b_common = true;
+        } else if (rtlpriv->btcoexist.bt_busy) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "Bt non-idle!\n");
+                        "Bt non-idle!\n");
                 if (mgnt_link_status_query(hw) == RT_MEDIA_CONNECT) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "Wifi connection exist\n");
-                        common = false;
+                                "Wifi connection exist\n");
+                        b_common = false;
                 } else {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "No Wifi connection!\n");
+                                "No Wifi connection!\n");
                         btdm8723.rf_rx_lpf_shrink = true;
                         btdm8723.low_penalty_rate_adaptive = false;
                         btdm8723.reject_aggre_pkt = false;
@@ -367,27 +355,28 @@ static bool rtl8723ae_dm_bt_is_2_ant_common_action(struct ieee80211_hw *hw)
                         btdm8723.tdma_dac_swing = TDMA_DAC_SWING_OFF;
                         btdm8723.b2_ant_hid_en = false;
 
-                        common = true;
+                        b_common = true;
                 }
         }
 
-        if (rtl8723ae_dm_bt_need_to_dec_bt_pwr(hw))
+        if (rtl8723e_dm_bt_need_to_dec_bt_pwr(hw))
                 btdm8723.dec_bt_pwr = true;
 
-        if (common)
-                rtlpcipriv->bt_coexist.cstate |= BT_COEX_STATE_BTINFO_COMMON;
+        if (b_common)
+                rtlpriv->btcoexist.cstate |=
+                        BT_COEX_STATE_BTINFO_COMMON;
 
-        if (common && rtl8723ae_dm_bt_is_coexist_state_changed(hw))
-                rtl8723ae_dm_bt_set_bt_dm(hw, &btdm8723);
+        if (b_common && rtl8723e_dm_bt_is_coexist_state_changed(hw))
+                rtl8723e_dm_bt_set_bt_dm(hw, &btdm8723);
 
-        return common;
+        return b_common;
 }
 
-static void rtl8723ae_dm_bt_set_sw_full_time_dac_swing(struct ieee80211_hw *hw,
-                                                       bool sw_dac_swing_on,
-                                                       u32 sw_dac_swing_lvl)
+static void rtl8723e_dm_bt_set_sw_full_time_dac_swing(
+                struct ieee80211_hw *hw,
+                bool sw_dac_swing_on,
+                u32 sw_dac_swing_lvl)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         if (sw_dac_swing_on) {
@@ -395,7 +384,7 @@ static void rtl8723ae_dm_bt_set_sw_full_time_dac_swing(struct ieee80211_hw *hw,
                          "[BTCoex], SwDacSwing = 0x%x\n", sw_dac_swing_lvl);
                 rtl8723_phy_set_bb_reg(hw, 0x880, 0xff000000,
                                        sw_dac_swing_lvl);
-                rtlpcipriv->bt_coexist.sw_coexist_all_off = false;
+                rtlpriv->btcoexist.sw_coexist_all_off = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "[BTCoex], SwDacSwing Off!\n");
@@ -403,10 +392,9 @@ static void rtl8723ae_dm_bt_set_sw_full_time_dac_swing(struct ieee80211_hw *hw,
         }
 }
 
-static void rtl8723ae_dm_bt_set_fw_dec_bt_pwr(struct ieee80211_hw *hw,
-                                              bool dec_bt_pwr)
+static void rtl8723e_dm_bt_set_fw_dec_bt_pwr(
+                struct ieee80211_hw *hw, bool dec_bt_pwr)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 h2c_parameter[1] = {0};
 
@@ -414,87 +402,86 @@ static void rtl8723ae_dm_bt_set_fw_dec_bt_pwr(struct ieee80211_hw *hw,
 
         if (dec_bt_pwr) {
                 h2c_parameter[0] |= BIT(1);
-                rtlpcipriv->bt_coexist.fw_coexist_all_off = false;
+                rtlpriv->btcoexist.fw_coexist_all_off = false;
         }
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], decrease Bt Power : %s, write 0x21 = 0x%x\n",
+                 "[BTCoex], decrease Bt Power : %s, write 0x21=0x%x\n",
                  (dec_bt_pwr ? "Yes!!" : "No!!"), h2c_parameter[0]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x21, 1, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0x21, 1, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_set_fw_2_ant_hid(struct ieee80211_hw *hw,
-                                            bool enable, bool dac_swing_on)
+static void rtl8723e_dm_bt_set_fw_2_ant_hid(struct ieee80211_hw *hw,
+                                            bool b_enable, bool b_dac_swing_on)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 h2c_parameter[1] = {0};
 
-        if (enable) {
+        if (b_enable) {
                 h2c_parameter[0] |= BIT(0);
-                rtlpcipriv->bt_coexist.fw_coexist_all_off = false;
+                rtlpriv->btcoexist.fw_coexist_all_off = false;
         }
-        if (dac_swing_on)
+        if (b_dac_swing_on)
                 h2c_parameter[0] |= BIT(1); /* Dac Swing default enable */
+
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], turn 2-Ant+HID mode %s, DACSwing:%s, write 0x15 = 0x%x\n",
-                 (enable ? "ON!!" : "OFF!!"), (dac_swing_on ? "ON" : "OFF"),
+                 "[BTCoex], turn 2-Ant+HID mode %s, DACSwing:%s, write 0x15=0x%x\n",
+                 (b_enable ? "ON!!" : "OFF!!"), (b_dac_swing_on ? "ON" : "OFF"),
                  h2c_parameter[0]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x15, 1, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0x15, 1, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_set_fw_tdma_ctrl(struct ieee80211_hw *hw,
-                                             bool enable, u8 ant_num, u8 nav_en,
-                                             u8 dac_swing_en)
+static void rtl8723e_dm_bt_set_fw_tdma_ctrl(struct ieee80211_hw *hw,
+                                            bool b_enable, u8 ant_num,
+                                            u8 nav_en, u8 dac_swing_en)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         u8 h2c_parameter[1] = {0};
         u8 h2c_parameter1[1] = {0};
 
         h2c_parameter[0] = 0;
         h2c_parameter1[0] = 0;
 
-        if (enable) {
+        if (b_enable) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "[BTCoex], set BT PTA update manager to trigger update!!\n");
                 h2c_parameter1[0] |= BIT(0);
 
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "[BTCoex], turn TDMA mode ON!!\n");
+                        "[BTCoex], turn TDMA mode ON!!\n");
                 h2c_parameter[0] |= BIT(0);             /* function enable */
                 if (TDMA_1ANT == ant_num) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TDMA_1ANT\n");
+                        "[BTCoex], TDMA_1ANT\n");
                         h2c_parameter[0] |= BIT(1);
                 } else if (TDMA_2ANT == ant_num) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TDMA_2ANT\n");
+                        "[BTCoex], TDMA_2ANT\n");
                 } else {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], Unknown Ant\n");
+                        "[BTCoex], Unknown Ant\n");
                 }
 
                 if (TDMA_NAV_OFF == nav_en) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TDMA_NAV_OFF\n");
+                        "[BTCoex], TDMA_NAV_OFF\n");
                 } else if (TDMA_NAV_ON == nav_en) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TDMA_NAV_ON\n");
+                        "[BTCoex], TDMA_NAV_ON\n");
                         h2c_parameter[0] |= BIT(2);
                 }
 
                 if (TDMA_DAC_SWING_OFF == dac_swing_en) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TDMA_DAC_SWING_OFF\n");
+                                "[BTCoex], TDMA_DAC_SWING_OFF\n");
                 } else if (TDMA_DAC_SWING_ON == dac_swing_en) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TDMA_DAC_SWING_ON\n");
+                                "[BTCoex], TDMA_DAC_SWING_ON\n");
                         h2c_parameter[0] |= BIT(4);
                 }
-                rtlpcipriv->bt_coexist.fw_coexist_all_off = false;
+                rtlpriv->btcoexist.fw_coexist_all_off = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "[BTCoex], set BT PTA update manager to no update!!\n");
@@ -503,46 +490,46 @@ static void rtl8723ae_dm_bt_set_fw_tdma_ctrl(struct ieee80211_hw *hw,
         }
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], FW2AntTDMA, write 0x26 = 0x%x\n",
+                 "[BTCoex], FW2AntTDMA, write 0x26=0x%x\n",
                  h2c_parameter1[0]);
-        rtl8723ae_fill_h2c_cmd(hw, 0x26, 1, h2c_parameter1);
+        rtl8723e_fill_h2c_cmd(hw, 0x26, 1, h2c_parameter1);
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], FW2AntTDMA, write 0x14 = 0x%x\n", h2c_parameter[0]);
-        rtl8723ae_fill_h2c_cmd(hw, 0x14, 1, h2c_parameter);
+                "[BTCoex], FW2AntTDMA, write 0x14=0x%x\n",
+                h2c_parameter[0]);
+        rtl8723e_fill_h2c_cmd(hw, 0x14, 1, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_set_fw_ignore_wlan_act(struct ieee80211_hw *hw,
-                                                   bool enable)
+static void rtl8723e_dm_bt_set_fw_ignore_wlan_act(struct ieee80211_hw *hw,
+                                                  bool b_enable)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         u8 h2c_parameter[1] = {0};
 
-        if (enable) {
+        if (b_enable) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "[BTCoex], BT Ignore Wlan_Act !!\n");
+                        "[BTCoex], BT Ignore Wlan_Act !!\n");
                 h2c_parameter[0] |= BIT(0);             /* function enable */
-                rtlpcipriv->bt_coexist.fw_coexist_all_off = false;
+                rtlpriv->btcoexist.fw_coexist_all_off = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "[BTCoex], BT don't ignore Wlan_Act !!\n");
+                        "[BTCoex], BT don't ignore Wlan_Act !!\n");
         }
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], set FW for BT Ignore Wlan_Act, write 0x25 = 0x%x\n",
+                 "[BTCoex], set FW for BT Ignore Wlan_Act, write 0x25=0x%x\n",
                  h2c_parameter[0]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x25, 1, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0x25, 1, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_set_fw_tra_tdma_ctrl(struct ieee80211_hw *hw,
-                                                 bool enable, u8 ant_num,
-                                                 u8 nav_en)
+static void rtl8723e_dm_bt_set_fw_tra_tdma_ctrl(struct ieee80211_hw *hw,
+                                                bool b_enable, u8 ant_num,
+                                                u8 nav_en)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
         u8 h2c_parameter[2] = {0};
 
         /* Only 8723 B cut should do this */
@@ -552,460 +539,467 @@ static void rtl8723ae_dm_bt_set_fw_tra_tdma_ctrl(struct ieee80211_hw *hw,
                 return;
         }
 
-        if (enable) {
+        if (b_enable) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "[BTCoex], turn TTDMA mode ON!!\n");
-                h2c_parameter[0] |= BIT(0);             /* function enable */
+                h2c_parameter[0] |= BIT(0);     /* function enable */
                 if (TDMA_1ANT == ant_num) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                  "[BTCoex], TTDMA_1ANT\n");
                         h2c_parameter[0] |= BIT(1);
                 } else if (TDMA_2ANT == ant_num) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TTDMA_2ANT\n");
+                        "[BTCoex], TTDMA_2ANT\n");
                 } else {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], Unknown Ant\n");
+                        "[BTCoex], Unknown Ant\n");
                 }
 
                 if (TDMA_NAV_OFF == nav_en) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TTDMA_NAV_OFF\n");
+                        "[BTCoex], TTDMA_NAV_OFF\n");
                 } else if (TDMA_NAV_ON == nav_en) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex], TTDMA_NAV_ON\n");
+                        "[BTCoex], TTDMA_NAV_ON\n");
                         h2c_parameter[1] |= BIT(0);
                 }
 
-                rtlpcipriv->bt_coexist.fw_coexist_all_off = false;
+                rtlpriv->btcoexist.fw_coexist_all_off = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "[BTCoex], turn TTDMA mode OFF!!\n");
+                        "[BTCoex], turn TTDMA mode OFF!!\n");
         }
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], FW Traditional TDMA, write 0x33 = 0x%x\n",
-                 h2c_parameter[0] << 8 | h2c_parameter[1]);
+                "[BTCoex], FW Traditional TDMA, write 0x33=0x%x\n",
+                h2c_parameter[0] << 8 | h2c_parameter[1]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x33, 2, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0x33, 2, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_set_fw_dac_swing_level(struct ieee80211_hw *hw,
-                                                   u8 dac_swing_lvl)
+static void rtl8723e_dm_bt_set_fw_dac_swing_level(struct ieee80211_hw *hw,
+                                                  u8 dac_swing_lvl)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 h2c_parameter[1] = {0};
-
         h2c_parameter[0] = dac_swing_lvl;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], Set Dac Swing Level = 0x%x\n", dac_swing_lvl);
+                "[BTCoex], Set Dac Swing Level=0x%x\n", dac_swing_lvl);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], write 0x29 = 0x%x\n", h2c_parameter[0]);
+                "[BTCoex], write 0x29=0x%x\n", h2c_parameter[0]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x29, 1, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0x29, 1, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_set_fw_bt_hid_info(struct ieee80211_hw *hw,
-                                               bool enable)
+static void rtl8723e_dm_bt_set_fw_bt_hid_info(struct ieee80211_hw *hw,
+                                              bool b_enable)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 h2c_parameter[1] = {0};
-
         h2c_parameter[0] = 0;
 
-        if (enable) {
+        if (b_enable) {
                 h2c_parameter[0] |= BIT(0);
-                rtlpcipriv->bt_coexist.fw_coexist_all_off = false;
+                rtlpriv->btcoexist.fw_coexist_all_off = false;
         }
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], Set BT HID information = 0x%x\n", enable);
+                "[BTCoex], Set BT HID information=0x%x\n", b_enable);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], write 0x24 = 0x%x\n", h2c_parameter[0]);
+                "[BTCoex], write 0x24=0x%x\n", h2c_parameter[0]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x24, 1, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0x24, 1, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_set_fw_bt_retry_index(struct ieee80211_hw *hw,
-                                                  u8 retry_index)
+static void rtl8723e_dm_bt_set_fw_bt_retry_index(struct ieee80211_hw *hw,
+                                                 u8 retry_index)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 h2c_parameter[1] = {0};
-
         h2c_parameter[0] = retry_index;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], Set BT Retry Index=%d\n", retry_index);
+                "[BTCoex], Set BT Retry Index=%d\n", retry_index);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], write 0x23 = 0x%x\n", h2c_parameter[0]);
+                "[BTCoex], write 0x23=0x%x\n", h2c_parameter[0]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x23, 1, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0x23, 1, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_set_fw_wlan_act(struct ieee80211_hw *hw,
-                                            u8 wlan_act_hi, u8 wlan_act_lo)
+static void rtl8723e_dm_bt_set_fw_wlan_act(struct ieee80211_hw *hw,
+                                           u8 wlan_act_hi, u8 wlan_act_lo)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 h2c_parameter_hi[1] = {0};
         u8 h2c_parameter_lo[1] = {0};
-
         h2c_parameter_hi[0] = wlan_act_hi;
         h2c_parameter_lo[0] = wlan_act_lo;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], Set WLAN_ACT Hi:Lo = 0x%x/0x%x\n", wlan_act_hi,
-                 wlan_act_lo);
+                "[BTCoex], Set WLAN_ACT Hi:Lo=0x%x/0x%x\n",
+                wlan_act_hi, wlan_act_lo);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], write 0x22 = 0x%x\n", h2c_parameter_hi[0]);
+                "[BTCoex], write 0x22=0x%x\n", h2c_parameter_hi[0]);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "[BTCoex], write 0x11 = 0x%x\n", h2c_parameter_lo[0]);
+                "[BTCoex], write 0x11=0x%x\n", h2c_parameter_lo[0]);
 
         /* WLAN_ACT = High duration, unit:ms */
-        rtl8723ae_fill_h2c_cmd(hw, 0x22, 1, h2c_parameter_hi);
+        rtl8723e_fill_h2c_cmd(hw, 0x22, 1, h2c_parameter_hi);
         /*  WLAN_ACT = Low duration, unit:3*625us */
-        rtl8723ae_fill_h2c_cmd(hw, 0x11, 1, h2c_parameter_lo);
+        rtl8723e_fill_h2c_cmd(hw, 0x11, 1, h2c_parameter_lo);
 }
 
-void rtl8723ae_dm_bt_set_bt_dm(struct ieee80211_hw *hw, struct btdm_8723 *btdm)
+void rtl8723e_dm_bt_set_bt_dm(struct ieee80211_hw *hw,
+                              struct btdm_8723 *btdm)
 {
-        struct rtl_pci_priv     *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        struct btdm_8723 *btdm_8723 = &rtlhal->hal_coex_8723.btdm;
+        struct btdm_8723 *btdm_8723 = &hal_coex_8723.btdm;
         u8 i;
+
         bool fw_current_inpsmode = false;
         bool fw_ps_awake = true;
 
         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
-                                      (u8 *)(&fw_current_inpsmode));
+                                              (u8 *)(&fw_current_inpsmode));
         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
-                                      (u8 *)(&fw_ps_awake));
+                                              (u8 *)(&fw_ps_awake));
 
-        /* check new setting is different than the old one,
-         * if all the same, don't do the setting again.
-         */
+        /* check new setting is different with the old one, */
+        /* if all the same, don't do the setting again. */
         if (memcmp(btdm_8723, btdm, sizeof(struct btdm_8723)) == 0) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], the same coexist setting, return!!\n");
+                        "[BTCoex], the same coexist setting, return!!\n");
                 return;
         } else {        /* save the new coexist setting */
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], UPDATE TO NEW COEX SETTING!!\n");
+                        "[BTCoex], UPDATE TO NEW COEX SETTING!!\n");
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new bAllOff = 0x%x/ 0x%x\n",
-                         btdm_8723->all_off, btdm->all_off);
+                        "[BTCoex], original/new bAllOff=0x%x/ 0x%x\n",
+                        btdm_8723->all_off, btdm->all_off);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new agc_table_en = 0x%x/ 0x%x\n",
-                         btdm_8723->agc_table_en, btdm->agc_table_en);
+                        "[BTCoex], original/new agc_table_en=0x%x/ 0x%x\n",
+                        btdm_8723->agc_table_en, btdm->agc_table_en);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new adc_back_off_on = 0x%x/ 0x%x\n",
-                         btdm_8723->adc_back_off_on, btdm->adc_back_off_on);
+                         "[BTCoex], original/new adc_back_off_on=0x%x/ 0x%x\n",
+                         btdm_8723->adc_back_off_on,
+                         btdm->adc_back_off_on);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new b2_ant_hid_en = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new b2_ant_hid_en=0x%x/ 0x%x\n",
                          btdm_8723->b2_ant_hid_en, btdm->b2_ant_hid_en);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new bLowPenaltyRateAdaptive = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new bLowPenaltyRateAdaptive=0x%x/ 0x%x\n",
                          btdm_8723->low_penalty_rate_adaptive,
                          btdm->low_penalty_rate_adaptive);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new bRfRxLpfShrink = 0x%x/ 0x%x\n",
-                         btdm_8723->rf_rx_lpf_shrink, btdm->rf_rx_lpf_shrink);
+                         "[BTCoex], original/new bRfRxLpfShrink=0x%x/ 0x%x\n",
+                         btdm_8723->rf_rx_lpf_shrink,
+                         btdm->rf_rx_lpf_shrink);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new bRejectAggrePkt = 0x%x/ 0x%x\n",
-                         btdm_8723->reject_aggre_pkt, btdm->reject_aggre_pkt);
+                         "[BTCoex], original/new bRejectAggrePkt=0x%x/ 0x%x\n",
+                         btdm_8723->reject_aggre_pkt,
+                         btdm->reject_aggre_pkt);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new tdma_on = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new tdma_on=0x%x/ 0x%x\n",
                          btdm_8723->tdma_on, btdm->tdma_on);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new tdmaAnt = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new tdmaAnt=0x%x/ 0x%x\n",
                          btdm_8723->tdma_ant, btdm->tdma_ant);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new tdmaNav = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new tdmaNav=0x%x/ 0x%x\n",
                          btdm_8723->tdma_nav, btdm->tdma_nav);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new tdma_dac_swing = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new tdma_dac_swing=0x%x/ 0x%x\n",
                          btdm_8723->tdma_dac_swing, btdm->tdma_dac_swing);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new fwDacSwingLvl = 0x%x/ 0x%x\n",
-                         btdm_8723->fw_dac_swing_lvl, btdm->fw_dac_swing_lvl);
+                         "[BTCoex], original/new fw_dac_swing_lvl=0x%x/ 0x%x\n",
+                         btdm_8723->fw_dac_swing_lvl,
+                         btdm->fw_dac_swing_lvl);
 
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new bTraTdmaOn = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new bTraTdmaOn=0x%x/ 0x%x\n",
                          btdm_8723->tra_tdma_on, btdm->tra_tdma_on);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new traTdmaAnt = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new traTdmaAnt=0x%x/ 0x%x\n",
                          btdm_8723->tra_tdma_ant, btdm->tra_tdma_ant);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new traTdmaNav = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new traTdmaNav=0x%x/ 0x%x\n",
                          btdm_8723->tra_tdma_nav, btdm->tra_tdma_nav);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new bPsTdmaOn = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new bPsTdmaOn=0x%x/ 0x%x\n",
                          btdm_8723->ps_tdma_on, btdm->ps_tdma_on);
                 for (i = 0; i < 5; i++) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "[BTCoex], original/new psTdmaByte[i] = 0x%x/ 0x%x\n",
+                                 "[BTCoex], original/new psTdmaByte[i]=0x%x/ 0x%x\n",
                                  btdm_8723->ps_tdma_byte[i],
                                  btdm->ps_tdma_byte[i]);
                 }
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new bIgnoreWlanAct = 0x%x/ 0x%x\n",
-                         btdm_8723->ignore_wlan_act, btdm->ignore_wlan_act);
+                        "[BTCoex], original/new bIgnoreWlanAct=0x%x/ 0x%x\n",
+                        btdm_8723->ignore_wlan_act,
+                        btdm->ignore_wlan_act);
+
 
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new bPtaOn = 0x%x/ 0x%x\n",
-                         btdm_8723->pta_on, btdm->pta_on);
+                        "[BTCoex], original/new bPtaOn=0x%x/ 0x%x\n",
+                        btdm_8723->pta_on, btdm->pta_on);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new val_0x6c0 = 0x%x/ 0x%x\n",
-                         btdm_8723->val_0x6c0, btdm->val_0x6c0);
+                        "[BTCoex], original/new val_0x6c0=0x%x/ 0x%x\n",
+                        btdm_8723->val_0x6c0, btdm->val_0x6c0);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new val_0x6c8 = 0x%x/ 0x%x\n",
-                         btdm_8723->val_0x6c8, btdm->val_0x6c8);
+                        "[BTCoex], original/new val_0x6c8=0x%x/ 0x%x\n",
+                        btdm_8723->val_0x6c8, btdm->val_0x6c8);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new val_0x6cc = 0x%x/ 0x%x\n",
-                         btdm_8723->val_0x6cc, btdm->val_0x6cc);
+                        "[BTCoex], original/new val_0x6cc=0x%x/ 0x%x\n",
+                        btdm_8723->val_0x6cc, btdm->val_0x6cc);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new sw_dac_swing_on = 0x%x/ 0x%x\n",
-                         btdm_8723->sw_dac_swing_on, btdm->sw_dac_swing_on);
+                         "[BTCoex], original/new sw_dac_swing_on=0x%x/ 0x%x\n",
+                         btdm_8723->sw_dac_swing_on,
+                         btdm->sw_dac_swing_on);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new sw_dac_swing_lvl = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new sw_dac_swing_lvl=0x%x/ 0x%x\n",
                          btdm_8723->sw_dac_swing_lvl,
                          btdm->sw_dac_swing_lvl);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new wlanActHi = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new wlanActHi=0x%x/ 0x%x\n",
                          btdm_8723->wlan_act_hi, btdm->wlan_act_hi);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new wlanActLo = 0x%x/ 0x%x\n",
+                         "[BTCoex], original/new wlanActLo=0x%x/ 0x%x\n",
                          btdm_8723->wlan_act_lo, btdm->wlan_act_lo);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], original/new btRetryIndex = 0x%x/ 0x%x\n",
-                        btdm_8723->bt_retry_index, btdm->bt_retry_index);
+                         "[BTCoex], original/new btRetryIndex=0x%x/ 0x%x\n",
+                         btdm_8723->bt_retry_index, btdm->bt_retry_index);
 
                 memcpy(btdm_8723, btdm, sizeof(struct btdm_8723));
         }
-        /*
-         * Here we only consider when Bt Operation
+        /* Here we only consider when Bt Operation
          * inquiry/paging/pairing is ON
          * we only need to turn off TDMA
          */
 
-        if (rtlpcipriv->bt_coexist.hold_for_bt_operation) {
+        if (rtlpriv->btcoexist.hold_for_bt_operation) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "[BTCoex], set to ignore wlanAct for BT OP!!\n");
-                rtl8723ae_dm_bt_set_fw_ignore_wlan_act(hw, true);
+                        "[BTCoex], set to ignore wlanAct for BT OP!!\n");
+                rtl8723e_dm_bt_set_fw_ignore_wlan_act(hw, true);
                 return;
         }
 
         if (btdm->all_off) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "[BTCoex], disable all coexist mechanism !!\n");
-                rtl8723ae_btdm_coex_all_off(hw);
+                        "[BTCoex], disable all coexist mechanism !!\n");
+                rtl8723e_btdm_coex_all_off(hw);
                 return;
         }
 
-        rtl8723ae_dm_bt_reject_ap_aggregated_packet(hw, btdm->reject_aggre_pkt);
+        rtl8723e_dm_bt_reject_ap_aggregated_packet(hw, btdm->reject_aggre_pkt);
 
         if (btdm->low_penalty_rate_adaptive)
-                rtl8723ae_bt_set_penalty_tx_rate_adap(hw,
-                        BT_TX_RATE_ADAPTIVE_LOW_PENALTY);
+                dm_bt_set_sw_penalty_tx_rate_adapt(hw, BT_TX_RATE_ADAPTIVE_LOW_PENALTY);
         else
-                rtl8723ae_bt_set_penalty_tx_rate_adap(hw,
-                        BT_TX_RATE_ADAPTIVE_NORMAL);
+                dm_bt_set_sw_penalty_tx_rate_adapt(hw,
+                                                   BT_TX_RATE_ADAPTIVE_NORMAL);
 
         if (btdm->rf_rx_lpf_shrink)
-                rtl8723ae_dm_bt_set_sw_rf_rx_lpf_corner(hw,
-                                         BT_RF_RX_LPF_CORNER_SHRINK);
+                rtl8723e_dm_bt_set_sw_rf_rx_lpf_corner(hw,
+                                BT_RF_RX_LPF_CORNER_SHRINK);
         else
-                rtl8723ae_dm_bt_set_sw_rf_rx_lpf_corner(hw,
-                                         BT_RF_RX_LPF_CORNER_RESUME);
+                rtl8723e_dm_bt_set_sw_rf_rx_lpf_corner(hw,
+                                BT_RF_RX_LPF_CORNER_RESUME);
 
         if (btdm->agc_table_en)
-                rtl8723ae_dm_bt_agc_table(hw, BT_AGCTABLE_ON);
+                rtl8723e_dm_bt_agc_table(hw, BT_AGCTABLE_ON);
         else
-                rtl8723ae_dm_bt_agc_table(hw, BT_AGCTABLE_OFF);
+                rtl8723e_dm_bt_agc_table(hw, BT_AGCTABLE_OFF);
 
         if (btdm->adc_back_off_on)
-                rtl8723ae_dm_bt_bback_off_level(hw, BT_BB_BACKOFF_ON);
+                rtl8723e_dm_bt_bb_back_off_level(hw, BT_BB_BACKOFF_ON);
         else
-                rtl8723ae_dm_bt_bback_off_level(hw, BT_BB_BACKOFF_OFF);
+                rtl8723e_dm_bt_bb_back_off_level(hw, BT_BB_BACKOFF_OFF);
 
-        rtl8723ae_dm_bt_set_fw_bt_retry_index(hw, btdm->bt_retry_index);
+        rtl8723e_dm_bt_set_fw_bt_retry_index(hw, btdm->bt_retry_index);
 
-        rtl8723ae_dm_bt_set_fw_dac_swing_level(hw, btdm->fw_dac_swing_lvl);
-        rtl8723ae_dm_bt_set_fw_wlan_act(hw, btdm->wlan_act_hi,
+        rtl8723e_dm_bt_set_fw_dac_swing_level(hw, btdm->fw_dac_swing_lvl);
+        rtl8723e_dm_bt_set_fw_wlan_act(hw, btdm->wlan_act_hi,
                                        btdm->wlan_act_lo);
 
-        rtl8723ae_dm_bt_set_coex_table(hw, btdm->val_0x6c0,
-                btdm->val_0x6c8, btdm->val_0x6cc);
-        rtl8723ae_dm_bt_set_hw_pta_mode(hw, btdm->pta_on);
+        rtl8723e_dm_bt_set_coex_table(hw, btdm->val_0x6c0,
+                                      btdm->val_0x6c8, btdm->val_0x6cc);
+        rtl8723e_dm_bt_set_hw_pta_mode(hw, btdm->pta_on);
 
         /* Note: There is a constraint between TDMA and 2AntHID
-         * Only one of 2AntHid and tdma can be turned on
-         * We should turn off those mechanisms first
-         * and then turn on them on.
+         * Only one of 2AntHid and tdma can be turn on
+         * We should turn off those mechanisms should be turned off first
+         * and then turn on those mechanisms should be turned on.
         */
         if (btdm->b2_ant_hid_en) {
                 /* turn off tdma */
-                rtl8723ae_dm_bt_set_fw_tra_tdma_ctrl(hw, btdm->tra_tdma_on,
+                rtl8723e_dm_bt_set_fw_tra_tdma_ctrl(hw, btdm->tra_tdma_on,
                                                     btdm->tra_tdma_ant,
                                                     btdm->tra_tdma_nav);
-                rtl8723ae_dm_bt_set_fw_tdma_ctrl(hw, false, btdm->tdma_ant,
+                rtl8723e_dm_bt_set_fw_tdma_ctrl(hw, false, btdm->tdma_ant,
                                                 btdm->tdma_nav,
                                                 btdm->tdma_dac_swing);
 
                 /* turn off Pstdma */
-                rtl8723ae_dm_bt_set_fw_ignore_wlan_act(hw,
+                rtl8723e_dm_bt_set_fw_ignore_wlan_act(hw,
                                                       btdm->ignore_wlan_act);
                 /* Antenna control by PTA, 0x870 = 0x300. */
-                rtl8723ae_dm_bt_set_fw_3a(hw, 0x0, 0x0, 0x0, 0x8, 0x0);
+                rtl8723e_dm_bt_set_fw_3a(hw, 0x0, 0x0, 0x0, 0x8, 0x0);
 
                 /* turn on 2AntHid */
-                rtl8723ae_dm_bt_set_fw_bt_hid_info(hw, true);
-                rtl8723ae_dm_bt_set_fw_2_ant_hid(hw, true, true);
+                rtl8723e_dm_bt_set_fw_bt_hid_info(hw, true);
+                rtl8723e_dm_bt_set_fw_2_ant_hid(hw, true, true);
         } else if (btdm->tdma_on) {
                 /* turn off 2AntHid */
-                rtl8723ae_dm_bt_set_fw_bt_hid_info(hw, false);
-                rtl8723ae_dm_bt_set_fw_2_ant_hid(hw, false, false);
+                rtl8723e_dm_bt_set_fw_bt_hid_info(hw, false);
+                rtl8723e_dm_bt_set_fw_2_ant_hid(hw, false, false);
 
                 /* turn off pstdma */
-                rtl8723ae_dm_bt_set_fw_ignore_wlan_act(hw,
+                rtl8723e_dm_bt_set_fw_ignore_wlan_act(hw,
                                                       btdm->ignore_wlan_act);
                 /* Antenna control by PTA, 0x870 = 0x300. */
-                rtl8723ae_dm_bt_set_fw_3a(hw, 0x0, 0x0, 0x0, 0x8, 0x0);
+                rtl8723e_dm_bt_set_fw_3a(hw, 0x0, 0x0, 0x0, 0x8, 0x0);
 
                 /* turn on tdma */
-                rtl8723ae_dm_bt_set_fw_tra_tdma_ctrl(hw, btdm->tra_tdma_on,
-                                 btdm->tra_tdma_ant, btdm->tra_tdma_nav);
-                rtl8723ae_dm_bt_set_fw_tdma_ctrl(hw, true, btdm->tdma_ant,
-                                 btdm->tdma_nav, btdm->tdma_dac_swing);
+                rtl8723e_dm_bt_set_fw_tra_tdma_ctrl(hw, btdm->tra_tdma_on,
+                                                    btdm->tra_tdma_ant,
+                                                    btdm->tra_tdma_nav);
+                rtl8723e_dm_bt_set_fw_tdma_ctrl(hw, true, btdm->tdma_ant,
+                                                btdm->tdma_nav,
+                                                btdm->tdma_dac_swing);
         } else if (btdm->ps_tdma_on) {
                 /* turn off 2AntHid */
-                rtl8723ae_dm_bt_set_fw_bt_hid_info(hw, false);
-                rtl8723ae_dm_bt_set_fw_2_ant_hid(hw, false, false);
+                rtl8723e_dm_bt_set_fw_bt_hid_info(hw, false);
+                rtl8723e_dm_bt_set_fw_2_ant_hid(hw, false, false);
 
                 /* turn off tdma */
-                rtl8723ae_dm_bt_set_fw_tra_tdma_ctrl(hw, btdm->tra_tdma_on,
-                                 btdm->tra_tdma_ant, btdm->tra_tdma_nav);
-                rtl8723ae_dm_bt_set_fw_tdma_ctrl(hw, false, btdm->tdma_ant,
-                                 btdm->tdma_nav, btdm->tdma_dac_swing);
+                rtl8723e_dm_bt_set_fw_tra_tdma_ctrl(hw, btdm->tra_tdma_on,
+                                                    btdm->tra_tdma_ant,
+                                                    btdm->tra_tdma_nav);
+                rtl8723e_dm_bt_set_fw_tdma_ctrl(hw, false, btdm->tdma_ant,
+                                                btdm->tdma_nav,
+                                                btdm->tdma_dac_swing);
 
                 /* turn on pstdma */
-                rtl8723ae_dm_bt_set_fw_ignore_wlan_act(hw,
-                                 btdm->ignore_wlan_act);
-                rtl8723ae_dm_bt_set_fw_3a(hw,
-                        btdm->ps_tdma_byte[0],
-                        btdm->ps_tdma_byte[1],
-                        btdm->ps_tdma_byte[2],
-                        btdm->ps_tdma_byte[3],
-                        btdm->ps_tdma_byte[4]);
+                rtl8723e_dm_bt_set_fw_ignore_wlan_act(hw,
+                                                      btdm->ignore_wlan_act);
+                rtl8723e_dm_bt_set_fw_3a(hw, btdm->ps_tdma_byte[0],
+                                         btdm->ps_tdma_byte[1],
+                                         btdm->ps_tdma_byte[2],
+                                         btdm->ps_tdma_byte[3],
+                                         btdm->ps_tdma_byte[4]);
         } else {
                 /* turn off 2AntHid */
-                rtl8723ae_dm_bt_set_fw_bt_hid_info(hw, false);
-                rtl8723ae_dm_bt_set_fw_2_ant_hid(hw, false, false);
+                rtl8723e_dm_bt_set_fw_bt_hid_info(hw, false);
+                rtl8723e_dm_bt_set_fw_2_ant_hid(hw, false, false);
 
                 /* turn off tdma */
-                rtl8723ae_dm_bt_set_fw_tra_tdma_ctrl(hw, btdm->tra_tdma_on,
-                                 btdm->tra_tdma_ant, btdm->tra_tdma_nav);
-                rtl8723ae_dm_bt_set_fw_tdma_ctrl(hw, false, btdm->tdma_ant,
-                                 btdm->tdma_nav, btdm->tdma_dac_swing);
+                rtl8723e_dm_bt_set_fw_tra_tdma_ctrl(hw, btdm->tra_tdma_on,
+                                                    btdm->tra_tdma_ant,
+                                                    btdm->tra_tdma_nav);
+                rtl8723e_dm_bt_set_fw_tdma_ctrl(hw, false, btdm->tdma_ant,
+                                                btdm->tdma_nav,
+                                                btdm->tdma_dac_swing);
 
                 /* turn off pstdma */
-                rtl8723ae_dm_bt_set_fw_ignore_wlan_act(hw,
-                                                      btdm->ignore_wlan_act);
+                rtl8723e_dm_bt_set_fw_ignore_wlan_act(hw,
+                                                btdm->ignore_wlan_act);
                 /* Antenna control by PTA, 0x870 = 0x300. */
-                rtl8723ae_dm_bt_set_fw_3a(hw, 0x0, 0x0, 0x0, 0x8, 0x0);
+                rtl8723e_dm_bt_set_fw_3a(hw, 0x0, 0x0, 0x0, 0x8, 0x0);
         }
 
         /* Note:
-         * We should add delay for making sure sw DacSwing can be set
-         *  sucessfully. Because of that rtl8723ae_dm_bt_set_fw_2_ant_hid()
-         * and rtl8723ae_dm_bt_set_fw_tdma_ctrl()
+         * We should add delay for making sure
+         *      sw DacSwing can be set sucessfully.
+         * because of that rtl8723e_dm_bt_set_fw_2_ant_hid()
+         *      and rtl8723e_dm_bt_set_fw_tdma_ctrl()
          * will overwrite the reg 0x880.
         */
         mdelay(30);
-        rtl8723ae_dm_bt_set_sw_full_time_dac_swing(hw,
-                btdm->sw_dac_swing_on, btdm->sw_dac_swing_lvl);
-        rtl8723ae_dm_bt_set_fw_dec_bt_pwr(hw, btdm->dec_bt_pwr);
+        rtl8723e_dm_bt_set_sw_full_time_dac_swing(hw, btdm->sw_dac_swing_on,
+                                                  btdm->sw_dac_swing_lvl);
+        rtl8723e_dm_bt_set_fw_dec_bt_pwr(hw, btdm->dec_bt_pwr);
 }
 
-/*============================================================
- * extern function start with BTDM_
- *============================================================
+/* ============================================================ */
+/* extern function start with BTDM_ */
+/* ============================================================i
  */
-static u32 rtl8723ae_dm_bt_tx_rx_couter_h(struct ieee80211_hw *hw)
+static u32 rtl8723e_dm_bt_tx_rx_couter_h(struct ieee80211_hw *hw)
 {
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u32 counters = 0;
+        u32     counters = 0;
 
-        counters = rtlhal->hal_coex_8723.high_priority_tx +
-                   rtlhal->hal_coex_8723.high_priority_rx;
+        counters = hal_coex_8723.high_priority_tx +
+                        hal_coex_8723.high_priority_rx;
         return counters;
 }
 
-static u32 rtl8723ae_dm_bt_tx_rx_couter_l(struct ieee80211_hw *hw)
+static u32 rtl8723e_dm_bt_tx_rx_couter_l(struct ieee80211_hw *hw)
 {
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 counters = 0;
 
-        return rtlhal->hal_coex_8723.low_priority_tx +
-               rtlhal->hal_coex_8723.low_priority_rx;
+        counters = hal_coex_8723.low_priority_tx +
+                        hal_coex_8723.low_priority_rx;
+        return counters;
 }
 
-static u8 rtl8723ae_dm_bt_bt_tx_rx_counter_level(struct ieee80211_hw *hw)
+static u8 rtl8723e_dm_bt_bt_tx_rx_counter_level(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
-        u32 bt_tx_rx_cnt = 0;
-        u8 bt_tx_rx_cnt_lvl = 0;
+        u32     bt_tx_rx_cnt = 0;
+        u8      bt_tx_rx_cnt_lvl = 0;
 
-        bt_tx_rx_cnt = rtl8723ae_dm_bt_tx_rx_couter_h(hw) +
-                       rtl8723ae_dm_bt_tx_rx_couter_l(hw);
+        bt_tx_rx_cnt = rtl8723e_dm_bt_tx_rx_couter_h(hw)
+                                + rtl8723e_dm_bt_tx_rx_couter_l(hw);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                  "[BTCoex], BT TxRx Counters = %d\n", bt_tx_rx_cnt);
 
-        rtlpcipriv->bt_coexist.cstate_h &=
-                 ~(BT_COEX_STATE_BT_CNT_LEVEL_0 | BT_COEX_STATE_BT_CNT_LEVEL_1 |
+        rtlpriv->btcoexist.cstate_h &= ~
+                 (BT_COEX_STATE_BT_CNT_LEVEL_0 | BT_COEX_STATE_BT_CNT_LEVEL_1|
                   BT_COEX_STATE_BT_CNT_LEVEL_2);
 
         if (bt_tx_rx_cnt >= BT_TXRX_CNT_THRES_3) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "[BTCoex], BT TxRx Counters at level 3\n");
                 bt_tx_rx_cnt_lvl = BT_TXRX_CNT_LEVEL_3;
-                rtlpcipriv->bt_coexist.cstate_h |= BT_COEX_STATE_BT_CNT_LEVEL_3;
+                rtlpriv->btcoexist.cstate_h |=
+                        BT_COEX_STATE_BT_CNT_LEVEL_3;
         } else if (bt_tx_rx_cnt >= BT_TXRX_CNT_THRES_2) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "[BTCoex], BT TxRx Counters at level 2\n");
                 bt_tx_rx_cnt_lvl = BT_TXRX_CNT_LEVEL_2;
-                rtlpcipriv->bt_coexist.cstate_h |= BT_COEX_STATE_BT_CNT_LEVEL_2;
+                rtlpriv->btcoexist.cstate_h |=
+                        BT_COEX_STATE_BT_CNT_LEVEL_2;
         } else if (bt_tx_rx_cnt >= BT_TXRX_CNT_THRES_1) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "[BTCoex], BT TxRx Counters at level 1\n");
                 bt_tx_rx_cnt_lvl = BT_TXRX_CNT_LEVEL_1;
-                rtlpcipriv->bt_coexist.cstate_h |= BT_COEX_STATE_BT_CNT_LEVEL_1;
+                rtlpriv->btcoexist.cstate_h  |=
+                        BT_COEX_STATE_BT_CNT_LEVEL_1;
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "[BTCoex], BT TxRx Counters at level 0\n");
                 bt_tx_rx_cnt_lvl = BT_TXRX_CNT_LEVEL_0;
-                rtlpcipriv->bt_coexist.cstate_h |= BT_COEX_STATE_BT_CNT_LEVEL_0;
+                rtlpriv->btcoexist.cstate_h |=
+                        BT_COEX_STATE_BT_CNT_LEVEL_0;
         }
         return bt_tx_rx_cnt_lvl;
 }
 
-static void rtl8723ae_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
+static void rtl8723e_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct btdm_8723 btdm8723;
         u8 bt_rssi_state, bt_rssi_state1;
-        u8 bt_tx_rx_cnt_lvl;
+        u8      bt_tx_rx_cnt_lvl = 0;
 
-        rtl8723ae_dm_bt_btdm_structure_reload(hw, &btdm8723);
+        rtl8723e_dm_bt_btdm_structure_reload(hw, &btdm8723);
 
         btdm8723.rf_rx_lpf_shrink = true;
         btdm8723.low_penalty_rate_adaptive = true;
         btdm8723.reject_aggre_pkt = false;
 
-        bt_tx_rx_cnt_lvl = rtl8723ae_dm_bt_bt_tx_rx_counter_level(hw);
+        bt_tx_rx_cnt_lvl = rtl8723e_dm_bt_bt_tx_rx_counter_level(hw);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                  "[BTCoex], BT TxRx Counters = %d\n", bt_tx_rx_cnt_lvl);
 
@@ -1051,10 +1045,10 @@ static void rtl8723ae_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "HT20 or Legacy\n");
-                bt_rssi_state = rtl8723ae_dm_bt_check_coex_rssi_state(hw, 2,
-                                                                     47, 0);
-                bt_rssi_state1 = rtl8723ae_dm_bt_check_coex_rssi_state1(hw, 2,
-                                                                       27, 0);
+                bt_rssi_state =
+                  rtl8723e_dm_bt_check_coex_rssi_state(hw, 2, 47, 0);
+                bt_rssi_state1 =
+                  rtl8723e_dm_bt_check_coex_rssi_state1(hw, 2, 27, 0);
 
                 /* coex table */
                 btdm8723.val_0x6c0 = 0x55555555;
@@ -1063,15 +1057,15 @@ static void rtl8723ae_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
 
                 /* sw mechanism */
                 if ((bt_rssi_state == BT_RSSI_STATE_HIGH) ||
-                    (bt_rssi_state == BT_RSSI_STATE_STAY_HIGH)) {
+                        (bt_rssi_state == BT_RSSI_STATE_STAY_HIGH)) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "Wifi rssi high\n");
+                                        "Wifi rssi high\n");
                         btdm8723.agc_table_en = true;
                         btdm8723.adc_back_off_on = true;
                         btdm8723.sw_dac_swing_on = false;
                 } else {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "Wifi rssi low\n");
+                                        "Wifi rssi low\n");
                         btdm8723.agc_table_en = false;
                         btdm8723.adc_back_off_on = false;
                         btdm8723.sw_dac_swing_on = false;
@@ -1080,16 +1074,15 @@ static void rtl8723ae_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
                 /* fw mechanism */
                 btdm8723.ps_tdma_on = true;
                 if ((bt_rssi_state1 == BT_RSSI_STATE_HIGH) ||
-                    (bt_rssi_state1 == BT_RSSI_STATE_STAY_HIGH)) {
+                        (bt_rssi_state1 == BT_RSSI_STATE_STAY_HIGH)) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                                  "Wifi rssi-1 high\n");
-                        /* only rssi high we need to do this,
-                         * when rssi low, the value will modified by fw
-                         */
+                        /* only rssi high we need to do this, */
+                        /* when rssi low, the value will modified by fw */
                         rtl_write_byte(rtlpriv, 0x883, 0x40);
                         if (bt_tx_rx_cnt_lvl == BT_TXRX_CNT_LEVEL_2) {
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                         "[BTCoex], BT TxRx Counters >= 1400\n");
+                                "[BTCoex], BT TxRx Counters >= 1400\n");
                                 btdm8723.ps_tdma_byte[0] = 0xa3;
                                 btdm8723.ps_tdma_byte[1] = 0x5;
                                 btdm8723.ps_tdma_byte[2] = 0x5;
@@ -1097,7 +1090,7 @@ static void rtl8723ae_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
                                 btdm8723.ps_tdma_byte[4] = 0x80;
                         } else if (bt_tx_rx_cnt_lvl == BT_TXRX_CNT_LEVEL_1) {
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                         "[BTCoex], BT TxRx Counters >= 1200 && < 1400\n");
+                                         "[BTCoex], BT TxRx Counters>= 1200 && < 1400\n");
                                 btdm8723.ps_tdma_byte[0] = 0xa3;
                                 btdm8723.ps_tdma_byte[1] = 0xa;
                                 btdm8723.ps_tdma_byte[2] = 0xa;
@@ -1114,7 +1107,7 @@ static void rtl8723ae_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
                         }
                 } else {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "Wifi rssi-1 low\n");
+                                        "Wifi rssi-1 low\n");
                         if (bt_tx_rx_cnt_lvl == BT_TXRX_CNT_LEVEL_2) {
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                                          "[BTCoex], BT TxRx Counters >= 1400\n");
@@ -1143,16 +1136,15 @@ static void rtl8723ae_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
                 }
         }
 
-        if (rtl8723ae_dm_bt_need_to_dec_bt_pwr(hw))
+        if (rtl8723e_dm_bt_need_to_dec_bt_pwr(hw))
                 btdm8723.dec_bt_pwr = true;
 
         /* Always ignore WlanAct if bHid|bSCOBusy|bSCOeSCO */
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                  "[BTCoex], BT btInqPageStartTime = 0x%x, btTxRxCntLvl = %d\n",
-                 rtlhal->hal_coex_8723.bt_inq_page_start_time,
-                 bt_tx_rx_cnt_lvl);
-        if ((rtlhal->hal_coex_8723.bt_inq_page_start_time) ||
+                 hal_coex_8723.bt_inq_page_start_time, bt_tx_rx_cnt_lvl);
+        if ((hal_coex_8723.bt_inq_page_start_time) ||
             (BT_TXRX_CNT_LEVEL_3 == bt_tx_rx_cnt_lvl)) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "[BTCoex], Set BT inquiry / page scan 0x3a setting\n");
@@ -1164,33 +1156,35 @@ static void rtl8723ae_dm_bt_2_ant_hid_sco_esco(struct ieee80211_hw *hw)
                 btdm8723.ps_tdma_byte[4] = 0x80;
         }
 
-        if (rtl8723ae_dm_bt_is_coexist_state_changed(hw))
-                rtl8723ae_dm_bt_set_bt_dm(hw, &btdm8723);
+        if (rtl8723e_dm_bt_is_coexist_state_changed(hw))
+                rtl8723e_dm_bt_set_bt_dm(hw, &btdm8723);
+
 }
 
-static void rtl8723ae_dm_bt_2_ant_fta2dp(struct ieee80211_hw *hw)
+static void rtl8723e_dm_bt_2_ant_ftp_a2dp(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct btdm_8723 btdm8723;
+
         u8 bt_rssi_state, bt_rssi_state1;
-        u32 bt_tx_rx_cnt_lvl;
+        u32 bt_tx_rx_cnt_lvl = 0;
+
+        rtl8723e_dm_bt_btdm_structure_reload(hw, &btdm8723);
 
-        rtl8723ae_dm_bt_btdm_structure_reload(hw, &btdm8723);
         btdm8723.rf_rx_lpf_shrink = true;
         btdm8723.low_penalty_rate_adaptive = true;
         btdm8723.reject_aggre_pkt = false;
 
-        bt_tx_rx_cnt_lvl = rtl8723ae_dm_bt_bt_tx_rx_counter_level(hw);
+        bt_tx_rx_cnt_lvl = rtl8723e_dm_bt_bt_tx_rx_counter_level(hw);
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                 "[BTCoex], BT TxRx Counters = %d\n", bt_tx_rx_cnt_lvl);
+        "[BTCoex], BT TxRx Counters = %d\n", bt_tx_rx_cnt_lvl);
 
         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG, "HT40\n");
-                bt_rssi_state = rtl8723ae_dm_bt_check_coex_rssi_state(hw, 2,
-                                                                     37, 0);
+                bt_rssi_state =
+                  rtl8723e_dm_bt_check_coex_rssi_state(hw, 2, 37, 0);
 
                 /* coex table */
                 btdm8723.val_0x6c0 = 0x55555555;
@@ -1205,12 +1199,12 @@ static void rtl8723ae_dm_bt_2_ant_fta2dp(struct ieee80211_hw *hw)
                 /* fw mechanism */
                 btdm8723.ps_tdma_on = true;
                 if ((bt_rssi_state == BT_RSSI_STATE_HIGH) ||
-                    (bt_rssi_state == BT_RSSI_STATE_STAY_HIGH)) {
+                        (bt_rssi_state == BT_RSSI_STATE_STAY_HIGH)) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "Wifi rssi high\n");
+                                                "Wifi rssi high\n");
                         if (bt_tx_rx_cnt_lvl == BT_TXRX_CNT_LEVEL_2) {
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                         "[BTCoex], BT TxRx Counters >= 1400\n");
+                                "[BTCoex], BT TxRx Counters >= 1400\n");
                                 btdm8723.ps_tdma_byte[0] = 0xa3;
                                 btdm8723.ps_tdma_byte[1] = 0x5;
                                 btdm8723.ps_tdma_byte[2] = 0x5;
@@ -1244,7 +1238,8 @@ static void rtl8723ae_dm_bt_2_ant_fta2dp(struct ieee80211_hw *hw)
                                 btdm8723.ps_tdma_byte[2] = 0x5;
                                 btdm8723.ps_tdma_byte[3] = 0x0;
                                 btdm8723.ps_tdma_byte[4] = 0x80;
-                        } else if (bt_tx_rx_cnt_lvl == BT_TXRX_CNT_LEVEL_1) {
+                        } else if (bt_tx_rx_cnt_lvl ==
+                                BT_TXRX_CNT_LEVEL_1) {
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                                          "[BTCoex], BT TxRx Counters >= 1200 && < 1400\n");
                                 btdm8723.ps_tdma_byte[0] = 0xa3;
@@ -1265,10 +1260,10 @@ static void rtl8723ae_dm_bt_2_ant_fta2dp(struct ieee80211_hw *hw)
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "HT20 or Legacy\n");
-                bt_rssi_state = rtl8723ae_dm_bt_check_coex_rssi_state(hw, 2,
-                                                                     47, 0);
-                bt_rssi_state1 = rtl8723ae_dm_bt_check_coex_rssi_state1(hw, 2,
-                                                                       27, 0);
+                bt_rssi_state =
+                  rtl8723e_dm_bt_check_coex_rssi_state(hw, 2, 47, 0);
+                bt_rssi_state1 =
+                  rtl8723e_dm_bt_check_coex_rssi_state1(hw, 2, 27, 0);
 
                 /* coex table */
                 btdm8723.val_0x6c0 = 0x55555555;
@@ -1277,7 +1272,7 @@ static void rtl8723ae_dm_bt_2_ant_fta2dp(struct ieee80211_hw *hw)
 
                 /* sw mechanism */
                 if ((bt_rssi_state == BT_RSSI_STATE_HIGH) ||
-                    (bt_rssi_state == BT_RSSI_STATE_STAY_HIGH)) {
+                        (bt_rssi_state == BT_RSSI_STATE_STAY_HIGH)) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                                  "Wifi rssi high\n");
                         btdm8723.agc_table_en = true;
@@ -1294,12 +1289,11 @@ static void rtl8723ae_dm_bt_2_ant_fta2dp(struct ieee80211_hw *hw)
                 /* fw mechanism */
                 btdm8723.ps_tdma_on = true;
                 if ((bt_rssi_state1 == BT_RSSI_STATE_HIGH) ||
-                    (bt_rssi_state1 == BT_RSSI_STATE_STAY_HIGH)) {
+                        (bt_rssi_state1 == BT_RSSI_STATE_STAY_HIGH)) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                                  "Wifi rssi-1 high\n");
-                        /* only rssi high we need to do this,
-                         * when rssi low, the value will modified by fw
-                         */
+                        /* only rssi high we need to do this, */
+                        /* when rssi low, the value will modified by fw */
                         rtl_write_byte(rtlpriv, 0x883, 0x40);
                         if (bt_tx_rx_cnt_lvl == BT_TXRX_CNT_LEVEL_2) {
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
@@ -1357,15 +1351,14 @@ static void rtl8723ae_dm_bt_2_ant_fta2dp(struct ieee80211_hw *hw)
                 }
         }
 
-        if (rtl8723ae_dm_bt_need_to_dec_bt_pwr(hw))
+        if (rtl8723e_dm_bt_need_to_dec_bt_pwr(hw))
                 btdm8723.dec_bt_pwr = true;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                  "[BTCoex], BT btInqPageStartTime = 0x%x, btTxRxCntLvl = %d\n",
-                 rtlhal->hal_coex_8723.bt_inq_page_start_time,
-                 bt_tx_rx_cnt_lvl);
+                 hal_coex_8723.bt_inq_page_start_time, bt_tx_rx_cnt_lvl);
 
-        if ((rtlhal->hal_coex_8723.bt_inq_page_start_time) ||
+        if ((hal_coex_8723.bt_inq_page_start_time) ||
             (BT_TXRX_CNT_LEVEL_3 == bt_tx_rx_cnt_lvl)) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "[BTCoex], Set BT inquiry / page scan 0x3a setting\n");
@@ -1377,379 +1370,373 @@ static void rtl8723ae_dm_bt_2_ant_fta2dp(struct ieee80211_hw *hw)
                 btdm8723.ps_tdma_byte[4] = 0x80;
         }
 
-        if (rtl8723ae_dm_bt_is_coexist_state_changed(hw))
-                rtl8723ae_dm_bt_set_bt_dm(hw, &btdm8723);
+        if (rtl8723e_dm_bt_is_coexist_state_changed(hw))
+                rtl8723e_dm_bt_set_bt_dm(hw, &btdm8723);
+
 }
 
-static void rtl8723ae_dm_bt_inq_page_monitor(struct ieee80211_hw *hw)
+static void rtl8723e_dm_bt_inq_page_monitor(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        u32 cur_time = jiffies;
+        u32 cur_time;
 
-        if (rtlhal->hal_coex_8723.c2h_bt_inquiry_page) {
+        cur_time = jiffies;
+        if (hal_coex_8723.c2h_bt_inquiry_page) {
                 /* bt inquiry or page is started. */
-                if (rtlhal->hal_coex_8723.bt_inq_page_start_time == 0) {
-                        rtlpcipriv->bt_coexist.cstate |=
-                                         BT_COEX_STATE_BT_INQ_PAGE;
-                        rtlhal->hal_coex_8723.bt_inq_page_start_time = cur_time;
+                if (hal_coex_8723.bt_inq_page_start_time == 0) {
+                        rtlpriv->btcoexist.cstate  |=
+                        BT_COEX_STATE_BT_INQ_PAGE;
+                        hal_coex_8723.bt_inq_page_start_time = cur_time;
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                                  "[BTCoex], BT Inquiry/page is started at time : 0x%x\n",
-                                 rtlhal->hal_coex_8723.bt_inq_page_start_time);
+                                 hal_coex_8723.bt_inq_page_start_time);
                 }
         }
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                  "[BTCoex], BT Inquiry/page started time : 0x%x, cur_time : 0x%x\n",
-                 rtlhal->hal_coex_8723.bt_inq_page_start_time, cur_time);
+                 hal_coex_8723.bt_inq_page_start_time, cur_time);
 
-        if (rtlhal->hal_coex_8723.bt_inq_page_start_time) {
+        if (hal_coex_8723.bt_inq_page_start_time) {
                 if ((((long)cur_time -
-                    (long)rtlhal->hal_coex_8723.bt_inq_page_start_time) / HZ) >=
-                    10) {
+                        (long)hal_coex_8723.bt_inq_page_start_time) / HZ)
+                        >= 10) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "[BTCoex], BT Inquiry/page >= 10sec!!!");
-                        rtlhal->hal_coex_8723.bt_inq_page_start_time = 0;
-                        rtlpcipriv->bt_coexist.cstate &=
-                                                 ~BT_COEX_STATE_BT_INQ_PAGE;
+                                "[BTCoex], BT Inquiry/page >= 10sec!!!");
+                        hal_coex_8723.bt_inq_page_start_time = 0;
+                        rtlpriv->btcoexist.cstate &=
+                                ~BT_COEX_STATE_BT_INQ_PAGE;
                 }
         }
 }
 
-static void rtl8723ae_dm_bt_reset_action_profile_state(struct ieee80211_hw *hw)
+static void rtl8723e_dm_bt_reset_action_profile_state(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        rtlpcipriv->bt_coexist.cstate &=
-                ~(BT_COEX_STATE_PROFILE_HID | BT_COEX_STATE_PROFILE_A2DP |
+        rtlpriv->btcoexist.cstate &= ~
+                (BT_COEX_STATE_PROFILE_HID | BT_COEX_STATE_PROFILE_A2DP|
                 BT_COEX_STATE_PROFILE_PAN | BT_COEX_STATE_PROFILE_SCO);
 
-        rtlpcipriv->bt_coexist.cstate &=
-                ~(BT_COEX_STATE_BTINFO_COMMON |
-                BT_COEX_STATE_BTINFO_B_HID_SCOESCO |
+        rtlpriv->btcoexist.cstate &= ~
+                (BT_COEX_STATE_BTINFO_COMMON |
+                BT_COEX_STATE_BTINFO_B_HID_SCOESCO|
                 BT_COEX_STATE_BTINFO_B_FTP_A2DP);
 }
 
-static void _rtl8723ae_dm_bt_coexist_2_ant(struct ieee80211_hw *hw)
+static void _rtl8723e_dm_bt_coexist_2_ant(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
+        u8 bt_retry_cnt;
         u8 bt_info_original;
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                 "[BTCoex] Get bt info by fw!!\n");
+                "[BTCoex] Get bt info by fw!!\n");
 
         _rtl8723_dm_bt_check_wifi_state(hw);
 
-        if (rtlhal->hal_coex_8723.c2h_bt_info_req_sent) {
+        if (hal_coex_8723.c2h_bt_info_req_sent) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "[BTCoex] c2h for btInfo not rcvd yet!!\n");
+                                "[BTCoex] c2h for bt_info not rcvd yet!!\n");
         }
 
-        bt_info_original = rtlhal->hal_coex_8723.c2h_bt_info_original;
+        bt_retry_cnt = hal_coex_8723.bt_retry_cnt;
+        bt_info_original = hal_coex_8723.c2h_bt_info_original;
 
-        /* when bt inquiry or page scan, we have to set h2c 0x25
-         * ignore wlanact for continuous 4x2secs
-         */
-        rtl8723ae_dm_bt_inq_page_monitor(hw);
-        rtl8723ae_dm_bt_reset_action_profile_state(hw);
-
-        if (rtl8723ae_dm_bt_is_2_ant_common_action(hw)) {
-                rtlpcipriv->bt_coexist.bt_profile_case = BT_COEX_MECH_COMMON;
-                rtlpcipriv->bt_coexist.bt_profile_action = BT_COEX_MECH_COMMON;
+        /* when bt inquiry or page scan, we have to set h2c 0x25 */
+        /* ignore wlanact for continuous 4x2secs */
+        rtl8723e_dm_bt_inq_page_monitor(hw);
+        rtl8723e_dm_bt_reset_action_profile_state(hw);
 
+        if (rtl8723e_dm_bt_is_2_ant_common_action(hw)) {
+                rtlpriv->btcoexist.bt_profile_case = BT_COEX_MECH_COMMON;
+                rtlpriv->btcoexist.bt_profile_action = BT_COEX_MECH_COMMON;
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "Action 2-Ant common.\n");
+                "Action 2-Ant common.\n");
         } else {
                 if ((bt_info_original & BTINFO_B_HID) ||
-                    (bt_info_original & BTINFO_B_SCO_BUSY) ||
-                    (bt_info_original & BTINFO_B_SCO_ESCO)) {
-                        rtlpcipriv->bt_coexist.cstate |=
+                        (bt_info_original & BTINFO_B_SCO_BUSY) ||
+                        (bt_info_original & BTINFO_B_SCO_ESCO)) {
+                                rtlpriv->btcoexist.cstate |=
                                         BT_COEX_STATE_BTINFO_B_HID_SCOESCO;
-                        rtlpcipriv->bt_coexist.bt_profile_case =
+                                rtlpriv->btcoexist.bt_profile_case =
                                         BT_COEX_MECH_HID_SCO_ESCO;
-                        rtlpcipriv->bt_coexist.bt_profile_action =
+                                rtlpriv->btcoexist.bt_profile_action =
                                         BT_COEX_MECH_HID_SCO_ESCO;
-                        RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "[BTCoex], BTInfo: bHid|bSCOBusy|bSCOeSCO\n");
-                        rtl8723ae_dm_bt_2_ant_hid_sco_esco(hw);
+                                RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
+                                         "[BTCoex], BTInfo: bHid|bSCOBusy|bSCOeSCO\n");
+                                rtl8723e_dm_bt_2_ant_hid_sco_esco(hw);
                 } else if ((bt_info_original & BTINFO_B_FTP) ||
-                           (bt_info_original & BTINFO_B_A2DP)) {
-                        rtlpcipriv->bt_coexist.cstate |=
+                                (bt_info_original & BTINFO_B_A2DP)) {
+                                rtlpriv->btcoexist.cstate |=
                                         BT_COEX_STATE_BTINFO_B_FTP_A2DP;
-                        rtlpcipriv->bt_coexist.bt_profile_case =
+                                rtlpriv->btcoexist.bt_profile_case =
                                         BT_COEX_MECH_FTP_A2DP;
-                        rtlpcipriv->bt_coexist.bt_profile_action =
+                                rtlpriv->btcoexist.bt_profile_action =
                                         BT_COEX_MECH_FTP_A2DP;
-                        RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "BTInfo: bFTP|bA2DP\n");
-                        rtl8723ae_dm_bt_2_ant_fta2dp(hw);
+                                RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
+                                         "BTInfo: bFTP|bA2DP\n");
+                                rtl8723e_dm_bt_2_ant_ftp_a2dp(hw);
                 } else {
-                        rtlpcipriv->bt_coexist.cstate |=
-                                         BT_COEX_STATE_BTINFO_B_HID_SCOESCO;
-                        rtlpcipriv->bt_coexist.bt_profile_case =
-                                         BT_COEX_MECH_NONE;
-                        rtlpcipriv->bt_coexist.bt_profile_action =
-                                         BT_COEX_MECH_NONE;
-                        RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                                 "[BTCoex], BTInfo: undefined case!!!!\n");
-                        rtl8723ae_dm_bt_2_ant_hid_sco_esco(hw);
+                                rtlpriv->btcoexist.cstate |=
+                                        BT_COEX_STATE_BTINFO_B_HID_SCOESCO;
+                                rtlpriv->btcoexist.bt_profile_case =
+                                        BT_COEX_MECH_NONE;
+                                rtlpriv->btcoexist.bt_profile_action =
+                                        BT_COEX_MECH_NONE;
+                                RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
+                                         "[BTCoex], BTInfo: undefined case!!!!\n");
+                                rtl8723e_dm_bt_2_ant_hid_sco_esco(hw);
                 }
         }
 }
 
-static void _rtl8723ae_dm_bt_coexist_1_ant(struct ieee80211_hw *hw)
+static void _rtl8723e_dm_bt_coexist_1_ant(struct ieee80211_hw *hw)
 {
+        return;
 }
 
-void rtl8723ae_dm_bt_hw_coex_all_off_8723a(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_hw_coex_all_off_8723a(struct ieee80211_hw *hw)
 {
-        rtl8723ae_dm_bt_set_coex_table(hw, 0x5a5aaaaa, 0xcc, 0x3);
-        rtl8723ae_dm_bt_set_hw_pta_mode(hw, true);
+        rtl8723e_dm_bt_set_coex_table(hw, 0x5a5aaaaa, 0xcc, 0x3);
+        rtl8723e_dm_bt_set_hw_pta_mode(hw, true);
 }
 
-void rtl8723ae_dm_bt_fw_coex_all_off_8723a(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_fw_coex_all_off_8723a(struct ieee80211_hw *hw)
 {
-        rtl8723ae_dm_bt_set_fw_ignore_wlan_act(hw, false);
-        rtl8723ae_dm_bt_set_fw_3a(hw, 0x0, 0x0, 0x0, 0x8, 0x0);
-        rtl8723ae_dm_bt_set_fw_2_ant_hid(hw, false, false);
-        rtl8723ae_dm_bt_set_fw_tra_tdma_ctrl(hw, false,
-                                             TDMA_2ANT, TDMA_NAV_OFF);
-        rtl8723ae_dm_bt_set_fw_tdma_ctrl(hw, false, TDMA_2ANT,
-                                TDMA_NAV_OFF, TDMA_DAC_SWING_OFF);
-        rtl8723ae_dm_bt_set_fw_dac_swing_level(hw, 0);
-        rtl8723ae_dm_bt_set_fw_bt_hid_info(hw, false);
-        rtl8723ae_dm_bt_set_fw_bt_retry_index(hw, 2);
-        rtl8723ae_dm_bt_set_fw_wlan_act(hw, 0x10, 0x10);
-        rtl8723ae_dm_bt_set_fw_dec_bt_pwr(hw, false);
+        rtl8723e_dm_bt_set_fw_ignore_wlan_act(hw, false);
+        rtl8723e_dm_bt_set_fw_3a(hw, 0x0, 0x0, 0x0, 0x8, 0x0);
+        rtl8723e_dm_bt_set_fw_2_ant_hid(hw, false, false);
+        rtl8723e_dm_bt_set_fw_tra_tdma_ctrl(hw, false, TDMA_2ANT,
+                                            TDMA_NAV_OFF);
+        rtl8723e_dm_bt_set_fw_tdma_ctrl(hw, false, TDMA_2ANT, TDMA_NAV_OFF,
+                                        TDMA_DAC_SWING_OFF);
+        rtl8723e_dm_bt_set_fw_dac_swing_level(hw, 0);
+        rtl8723e_dm_bt_set_fw_bt_hid_info(hw, false);
+        rtl8723e_dm_bt_set_fw_bt_retry_index(hw, 2);
+        rtl8723e_dm_bt_set_fw_wlan_act(hw, 0x10, 0x10);
+        rtl8723e_dm_bt_set_fw_dec_bt_pwr(hw, false);
 }
 
-void rtl8723ae_dm_bt_sw_coex_all_off_8723a(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_sw_coex_all_off_8723a(struct ieee80211_hw *hw)
 {
-        rtl8723ae_dm_bt_agc_table(hw, BT_AGCTABLE_OFF);
-        rtl8723ae_dm_bt_bback_off_level(hw, BT_BB_BACKOFF_OFF);
-        rtl8723ae_dm_bt_reject_ap_aggregated_packet(hw, false);
+        rtl8723e_dm_bt_agc_table(hw, BT_AGCTABLE_OFF);
+        rtl8723e_dm_bt_bb_back_off_level(hw, BT_BB_BACKOFF_OFF);
+        rtl8723e_dm_bt_reject_ap_aggregated_packet(hw, false);
 
-        rtl8723ae_bt_set_penalty_tx_rate_adap(hw, BT_TX_RATE_ADAPTIVE_NORMAL);
-        rtl8723ae_dm_bt_set_sw_rf_rx_lpf_corner(hw, BT_RF_RX_LPF_CORNER_RESUME);
-        rtl8723ae_dm_bt_set_sw_full_time_dac_swing(hw, false, 0xc0);
+        dm_bt_set_sw_penalty_tx_rate_adapt(hw, BT_TX_RATE_ADAPTIVE_NORMAL);
+        rtl8723e_dm_bt_set_sw_rf_rx_lpf_corner(hw, BT_RF_RX_LPF_CORNER_RESUME);
+        rtl8723e_dm_bt_set_sw_full_time_dac_swing(hw, false, 0xc0);
 }
 
-static void rtl8723ae_dm_bt_query_bt_information(struct ieee80211_hw *hw)
+static void rtl8723e_dm_bt_query_bt_information(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         u8 h2c_parameter[1] = {0};
 
-        rtlhal->hal_coex_8723.c2h_bt_info_req_sent = true;
+        hal_coex_8723.c2h_bt_info_req_sent = true;
 
         h2c_parameter[0] |=  BIT(0);
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                 "Query Bt information, write 0x38 = 0x%x\n",
-                 h2c_parameter[0]);
+                "Query Bt information, write 0x38=0x%x\n", h2c_parameter[0]);
 
-        rtl8723ae_fill_h2c_cmd(hw, 0x38, 1, h2c_parameter);
+        rtl8723e_fill_h2c_cmd(hw, 0x38, 1, h2c_parameter);
 }
 
-static void rtl8723ae_dm_bt_bt_hw_counters_monitor(struct ieee80211_hw *hw)
+static void rtl8723e_dm_bt_bt_hw_counters_monitor(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
-        u32 reg_htx_rx, reg_ltx_rx, u32_tmp;
-        u32 reg_htx, reg_hrx, reg_ltx, reg_lrx;
-
-        reg_htx_rx = REG_HIGH_PRIORITY_TXRX;
-        reg_ltx_rx = REG_LOW_PRIORITY_TXRX;
-
-        u32_tmp = rtl_read_dword(rtlpriv, reg_htx_rx);
-        reg_htx = u32_tmp & MASKLWORD;
-        reg_hrx = (u32_tmp & MASKHWORD)>>16;
-
-        u32_tmp = rtl_read_dword(rtlpriv, reg_ltx_rx);
-        reg_ltx = u32_tmp & MASKLWORD;
-        reg_lrx = (u32_tmp & MASKHWORD)>>16;
-
-        if (rtlpcipriv->bt_coexist.lps_counter > 1) {
-                reg_htx %= rtlpcipriv->bt_coexist.lps_counter;
-                reg_hrx %= rtlpcipriv->bt_coexist.lps_counter;
-                reg_ltx %= rtlpcipriv->bt_coexist.lps_counter;
-                reg_lrx %= rtlpcipriv->bt_coexist.lps_counter;
+        u32 reg_hp_tx_rx, reg_lp_tx_rx, u32_tmp;
+        u32 reg_hp_tx = 0, reg_hp_rx = 0, reg_lp_tx = 0, reg_lp_rx = 0;
+
+        reg_hp_tx_rx = REG_HIGH_PRIORITY_TXRX;
+        reg_lp_tx_rx = REG_LOW_PRIORITY_TXRX;
+
+        u32_tmp = rtl_read_dword(rtlpriv, reg_hp_tx_rx);
+        reg_hp_tx = u32_tmp & MASKLWORD;
+        reg_hp_rx = (u32_tmp & MASKHWORD)>>16;
+
+        u32_tmp = rtl_read_dword(rtlpriv, reg_lp_tx_rx);
+        reg_lp_tx = u32_tmp & MASKLWORD;
+        reg_lp_rx = (u32_tmp & MASKHWORD)>>16;
+
+        if (rtlpriv->btcoexist.lps_counter > 1) {
+                reg_hp_tx %= rtlpriv->btcoexist.lps_counter;
+                reg_hp_rx %= rtlpriv->btcoexist.lps_counter;
+                reg_lp_tx %= rtlpriv->btcoexist.lps_counter;
+                reg_lp_rx %= rtlpriv->btcoexist.lps_counter;
         }
 
-        rtlhal->hal_coex_8723.high_priority_tx = reg_htx;
-        rtlhal->hal_coex_8723.high_priority_rx = reg_hrx;
-        rtlhal->hal_coex_8723.low_priority_tx = reg_ltx;
-        rtlhal->hal_coex_8723.low_priority_rx = reg_lrx;
+        hal_coex_8723.high_priority_tx = reg_hp_tx;
+        hal_coex_8723.high_priority_rx = reg_hp_rx;
+        hal_coex_8723.low_priority_tx = reg_lp_tx;
+        hal_coex_8723.low_priority_rx = reg_lp_rx;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                 "High Priority Tx/Rx (reg 0x%x)=%x(%d)/%x(%d)\n",
-                 reg_htx_rx, reg_htx, reg_htx, reg_hrx, reg_hrx);
+                "High Priority Tx/Rx (reg 0x%x)=%x(%d)/%x(%d)\n",
+                reg_hp_tx_rx, reg_hp_tx, reg_hp_tx, reg_hp_rx, reg_hp_rx);
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                 "Low Priority Tx/Rx (reg 0x%x)=%x(%d)/%x(%d)\n",
-                 reg_ltx_rx, reg_ltx, reg_ltx, reg_lrx, reg_lrx);
-        rtlpcipriv->bt_coexist.lps_counter = 0;
+                "Low Priority Tx/Rx (reg 0x%x)=%x(%d)/%x(%d)\n",
+                reg_lp_tx_rx, reg_lp_tx, reg_lp_tx, reg_lp_rx, reg_lp_rx);
+        rtlpriv->btcoexist.lps_counter = 0;
+        /* rtl_write_byte(rtlpriv, 0x76e, 0xc); */
 }
 
-static void rtl8723ae_dm_bt_bt_enable_disable_check(struct ieee80211_hw *hw)
+static void rtl8723e_dm_bt_bt_enable_disable_check(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         bool bt_alife = true;
 
-        if (rtlhal->hal_coex_8723.high_priority_tx == 0 &&
-            rtlhal->hal_coex_8723.high_priority_rx == 0 &&
-            rtlhal->hal_coex_8723.low_priority_tx == 0 &&
-            rtlhal->hal_coex_8723.low_priority_rx == 0)
+        if (hal_coex_8723.high_priority_tx == 0 &&
+            hal_coex_8723.high_priority_rx == 0 &&
+            hal_coex_8723.low_priority_tx == 0 &&
+            hal_coex_8723.low_priority_rx == 0) {
                 bt_alife = false;
-        if (rtlhal->hal_coex_8723.high_priority_tx == 0xeaea &&
-            rtlhal->hal_coex_8723.high_priority_rx == 0xeaea &&
-            rtlhal->hal_coex_8723.low_priority_tx == 0xeaea &&
-            rtlhal->hal_coex_8723.low_priority_rx == 0xeaea)
+        }
+        if (hal_coex_8723.high_priority_tx == 0xeaea &&
+            hal_coex_8723.high_priority_rx == 0xeaea &&
+            hal_coex_8723.low_priority_tx == 0xeaea &&
+            hal_coex_8723.low_priority_rx == 0xeaea) {
                 bt_alife = false;
-        if (rtlhal->hal_coex_8723.high_priority_tx == 0xffff &&
-            rtlhal->hal_coex_8723.high_priority_rx == 0xffff &&
-            rtlhal->hal_coex_8723.low_priority_tx == 0xffff &&
-            rtlhal->hal_coex_8723.low_priority_rx == 0xffff)
+        }
+        if (hal_coex_8723.high_priority_tx == 0xffff &&
+            hal_coex_8723.high_priority_rx == 0xffff &&
+            hal_coex_8723.low_priority_tx == 0xffff &&
+            hal_coex_8723.low_priority_rx == 0xffff) {
                 bt_alife = false;
+        }
         if (bt_alife) {
-                rtlpcipriv->bt_coexist.bt_active_zero_cnt = 0;
-                rtlpcipriv->bt_coexist.cur_bt_disabled = false;
+                rtlpriv->btcoexist.bt_active_zero_cnt = 0;
+                rtlpriv->btcoexist.cur_bt_disabled = false;
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "8723A BT is enabled !!\n");
         } else {
-                rtlpcipriv->bt_coexist.bt_active_zero_cnt++;
+                rtlpriv->btcoexist.bt_active_zero_cnt++;
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "8723A bt all counters = 0, %d times!!\n",
-                         rtlpcipriv->bt_coexist.bt_active_zero_cnt);
-                if (rtlpcipriv->bt_coexist.bt_active_zero_cnt >= 2) {
-                        rtlpcipriv->bt_coexist.cur_bt_disabled = true;
+                         "8723A bt all counters=0, %d times!!\n",
+                         rtlpriv->btcoexist.bt_active_zero_cnt);
+                if (rtlpriv->btcoexist.bt_active_zero_cnt >= 2) {
+                        rtlpriv->btcoexist.cur_bt_disabled = true;
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                  "8723A BT is disabled !!\n");
                 }
         }
-        if (rtlpcipriv->bt_coexist.pre_bt_disabled !=
-                rtlpcipriv->bt_coexist.cur_bt_disabled) {
-                RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "8723A BT is from %s to %s!!\n",
-                         (rtlpcipriv->bt_coexist.pre_bt_disabled ?
-                         "disabled" : "enabled"),
-                         (rtlpcipriv->bt_coexist.cur_bt_disabled ?
-                         "disabled" : "enabled"));
-                rtlpcipriv->bt_coexist.pre_bt_disabled
-                        = rtlpcipriv->bt_coexist.cur_bt_disabled;
+        if (rtlpriv->btcoexist.pre_bt_disabled !=
+                rtlpriv->btcoexist.cur_bt_disabled) {
+                RT_TRACE(rtlpriv, COMP_BT_COEXIST,
+                         DBG_TRACE, "8723A BT is from %s to %s!!\n",
+                         (rtlpriv->btcoexist.pre_bt_disabled ?
+                                "disabled" : "enabled"),
+                         (rtlpriv->btcoexist.cur_bt_disabled ?
+                                "disabled" : "enabled"));
+                rtlpriv->btcoexist.pre_bt_disabled
+                        = rtlpriv->btcoexist.cur_bt_disabled;
         }
 }
 
 
-void rtl8723ae_dm_bt_coexist_8723(struct ieee80211_hw *hw)
+void rtl8723e_dm_bt_coexist_8723(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
 
-        rtl8723ae_dm_bt_query_bt_information(hw);
-        rtl8723ae_dm_bt_bt_hw_counters_monitor(hw);
-        rtl8723ae_dm_bt_bt_enable_disable_check(hw);
+        rtl8723e_dm_bt_query_bt_information(hw);
+        rtl8723e_dm_bt_bt_hw_counters_monitor(hw);
+        rtl8723e_dm_bt_bt_enable_disable_check(hw);
 
-        if (rtlpcipriv->bt_coexist.bt_ant_num == ANT_X2) {
+        if (rtlpriv->btcoexist.bt_ant_num == ANT_X2) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTCoex], 2 Ant mechanism\n");
-                _rtl8723ae_dm_bt_coexist_2_ant(hw);
+                        "[BTCoex], 2 Ant mechanism\n");
+                _rtl8723e_dm_bt_coexist_2_ant(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                         "[BTCoex], 1 Ant mechanism\n");
-                _rtl8723ae_dm_bt_coexist_1_ant(hw);
+                        "[BTCoex], 1 Ant mechanism\n");
+                _rtl8723e_dm_bt_coexist_1_ant(hw);
         }
 
-        if (!rtl8723ae_dm_bt_is_same_coexist_state(hw)) {
+        if (!rtl8723e_dm_bt_is_same_coexist_state(hw)) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                          "[BTCoex], Coexist State[bitMap] change from 0x%x%8x to 0x%x%8x\n",
-                         rtlpcipriv->bt_coexist.previous_state_h,
-                         rtlpcipriv->bt_coexist.previous_state,
-                         rtlpcipriv->bt_coexist.cstate_h,
-                         rtlpcipriv->bt_coexist.cstate);
-                rtlpcipriv->bt_coexist.previous_state
-                        = rtlpcipriv->bt_coexist.cstate;
-                rtlpcipriv->bt_coexist.previous_state_h
-                        = rtlpcipriv->bt_coexist.cstate_h;
+                         rtlpriv->btcoexist.previous_state_h,
+                         rtlpriv->btcoexist.previous_state,
+                         rtlpriv->btcoexist.cstate_h,
+                         rtlpriv->btcoexist.cstate);
+                rtlpriv->btcoexist.previous_state
+                        = rtlpriv->btcoexist.cstate;
+                rtlpriv->btcoexist.previous_state_h
+                        = rtlpriv->btcoexist.cstate_h;
         }
 }
 
-static void rtl8723ae_dm_bt_parse_bt_info(struct ieee80211_hw *hw,
-                                          u8 *tmbuf, u8 len)
+static void rtl8723e_dm_bt_parse_bt_info(struct ieee80211_hw *hw,
+                                         u8 *tmp_buf, u8 len)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
         u8 bt_info;
         u8 i;
 
-        rtlhal->hal_coex_8723.c2h_bt_info_req_sent = false;
-        rtlhal->hal_coex_8723.bt_retry_cnt = 0;
+        hal_coex_8723.c2h_bt_info_req_sent = false;
+        hal_coex_8723.bt_retry_cnt = 0;
         for (i = 0; i < len; i++) {
                 if (i == 0)
-                        rtlhal->hal_coex_8723.c2h_bt_info_original = tmbuf[i];
+                        hal_coex_8723.c2h_bt_info_original = tmp_buf[i];
                 else if (i == 1)
-                        rtlhal->hal_coex_8723.bt_retry_cnt = tmbuf[i];
-                if (i == len-1) {
+                        hal_coex_8723.bt_retry_cnt = tmp_buf[i];
+                if (i == len-1)
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "0x%2x]", tmbuf[i]);
-                } else {
+                                 "0x%2x]", tmp_buf[i]);
+                else
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
-                                 "0x%2x, ", tmbuf[i]);
-                }
+                                 "0x%2x, ", tmp_buf[i]);
+
         }
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                 "BT info bt_info (Data)= 0x%x\n",
-                 rtlhal->hal_coex_8723.c2h_bt_info_original);
-        bt_info = rtlhal->hal_coex_8723.c2h_bt_info_original;
+                "BT info bt_info (Data)= 0x%x\n",
+                        hal_coex_8723.c2h_bt_info_original);
+        bt_info = hal_coex_8723.c2h_bt_info_original;
 
         if (bt_info & BIT(2))
-                rtlhal->hal_coex_8723.c2h_bt_inquiry_page = true;
+                hal_coex_8723.c2h_bt_inquiry_page = true;
         else
-                rtlhal->hal_coex_8723.c2h_bt_inquiry_page = false;
+                hal_coex_8723.c2h_bt_inquiry_page = false;
+
 
         if (bt_info & BTINFO_B_CONNECTION) {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTC2H], BTInfo: bConnect=true\n");
-                rtlpcipriv->bt_coexist.bt_busy = true;
-                rtlpcipriv->bt_coexist.cstate &= ~BT_COEX_STATE_BT_IDLE;
+                        "[BTC2H], BTInfo: bConnect=true\n");
+                rtlpriv->btcoexist.bt_busy = true;
+                rtlpriv->btcoexist.cstate &= ~BT_COEX_STATE_BT_IDLE;
         } else {
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
-                         "[BTC2H], BTInfo: bConnect=false\n");
-                rtlpcipriv->bt_coexist.bt_busy = false;
-                rtlpcipriv->bt_coexist.cstate |= BT_COEX_STATE_BT_IDLE;
+                        "[BTC2H], BTInfo: bConnect=false\n");
+                rtlpriv->btcoexist.bt_busy = false;
+                rtlpriv->btcoexist.cstate |= BT_COEX_STATE_BT_IDLE;
         }
 }
 void rtl_8723e_c2h_command_handle(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct c2h_evt_hdr c2h_event;
-        u8 *ptmbuf;
-        u8 index;
-        u8 u1tmp;
-
+        u8 *ptmp_buf = NULL;
+        u8 index = 0;
+        u8 u1b_tmp = 0;
         memset(&c2h_event, 0, sizeof(c2h_event));
-        u1tmp = rtl_read_byte(rtlpriv, REG_C2HEVT_MSG_NORMAL);
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_C2HEVT_MSG_NORMAL);
         RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                 "&&&&&&: REG_C2HEVT_MSG_NORMAL is 0x%x\n", u1tmp);
-        c2h_event.cmd_id = u1tmp & 0xF;
-        c2h_event.cmd_len = (u1tmp & 0xF0) >> 4;
+                "&&&&&&: REG_C2HEVT_MSG_NORMAL is 0x%x\n", u1b_tmp);
+        c2h_event.cmd_id = u1b_tmp & 0xF;
+        c2h_event.cmd_len = (u1b_tmp & 0xF0) >> 4;
         c2h_event.cmd_seq = rtl_read_byte(rtlpriv, REG_C2HEVT_MSG_NORMAL + 1);
         RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
                  "cmd_id: %d, cmd_len: %d, cmd_seq: %d\n",
                  c2h_event.cmd_id , c2h_event.cmd_len, c2h_event.cmd_seq);
-        u1tmp = rtl_read_byte(rtlpriv, 0x01AF);
-        if (u1tmp == C2H_EVT_HOST_CLOSE) {
+        u1b_tmp = rtl_read_byte(rtlpriv, 0x01AF);
+        if (u1b_tmp == C2H_EVT_HOST_CLOSE) {
                 return;
-        } else if (u1tmp != C2H_EVT_FW_CLOSE) {
+        } else if (u1b_tmp != C2H_EVT_FW_CLOSE) {
                 rtl_write_byte(rtlpriv, 0x1AF, 0x00);
                 return;
         }
-        ptmbuf = kmalloc(c2h_event.cmd_len, GFP_KERNEL);
-        if (ptmbuf == NULL) {
+        ptmp_buf = kzalloc(c2h_event.cmd_len, GFP_KERNEL);
+        if (ptmp_buf == NULL) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
                          "malloc cmd buf failed\n");
                 return;
@@ -1757,30 +1744,37 @@ void rtl_8723e_c2h_command_handle(struct ieee80211_hw *hw)
 
         /* Read the content */
         for (index = 0; index < c2h_event.cmd_len; index++)
-                ptmbuf[index] = rtl_read_byte(rtlpriv, REG_C2HEVT_MSG_NORMAL +
-                                  2 + index);
+                ptmp_buf[index] = rtl_read_byte(rtlpriv,
+                                        REG_C2HEVT_MSG_NORMAL + 2 + index);
+
 
         switch (c2h_event.cmd_id) {
         case C2H_BT_RSSI:
-                break;
+                        break;
 
         case C2H_BT_OP_MODE:
                         break;
 
         case BT_INFO:
                 RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                         "BT info Byte[0] (ID) is 0x%x\n", c2h_event.cmd_id);
+                        "BT info Byte[0] (ID) is 0x%x\n",
+                        c2h_event.cmd_id);
                 RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                         "BT info Byte[1] (Seq) is 0x%x\n", c2h_event.cmd_seq);
+                        "BT info Byte[1] (Seq) is 0x%x\n",
+                        c2h_event.cmd_seq);
                 RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                         "BT info Byte[2] (Data)= 0x%x\n", ptmbuf[0]);
+                        "BT info Byte[2] (Data)= 0x%x\n", ptmp_buf[0]);
+
+                rtl8723e_dm_bt_parse_bt_info(hw, ptmp_buf, c2h_event.cmd_len);
+
+                if (rtlpriv->cfg->ops->get_btc_status())
+                        rtlpriv->btcoexist.btc_ops->btc_periodical(rtlpriv);
 
-                rtl8723ae_dm_bt_parse_bt_info(hw, ptmbuf, c2h_event.cmd_len);
                 break;
         default:
                 break;
         }
-        kfree(ptmbuf);
+        kfree(ptmp_buf);
 
         rtl_write_byte(rtlpriv, 0x01AF, C2H_EVT_HOST_CLOSE);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.h b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.h
index 4325ecd58f0c..3723d7476717 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -24,8 +20,7 @@
  * Hsinchu 300, Taiwan.
  * Larry Finger <Larry.Finger@lwfinger.net>
  *
- ****************************************************************************
- */
+ *****************************************************************************/
 
 #ifndef __RTL8723E_HAL_BTC_H__
 #define __RTL8723E_HAL_BTC_H__
@@ -34,21 +29,31 @@
 #include "btc.h"
 #include "hal_bt_coexist.h"
 
-#define BT_TXRX_CNT_THRES_1             1200
-#define BT_TXRX_CNT_THRES_2             1400
-#define BT_TXRX_CNT_THRES_3             3000
-#define BT_TXRX_CNT_LEVEL_0             0       /* < 1200 */
-#define BT_TXRX_CNT_LEVEL_1             1       /* >= 1200 && < 1400 */
-#define BT_TXRX_CNT_LEVEL_2             2       /* >= 1400 */
-#define BT_TXRX_CNT_LEVEL_3             3
+#define BT_TXRX_CNT_THRES_1                     1200
+#define BT_TXRX_CNT_THRES_2                     1400
+#define BT_TXRX_CNT_THRES_3                     3000
+/* < 1200 */
+#define BT_TXRX_CNT_LEVEL_0                     0
+/* >= 1200 && < 1400 */
+#define BT_TXRX_CNT_LEVEL_1                     1
+/* >= 1400 */
+#define BT_TXRX_CNT_LEVEL_2                     2
+#define BT_TXRX_CNT_LEVEL_3                     3
+
+#define BT_COEX_DISABLE                 0
+#define BT_Q_PKT_OFF                    0
+#define BT_Q_PKT_ON                     1
+
+#define BT_TX_PWR_OFF                   0
+#define BT_TX_PWR_ON                    1
 
 /* TDMA mode definition */
-#define TDMA_2ANT               0
-#define TDMA_1ANT               1
-#define TDMA_NAV_OFF            0
-#define TDMA_NAV_ON             1
-#define TDMA_DAC_SWING_OFF      0
-#define TDMA_DAC_SWING_ON       1
+#define TDMA_2ANT                       0
+#define TDMA_1ANT                       1
+#define TDMA_NAV_OFF                    0
+#define TDMA_NAV_ON                     1
+#define TDMA_DAC_SWING_OFF              0
+#define TDMA_DAC_SWING_ON               1
 
 /* PTA mode related definition */
 #define BT_PTA_MODE_OFF         0
@@ -80,6 +85,7 @@ enum bt_traffic_mode_profile {
         BT_PROFILE_SCO
 };
 
+/*
 enum hci_ext_bt_operation {
         HCI_BT_OP_NONE = 0x0,
         HCI_BT_OP_INQUIRE_START = 0x1,
@@ -93,6 +99,7 @@ enum hci_ext_bt_operation {
         HCI_BT_OP_BT_DEV_DISABLE = 0x9,
         HCI_BT_OP_MAX,
 };
+*/
 
 enum bt_spec {
         BT_SPEC_1_0_b = 0x00,
@@ -123,12 +130,12 @@ enum bt_state {
         BT_INFO_STATE_MAX = 7
 };
 
-enum rtl8723ae_c2h_evt {
+enum rtl8723e_c2h_evt {
         C2H_DBG = 0,
         C2H_TSF = 1,
         C2H_AP_RPT_RSP = 2,
-        C2H_CCX_TX_RPT = 3,     /* The FW notify the report of the specific */
-                                /* tx packet. */
+        /* The FW notify the report of the specific tx packet. */
+        C2H_CCX_TX_RPT = 3,
         C2H_BT_RSSI = 4,
         C2H_BT_OP_MODE = 5,
         C2H_HW_INFO_EXCH = 10,
@@ -137,15 +144,16 @@ enum rtl8723ae_c2h_evt {
         MAX_C2HEVENT
 };
 
-void rtl8723ae_dm_bt_fw_coex_all_off_8723a(struct ieee80211_hw *hw);
-void rtl8723ae_dm_bt_sw_coex_all_off_8723a(struct ieee80211_hw *hw);
-void rtl8723ae_dm_bt_hw_coex_all_off_8723a(struct ieee80211_hw *hw);
-void rtl8723ae_dm_bt_coexist_8723(struct ieee80211_hw *hw);
-void rtl8723ae_dm_bt_set_bt_dm(struct ieee80211_hw *hw,
+void rtl8723e_dm_bt_fw_coex_all_off_8723a(struct ieee80211_hw *hw);
+void rtl8723e_dm_bt_sw_coex_all_off_8723a(struct ieee80211_hw *hw);
+void rtl8723e_dm_bt_hw_coex_all_off_8723a(struct ieee80211_hw *hw);
+void rtl8723e_dm_bt_coexist_8723(struct ieee80211_hw *hw);
+void rtl8723e_dm_bt_set_bt_dm(struct ieee80211_hw *hw,
                               struct btdm_8723 *p_btdm);
 void rtl_8723e_c2h_command_handle(struct ieee80211_hw *hw);
 void rtl_8723e_bt_wifi_media_status_notify(struct ieee80211_hw *hw,
-                                           bool mstatus);
-void rtl8723ae_bt_coex_off_before_lps(struct ieee80211_hw *hw);
+                                        bool mstatus);
+void rtl8723e_dm_bt_turn_off_bt_coexist_before_enter_lps(
+                                struct ieee80211_hw *hw);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index 662a079f76f3..aa085462d0e9 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -37,17 +33,21 @@
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
+#include "../rtl8723com/phy_common.h"
 #include "dm.h"
 #include "../rtl8723com/dm_common.h"
 #include "fw.h"
 #include "../rtl8723com/fw_common.h"
 #include "led.h"
 #include "hw.h"
+#include "../pwrseqcmd.h"
 #include "pwrseq.h"
 #include "btc.h"
 
-static void _rtl8723ae_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
-                                        u8 set_bits, u8 clear_bits)
+#define LLT_CONFIG      5
+
+static void _rtl8723e_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
+                                       u8 set_bits, u8 clear_bits)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -58,7 +58,7 @@ static void _rtl8723ae_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
         rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8) rtlpci->reg_bcn_ctrl_val);
 }
 
-static void _rtl8723ae_stop_tx_beacon(struct ieee80211_hw *hw)
+static void _rtl8723e_stop_tx_beacon(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmp1byte;
@@ -71,7 +71,7 @@ static void _rtl8723ae_stop_tx_beacon(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 2, tmp1byte);
 }
 
-static void _rtl8723ae_resume_tx_beacon(struct ieee80211_hw *hw)
+static void _rtl8723e_resume_tx_beacon(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmp1byte;
@@ -84,17 +84,17 @@ static void _rtl8723ae_resume_tx_beacon(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 2, tmp1byte);
 }
 
-static void _rtl8723ae_enable_bcn_sufunc(struct ieee80211_hw *hw)
+static void _rtl8723e_enable_bcn_sub_func(struct ieee80211_hw *hw)
 {
-        _rtl8723ae_set_bcn_ctrl_reg(hw, 0, BIT(1));
+        _rtl8723e_set_bcn_ctrl_reg(hw, 0, BIT(1));
 }
 
-static void _rtl8723ae_disable_bcn_sufunc(struct ieee80211_hw *hw)
+static void _rtl8723e_disable_bcn_sub_func(struct ieee80211_hw *hw)
 {
-        _rtl8723ae_set_bcn_ctrl_reg(hw, BIT(1), 0);
+        _rtl8723e_set_bcn_ctrl_reg(hw, BIT(1), 0);
 }
 
-void rtl8723ae_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
+void rtl8723e_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
@@ -102,54 +102,55 @@ void rtl8723ae_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
         switch (variable) {
         case HW_VAR_RCR:
-                *((u32 *) (val)) = rtlpci->receive_config;
+                *((u32 *)(val)) = rtlpci->receive_config;
                 break;
         case HW_VAR_RF_STATE:
                 *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
                 break;
         case HW_VAR_FWLPS_RF_ON:{
-                enum rf_pwrstate rfState;
-                u32 val_rcr;
-
-                rtlpriv->cfg->ops->get_hw_reg(hw,
-                                              HW_VAR_RF_STATE,
-                                              (u8 *) (&rfState));
-                if (rfState == ERFOFF) {
-                        *((bool *) (val)) = true;
-                } else {
-                        val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
-                        val_rcr &= 0x00070000;
-                        if (val_rcr)
-                                *((bool *) (val)) = false;
-                        else
-                                *((bool *) (val)) = true;
+                        enum rf_pwrstate rfstate;
+                        u32 val_rcr;
+
+                        rtlpriv->cfg->ops->get_hw_reg(hw,
+                                                      HW_VAR_RF_STATE,
+                                                      (u8 *)(&rfstate));
+                        if (rfstate == ERFOFF) {
+                                *((bool *)(val)) = true;
+                        } else {
+                                val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
+                                val_rcr &= 0x00070000;
+                                if (val_rcr)
+                                        *((bool *)(val)) = false;
+                                else
+                                        *((bool *)(val)) = true;
+                        }
+                        break;
                 }
-                break; }
         case HW_VAR_FW_PSMODE_STATUS:
-                *((bool *) (val)) = ppsc->fw_current_inpsmode;
+                *((bool *)(val)) = ppsc->fw_current_inpsmode;
                 break;
         case HW_VAR_CORRECT_TSF:{
-                u64 tsf;
-                u32 *ptsf_low = (u32 *)&tsf;
-                u32 *ptsf_high = ((u32 *)&tsf) + 1;
+                        u64 tsf;
+                        u32 *ptsf_low = (u32 *)&tsf;
+                        u32 *ptsf_high = ((u32 *)&tsf) + 1;
 
-                *ptsf_high = rtl_read_dword(rtlpriv, (REG_TSFTR + 4));
-                *ptsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+                        *ptsf_high = rtl_read_dword(rtlpriv, (REG_TSFTR + 4));
+                        *ptsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
 
-                *((u64 *) (val)) = tsf;
+                        *((u64 *)(val)) = tsf;
 
-                break; }
+                        break;
+                }
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                          "switch case not process\n");
                 break;
         }
 }
 
-void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
+void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
@@ -157,362 +158,400 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         u8 idx;
 
         switch (variable) {
-        case HW_VAR_ETHER_ADDR:
-                for (idx = 0; idx < ETH_ALEN; idx++) {
-                        rtl_write_byte(rtlpriv, (REG_MACID + idx),
-                                       val[idx]);
+        case HW_VAR_ETHER_ADDR:{
+                        for (idx = 0; idx < ETH_ALEN; idx++) {
+                                rtl_write_byte(rtlpriv, (REG_MACID + idx),
+                                               val[idx]);
+                        }
+                        break;
                 }
-                break;
         case HW_VAR_BASIC_RATE:{
-                u16 rate_cfg = ((u16 *) val)[0];
-                u8 rate_index = 0;
-                rate_cfg = rate_cfg & 0x15f;
-                rate_cfg |= 0x01;
-                rtl_write_byte(rtlpriv, REG_RRSR, rate_cfg & 0xff);
-                rtl_write_byte(rtlpriv, REG_RRSR + 1,
-                               (rate_cfg >> 8) & 0xff);
-                while (rate_cfg > 0x1) {
-                        rate_cfg = (rate_cfg >> 1);
-                        rate_index++;
+                        u16 b_rate_cfg = ((u16 *)val)[0];
+                        u8 rate_index = 0;
+
+                        b_rate_cfg = b_rate_cfg & 0x15f;
+                        b_rate_cfg |= 0x01;
+                        rtl_write_byte(rtlpriv, REG_RRSR, b_rate_cfg & 0xff);
+                        rtl_write_byte(rtlpriv, REG_RRSR + 1,
+                                       (b_rate_cfg >> 8) & 0xff);
+                        while (b_rate_cfg > 0x1) {
+                                b_rate_cfg = (b_rate_cfg >> 1);
+                                rate_index++;
+                        }
+                        rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL,
+                                       rate_index);
+                        break;
                 }
-                rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL,
-                               rate_index);
-                break; }
-        case HW_VAR_BSSID:
-                for (idx = 0; idx < ETH_ALEN; idx++) {
-                        rtl_write_byte(rtlpriv, (REG_BSSID + idx),
-                                       val[idx]);
+        case HW_VAR_BSSID:{
+                        for (idx = 0; idx < ETH_ALEN; idx++) {
+                                rtl_write_byte(rtlpriv, (REG_BSSID + idx),
+                                               val[idx]);
+                        }
+                        break;
                 }
-                break;
-        case HW_VAR_SIFS:
-                rtl_write_byte(rtlpriv, REG_SIFS_CTX + 1, val[0]);
-                rtl_write_byte(rtlpriv, REG_SIFS_TRX + 1, val[1]);
+        case HW_VAR_SIFS:{
+                        rtl_write_byte(rtlpriv, REG_SIFS_CTX + 1, val[0]);
+                        rtl_write_byte(rtlpriv, REG_SIFS_TRX + 1, val[1]);
 
-                rtl_write_byte(rtlpriv, REG_SPEC_SIFS + 1, val[0]);
-                rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
+                        rtl_write_byte(rtlpriv, REG_SPEC_SIFS + 1, val[0]);
+                        rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
 
-                if (!mac->ht_enable)
-                        rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
-                                       0x0e0e);
-                else
-                        rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
-                                       *((u16 *) val));
-                break;
+                        if (!mac->ht_enable)
+                                rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
+                                               0x0e0e);
+                        else
+                                rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
+                                               *((u16 *)val));
+                        break;
+                }
         case HW_VAR_SLOT_TIME:{
-                u8 e_aci;
+                        u8 e_aci;
 
-                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                         "HW_VAR_SLOT_TIME %x\n", val[0]);
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                 "HW_VAR_SLOT_TIME %x\n", val[0]);
 
-                rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
+                        rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
 
-                for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
-                                                      &e_aci);
+                        for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                              HW_VAR_AC_PARAM,
+                                                              (u8 *)(&e_aci));
+                        }
+                        break;
                 }
-                break; }
         case HW_VAR_ACK_PREAMBLE:{
-                u8 reg_tmp;
-                u8 short_preamble = (bool)*val;
-                reg_tmp = (mac->cur_40_prime_sc) << 5;
-                if (short_preamble)
-                        reg_tmp |= 0x80;
-
-                rtl_write_byte(rtlpriv, REG_RRSR + 2, reg_tmp);
-                break; }
+                        u8 reg_tmp;
+                        u8 short_preamble = (bool)(*(u8 *)val);
+
+                        reg_tmp = (mac->cur_40_prime_sc) << 5;
+                        if (short_preamble)
+                                reg_tmp |= 0x80;
+
+                        rtl_write_byte(rtlpriv, REG_RRSR + 2, reg_tmp);
+                        break;
+                }
         case HW_VAR_AMPDU_MIN_SPACE:{
-                u8 min_spacing_to_set;
-                u8 sec_min_space;
+                        u8 min_spacing_to_set;
+                        u8 sec_min_space;
 
-                min_spacing_to_set = *val;
-                if (min_spacing_to_set <= 7) {
-                        sec_min_space = 0;
+                        min_spacing_to_set = *((u8 *)val);
+                        if (min_spacing_to_set <= 7) {
+                                sec_min_space = 0;
 
-                        if (min_spacing_to_set < sec_min_space)
-                                min_spacing_to_set = sec_min_space;
+                                if (min_spacing_to_set < sec_min_space)
+                                        min_spacing_to_set = sec_min_space;
 
-                        mac->min_space_cfg = ((mac->min_space_cfg &
-                                               0xf8) |
-                                              min_spacing_to_set);
+                                mac->min_space_cfg = ((mac->min_space_cfg &
+                                                       0xf8) |
+                                                      min_spacing_to_set);
 
-                        *val = min_spacing_to_set;
+                                *val = min_spacing_to_set;
 
-                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                  mac->min_space_cfg);
+                                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                         "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                          mac->min_space_cfg);
 
-                        rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
-                                       mac->min_space_cfg);
+                                rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
+                                               mac->min_space_cfg);
+                        }
+                        break;
                 }
-                break; }
         case HW_VAR_SHORTGI_DENSITY:{
-                u8 density_to_set;
+                        u8 density_to_set;
 
-                density_to_set = *val;
-                mac->min_space_cfg |= (density_to_set << 3);
+                        density_to_set = *((u8 *)val);
+                        mac->min_space_cfg |= (density_to_set << 3);
 
-                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                         "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                         mac->min_space_cfg);
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                                  mac->min_space_cfg);
 
-                rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
-                               mac->min_space_cfg);
+                        rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
+                                       mac->min_space_cfg);
 
-                break; }
+                        break;
+                }
         case HW_VAR_AMPDU_FACTOR:{
-                u8 regtoset_normal[4] = {0x41, 0xa8, 0x72, 0xb9};
-                u8 regtoset_bt[4] = {0x31, 0x74, 0x42, 0x97};
-                u8 factor_toset;
-                u8 *p_regtoset = NULL;
-                u8 index;
-
-                if ((pcipriv->bt_coexist.bt_coexistence) &&
-                    (pcipriv->bt_coexist.bt_coexist_type == BT_CSR_BC4))
-                        p_regtoset = regtoset_bt;
-                else
-                        p_regtoset = regtoset_normal;
-
-                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++) {
-                                if ((p_regtoset[index] & 0xf0) >
-                                    (factor_toset << 4))
-                                        p_regtoset[index] =
-                                            (p_regtoset[index] & 0x0f) |
-                                            (factor_toset << 4);
-
-                                if ((p_regtoset[index] & 0x0f) >
-                                    factor_toset)
-                                        p_regtoset[index] =
-                                            (p_regtoset[index] & 0xf0) |
-                                            (factor_toset);
-
-                                rtl_write_byte(rtlpriv,
-                                               (REG_AGGLEN_LMT + index),
-                                               p_regtoset[index]);
+                        u8 regtoset_normal[4] = { 0x41, 0xa8, 0x72, 0xb9 };
+                        u8 regtoset_bt[4] = {0x31, 0x74, 0x42, 0x97};
+                        u8 factor_toset;
+                        u8 *p_regtoset = NULL;
+                        u8 index = 0;
+
+                        if ((rtlpriv->btcoexist.bt_coexistence) &&
+                            (rtlpriv->btcoexist.bt_coexist_type ==
+                                BT_CSR_BC4))
+                                p_regtoset = regtoset_bt;
+                        else
+                                p_regtoset = regtoset_normal;
+
+                        factor_toset = *((u8 *)val);
+                        if (factor_toset <= 3) {
+                                factor_toset = (1 << (factor_toset + 2));
+                                if (factor_toset > 0xf)
+                                        factor_toset = 0xf;
+
+                                for (index = 0; index < 4; index++) {
+                                        if ((p_regtoset[index] & 0xf0) >
+                                            (factor_toset << 4))
+                                                p_regtoset[index] =
+                                                    (p_regtoset[index] & 0x0f) |
+                                                    (factor_toset << 4);
+
+                                        if ((p_regtoset[index] & 0x0f) >
+                                            factor_toset)
+                                                p_regtoset[index] =
+                                                    (p_regtoset[index] & 0xf0) |
+                                                    (factor_toset);
+
+                                        rtl_write_byte(rtlpriv,
+                                                       (REG_AGGLEN_LMT + index),
+                                                       p_regtoset[index]);
+                                }
 
+                                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                         "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                          factor_toset);
                         }
-
-                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 "Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                 factor_toset);
+                        break;
                 }
-                break; }
         case HW_VAR_AC_PARAM:{
-                u8 e_aci = *val;
-                rtl8723_dm_init_edca_turbo(hw);
+                        u8 e_aci = *((u8 *)val);
 
-                if (rtlpci->acm_method != EACMWAY2_SW)
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL,
-                                                      &e_aci);
-                break; }
+                        rtl8723_dm_init_edca_turbo(hw);
+
+                        if (rtlpci->acm_method != EACMWAY2_SW)
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                              HW_VAR_ACM_CTRL,
+                                                              (u8 *)(&e_aci));
+                        break;
+                }
         case HW_VAR_ACM_CTRL:{
-                u8 e_aci = *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, REG_ACMHWCTRL);
-
-                acm_ctrl |= ((rtlpci->acm_method == 2) ? 0x0 : 0x1);
-
-                if (acm) {
-                        switch (e_aci) {
-                        case AC0_BE:
-                                acm_ctrl |= AcmHw_BeqEn;
-                                break;
-                        case AC2_VI:
-                                acm_ctrl |= AcmHw_ViqEn;
-                                break;
-                        case AC3_VO:
-                                acm_ctrl |= AcmHw_VoqEn;
-                                break;
-                        default:
-                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
-                                         acm);
-                                break;
-                        }
-                } else {
-                        switch (e_aci) {
-                        case AC0_BE:
-                                acm_ctrl &= (~AcmHw_BeqEn);
-                                break;
-                        case AC2_VI:
-                                acm_ctrl &= (~AcmHw_ViqEn);
-                                break;
-                        case AC3_VO:
-                                acm_ctrl &= (~AcmHw_BeqEn);
-                                break;
-                        default:
-                                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                         "switch case not processed\n");
-                                break;
+                        u8 e_aci = *((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, REG_ACMHWCTRL);
+
+                        acm_ctrl =
+                            acm_ctrl | ((rtlpci->acm_method == 2) ? 0x0 : 0x1);
+
+                        if (acm) {
+                                switch (e_aci) {
+                                case AC0_BE:
+                                        acm_ctrl |= ACMHW_BEQEN;
+                                        break;
+                                case AC2_VI:
+                                        acm_ctrl |= ACMHW_VIQEN;
+                                        break;
+                                case AC3_VO:
+                                        acm_ctrl |= ACMHW_VOQEN;
+                                        break;
+                                default:
+                                        RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                                 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                                 acm);
+                                        break;
+                                }
+                        } else {
+                                switch (e_aci) {
+                                case AC0_BE:
+                                        acm_ctrl &= (~ACMHW_BEQEN);
+                                        break;
+                                case AC2_VI:
+                                        acm_ctrl &= (~ACMHW_VIQEN);
+                                        break;
+                                case AC3_VO:
+                                        acm_ctrl &= (~ACMHW_BEQEN);
+                                        break;
+                                default:
+                                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                                 "switch case not process\n");
+                                        break;
+                                }
                         }
-                }
 
-                RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
-                         acm_ctrl);
-                rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
-                break; }
-        case HW_VAR_RCR:
-                rtl_write_dword(rtlpriv, REG_RCR, ((u32 *) (val))[0]);
-                rtlpci->receive_config = ((u32 *) (val))[0];
-                break;
+                        RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
+                                 "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                                 acm_ctrl);
+                        rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
+                        break;
+                }
+        case HW_VAR_RCR:{
+                        rtl_write_dword(rtlpriv, REG_RCR, ((u32 *)(val))[0]);
+                        rtlpci->receive_config = ((u32 *)(val))[0];
+                        break;
+                }
         case HW_VAR_RETRY_LIMIT:{
-                u8 retry_limit = *val;
+                        u8 retry_limit = ((u8 *)(val))[0];
 
-                rtl_write_word(rtlpriv, REG_RL,
-                               retry_limit << RETRY_LIMIT_SHORT_SHIFT |
-                               retry_limit << RETRY_LIMIT_LONG_SHIFT);
-                break; }
+                        rtl_write_word(rtlpriv, REG_RL,
+                                       retry_limit << RETRY_LIMIT_SHORT_SHIFT |
+                                       retry_limit << RETRY_LIMIT_LONG_SHIFT);
+                        break;
+                }
         case HW_VAR_DUAL_TSF_RST:
                 rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, (BIT(0) | BIT(1)));
                 break;
         case HW_VAR_EFUSE_BYTES:
-                rtlefuse->efuse_usedbytes = *((u16 *) val);
+                rtlefuse->efuse_usedbytes = *((u16 *)val);
                 break;
         case HW_VAR_EFUSE_USAGE:
-                rtlefuse->efuse_usedpercentage = *val;
+                rtlefuse->efuse_usedpercentage = *((u8 *)val);
                 break;
         case HW_VAR_IO_CMD:
-                rtl8723ae_phy_set_io_cmd(hw, (*(enum io_type *)val));
+                rtl8723e_phy_set_io_cmd(hw, (*(enum io_type *)val));
                 break;
         case HW_VAR_WPA_CONFIG:
-                rtl_write_byte(rtlpriv, REG_SECCFG, *val);
+                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val));
                 break;
         case HW_VAR_SET_RPWM:{
-                u8 rpwm_val;
+                        u8 rpwm_val;
 
-                rpwm_val = rtl_read_byte(rtlpriv, REG_PCIE_HRPWM);
-                udelay(1);
+                        rpwm_val = rtl_read_byte(rtlpriv, REG_PCIE_HRPWM);
+                        udelay(1);
 
-                if (rpwm_val & BIT(7)) {
-                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val);
-                } else {
-                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val | BIT(7));
-                }
+                        if (rpwm_val & BIT(7)) {
+                                rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
+                                               (*(u8 *)val));
+                        } else {
+                                rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
+                                               ((*(u8 *)val) | BIT(7)));
+                        }
 
-                break; }
+                        break;
+                }
         case HW_VAR_H2C_FW_PWRMODE:{
-                u8 psmode = *val;
+                        u8 psmode = (*(u8 *)val);
 
-                if (psmode != FW_PS_ACTIVE_MODE)
-                        rtl8723ae_dm_rf_saving(hw, true);
+                        if (psmode != FW_PS_ACTIVE_MODE)
+                                rtl8723e_dm_rf_saving(hw, true);
 
-                rtl8723ae_set_fw_pwrmode_cmd(hw, *val);
-                break; }
+                        rtl8723e_set_fw_pwrmode_cmd(hw, (*(u8 *)val));
+                        break;
+                }
         case HW_VAR_FW_PSMODE_STATUS:
-                ppsc->fw_current_inpsmode = *((bool *) val);
+                ppsc->fw_current_inpsmode = *((bool *)val);
                 break;
         case HW_VAR_H2C_FW_JOINBSSRPT:{
-                u8 mstatus = *val;
-                u8 tmp_regcr, tmp_reg422;
-                bool recover = false;
-
-                if (mstatus == RT_MEDIA_CONNECT) {
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID, NULL);
-
-                        tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
-                        rtl_write_byte(rtlpriv, REG_CR + 1,
-                                       (tmp_regcr | BIT(0)));
-
-                        _rtl8723ae_set_bcn_ctrl_reg(hw, 0, BIT(3));
-                        _rtl8723ae_set_bcn_ctrl_reg(hw, BIT(4), 0);
+                        u8 mstatus = (*(u8 *)val);
+                        u8 tmp_regcr, tmp_reg422;
+                        bool b_recover = false;
+
+                        if (mstatus == RT_MEDIA_CONNECT) {
+                                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID,
+                                                              NULL);
+
+                                tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
+                                rtl_write_byte(rtlpriv, REG_CR + 1,
+                                               (tmp_regcr | BIT(0)));
+
+                                _rtl8723e_set_bcn_ctrl_reg(hw, 0, BIT(3));
+                                _rtl8723e_set_bcn_ctrl_reg(hw, BIT(4), 0);
+
+                                tmp_reg422 =
+                                    rtl_read_byte(rtlpriv,
+                                                  REG_FWHW_TXQ_CTRL + 2);
+                                if (tmp_reg422 & BIT(6))
+                                        b_recover = true;
+                                rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
+                                               tmp_reg422 & (~BIT(6)));
 
-                        tmp_reg422 = rtl_read_byte(rtlpriv,
-                                     REG_FWHW_TXQ_CTRL + 2);
-                        if (tmp_reg422 & BIT(6))
-                                recover = true;
-                        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
-                                       tmp_reg422 & (~BIT(6)));
+                                rtl8723e_set_fw_rsvdpagepkt(hw, 0);
 
-                        rtl8723ae_set_fw_rsvdpagepkt(hw, 0);
+                                _rtl8723e_set_bcn_ctrl_reg(hw, BIT(3), 0);
+                                _rtl8723e_set_bcn_ctrl_reg(hw, 0, BIT(4));
 
-                        _rtl8723ae_set_bcn_ctrl_reg(hw, BIT(3), 0);
-                        _rtl8723ae_set_bcn_ctrl_reg(hw, 0, BIT(4));
+                                if (b_recover) {
+                                        rtl_write_byte(rtlpriv,
+                                                       REG_FWHW_TXQ_CTRL + 2,
+                                                       tmp_reg422);
+                                }
 
-                        if (recover)
-                                rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
-                                               tmp_reg422);
+                                rtl_write_byte(rtlpriv, REG_CR + 1,
+                                               (tmp_regcr & ~(BIT(0))));
+                        }
+                        rtl8723e_set_fw_joinbss_report_cmd(hw, (*(u8 *)val));
 
-                        rtl_write_byte(rtlpriv, REG_CR + 1,
-                                       (tmp_regcr & ~(BIT(0))));
+                        break;
                 }
-                rtl8723ae_set_fw_joinbss_report_cmd(hw, *val);
-
-                break; }
-        case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
-                rtl8723ae_set_p2p_ps_offload_cmd(hw, *val);
+        case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:{
+                rtl8723e_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));
                 break;
+        }
         case HW_VAR_AID:{
-                u16 u2btmp;
-                u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
-                u2btmp &= 0xC000;
-                rtl_write_word(rtlpriv, REG_BCN_PSR_RPT, (u2btmp |
-                                mac->assoc_id));
-                break; }
+                        u16 u2btmp;
+
+                        u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
+                        u2btmp &= 0xC000;
+                        rtl_write_word(rtlpriv, REG_BCN_PSR_RPT,
+                                       (u2btmp | mac->assoc_id));
+
+                        break;
+                }
         case HW_VAR_CORRECT_TSF:{
-                u8 btype_ibss = *val;
-
-                if (btype_ibss == true)
-                        _rtl8723ae_stop_tx_beacon(hw);
-
-                _rtl8723ae_set_bcn_ctrl_reg(hw, 0, BIT(3));
-
-                rtl_write_dword(rtlpriv, REG_TSFTR,
-                                (u32) (mac->tsf & 0xffffffff));
-                rtl_write_dword(rtlpriv, REG_TSFTR + 4,
-                                (u32) ((mac->tsf >> 32) & 0xffffffff));
-
-                _rtl8723ae_set_bcn_ctrl_reg(hw, BIT(3), 0);
-
-                if (btype_ibss == true)
-                        _rtl8723ae_resume_tx_beacon(hw);
-                break; }
-        case HW_VAR_FW_LPS_ACTION: {
-                bool enter_fwlps = *((bool *)val);
-                u8 rpwm_val, fw_pwrmode;
-                bool fw_current_inps;
-
-                if (enter_fwlps) {
-                        rpwm_val = 0x02;        /* RF off */
-                        fw_current_inps = true;
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                        HW_VAR_FW_PSMODE_STATUS,
-                                        (u8 *)(&fw_current_inps));
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                        HW_VAR_H2C_FW_PWRMODE,
-                                        &ppsc->fwctrl_psmode);
-
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
-                                                      &rpwm_val);
-                } else {
-                        rpwm_val = 0x0C;        /* RF on */
-                        fw_pwrmode = FW_PS_ACTIVE_MODE;
-                        fw_current_inps = false;
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
-                                                      &rpwm_val);
-                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
-                                                      &fw_pwrmode);
-
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                        HW_VAR_FW_PSMODE_STATUS,
-                                        (u8 *)(&fw_current_inps));
+                        u8 btype_ibss = ((u8 *)(val))[0];
+
+                        if (btype_ibss)
+                                _rtl8723e_stop_tx_beacon(hw);
+
+                        _rtl8723e_set_bcn_ctrl_reg(hw, 0, BIT(3));
+
+                        rtl_write_dword(rtlpriv, REG_TSFTR,
+                                        (u32)(mac->tsf & 0xffffffff));
+                        rtl_write_dword(rtlpriv, REG_TSFTR + 4,
+                                        (u32)((mac->tsf >> 32) & 0xffffffff));
+
+                        _rtl8723e_set_bcn_ctrl_reg(hw, BIT(3), 0);
+
+                        if (btype_ibss)
+                                _rtl8723e_resume_tx_beacon(hw);
+
+                        break;
+                }
+        case HW_VAR_FW_LPS_ACTION:{
+                        bool b_enter_fwlps = *((bool *)val);
+                        u8 rpwm_val, fw_pwrmode;
+                        bool fw_current_inps;
+
+                        if (b_enter_fwlps) {
+                                rpwm_val = 0x02;        /* RF off */
+                                fw_current_inps = true;
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_FW_PSMODE_STATUS,
+                                                (u8 *)(&fw_current_inps));
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_H2C_FW_PWRMODE,
+                                                (u8 *)(&ppsc->fwctrl_psmode));
+
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_SET_RPWM,
+                                                (u8 *)(&rpwm_val));
+                        } else {
+                                rpwm_val = 0x0C;        /* RF on */
+                                fw_pwrmode = FW_PS_ACTIVE_MODE;
+                                fw_current_inps = false;
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                              HW_VAR_SET_RPWM,
+                                                              (u8 *)(&rpwm_val));
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_H2C_FW_PWRMODE,
+                                                (u8 *)(&fw_pwrmode));
+
+                                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                HW_VAR_FW_PSMODE_STATUS,
+                                                (u8 *)(&fw_current_inps));
+                        }
+                         break;
                 }
-                break; }
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
                 break;
         }
 }
 
-static bool _rtl8723ae_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
+static bool _rtl8723e_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         bool status = true;
@@ -539,24 +578,49 @@ static bool _rtl8723ae_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
         return status;
 }
 
-static bool _rtl8723ae_llt_table_init(struct ieee80211_hw *hw)
+static bool _rtl8723e_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;
         u8 ubyte;
 
-        maxPage = 255;
+#if LLT_CONFIG == 1
+        maxpage = 255;
+        txpktbuf_bndy = 252;
+#elif LLT_CONFIG == 2
+        maxpage = 127;
+        txpktbuf_bndy = 124;
+#elif LLT_CONFIG == 3
+        maxpage = 255;
+        txpktbuf_bndy = 174;
+#elif LLT_CONFIG == 4
+        maxpage = 255;
         txpktbuf_bndy = 246;
+#elif LLT_CONFIG == 5
+        maxpage = 255;
+        txpktbuf_bndy = 246;
+#endif
 
         rtl_write_byte(rtlpriv, REG_CR, 0x8B);
 
+#if LLT_CONFIG == 1
+        rtl_write_byte(rtlpriv, REG_RQPN_NPQ, 0x1c);
+        rtl_write_dword(rtlpriv, REG_RQPN, 0x80a71c1c);
+#elif LLT_CONFIG == 2
+        rtl_write_dword(rtlpriv, REG_RQPN, 0x845B1010);
+#elif LLT_CONFIG == 3
+        rtl_write_dword(rtlpriv, REG_RQPN, 0x84838484);
+#elif LLT_CONFIG == 4
+        rtl_write_dword(rtlpriv, REG_RQPN, 0x80bd1c1c);
+#elif LLT_CONFIG == 5
         rtl_write_word(rtlpriv, REG_RQPN_NPQ, 0x0000);
 
         rtl_write_dword(rtlpriv, REG_RQPN, 0x80ac1c29);
         rtl_write_byte(rtlpriv, REG_RQPN_NPQ, 0x03);
+#endif
 
         rtl_write_dword(rtlpriv, REG_TRXFF_BNDY, (0x27FF0000 | txpktbuf_bndy));
         rtl_write_byte(rtlpriv, REG_TDECTRL + 1, txpktbuf_bndy);
@@ -569,22 +633,22 @@ static bool _rtl8723ae_llt_table_init(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_RX_DRVINFO_SZ, 0x4);
 
         for (i = 0; i < (txpktbuf_bndy - 1); i++) {
-                status = _rtl8723ae_llt_write(hw, i, i + 1);
+                status = _rtl8723e_llt_write(hw, i, i + 1);
                 if (true != status)
                         return status;
         }
 
-        status = _rtl8723ae_llt_write(hw, (txpktbuf_bndy - 1), 0xFF);
+        status = _rtl8723e_llt_write(hw, (txpktbuf_bndy - 1), 0xFF);
         if (true != status)
                 return status;
 
-        for (i = txpktbuf_bndy; i < maxPage; i++) {
-                status = _rtl8723ae_llt_write(hw, i, (i + 1));
+        for (i = txpktbuf_bndy; i < maxpage; i++) {
+                status = _rtl8723e_llt_write(hw, i, (i + 1));
                 if (true != status)
                         return status;
         }
 
-        status = _rtl8723ae_llt_write(hw, maxPage, txpktbuf_bndy);
+        status = _rtl8723e_llt_write(hw, maxpage, txpktbuf_bndy);
         if (true != status)
                 return status;
 
@@ -595,28 +659,29 @@ static bool _rtl8723ae_llt_table_init(struct ieee80211_hw *hw)
         return true;
 }
 
-static void _rtl8723ae_gen_refresh_led_state(struct ieee80211_hw *hw)
+static void _rtl8723e_gen_refresh_led_state(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);
+        struct rtl_led *pled0 = &pcipriv->ledctl.sw_led0;
 
         if (rtlpriv->rtlhal.up_first_time)
                 return;
 
         if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS)
-                rtl8723ae_sw_led_on(hw, pLed0);
+                rtl8723e_sw_led_on(hw, pled0);
         else if (ppsc->rfoff_reason == RF_CHANGE_BY_INIT)
-                rtl8723ae_sw_led_on(hw, pLed0);
+                rtl8723e_sw_led_on(hw, pled0);
         else
-                rtl8723ae_sw_led_off(hw, pLed0);
+                rtl8723e_sw_led_off(hw, pled0);
 }
 
 static bool _rtl8712e_init_mac(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
         unsigned char bytetmp;
         unsigned short wordtmp;
         u16 retry = 0;
@@ -630,7 +695,6 @@ static bool _rtl8712e_init_mac(struct ieee80211_hw *hw)
         else
                 mac_func_enable = false;
 
-
         /* 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))
@@ -669,7 +733,7 @@ static bool _rtl8712e_init_mac(struct ieee80211_hw *hw)
         rtl_write_word(rtlpriv, REG_CR + 1, 0x06);
 
         if (!mac_func_enable) {
-                if (_rtl8723ae_llt_table_init(hw) == false)
+                if (!_rtl8723e_llt_table_init(hw))
                         return false;
         }
 
@@ -678,7 +742,8 @@ static bool _rtl8712e_init_mac(struct ieee80211_hw *hw)
 
         rtl_write_word(rtlpriv, REG_TRXFF_BNDY + 2, 0x27ff);
 
-        wordtmp = rtl_read_word(rtlpriv, REG_TRXDMA_CTRL) & 0xf;
+        wordtmp = rtl_read_word(rtlpriv, REG_TRXDMA_CTRL);
+        wordtmp &= 0xf;
         wordtmp |= 0xF771;
         rtl_write_word(rtlpriv, REG_TRXDMA_CTRL, wordtmp);
 
@@ -721,22 +786,23 @@ static bool _rtl8712e_init_mac(struct ieee80211_hw *hw)
                 bytetmp = rtl_read_byte(rtlpriv, REG_APSD_CTRL);
         } while ((retry < 200) && (bytetmp & BIT(7)));
 
-        _rtl8723ae_gen_refresh_led_state(hw);
+        _rtl8723e_gen_refresh_led_state(hw);
 
         rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0);
 
         return true;
 }
 
-static void _rtl8723ae_hw_configure(struct ieee80211_hw *hw)
+static void _rtl8723e_hw_configure(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 reg_bw_opmode;
-        u32 reg_prsr;
+        u32 reg_ratr, reg_prsr;
 
         reg_bw_opmode = BW_OPMODE_20MHZ;
+        reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
+            RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
         reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
 
         rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8);
@@ -762,8 +828,8 @@ static void _rtl8723ae_hw_configure(struct ieee80211_hw *hw)
         rtl_write_dword(rtlpriv, REG_RARFRC, 0x01000000);
         rtl_write_dword(rtlpriv, REG_RARFRC + 4, 0x07060504);
 
-        if ((pcipriv->bt_coexist.bt_coexistence) &&
-            (pcipriv->bt_coexist.bt_coexist_type == BT_CSR_BC4))
+        if ((rtlpriv->btcoexist.bt_coexistence) &&
+            (rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4))
                 rtl_write_dword(rtlpriv, REG_AGGLEN_LMT, 0x97427431);
         else
                 rtl_write_dword(rtlpriv, REG_AGGLEN_LMT, 0xb972a841);
@@ -782,8 +848,8 @@ static void _rtl8723ae_hw_configure(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_PIFS, 0x1C);
         rtl_write_byte(rtlpriv, REG_AGGR_BREAK_TIME, 0x16);
 
-        if ((pcipriv->bt_coexist.bt_coexistence) &&
-            (pcipriv->bt_coexist.bt_coexist_type == BT_CSR_BC4)) {
+        if ((rtlpriv->btcoexist.bt_coexistence) &&
+            (rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4)) {
                 rtl_write_word(rtlpriv, REG_NAV_PROT_LEN, 0x0020);
                 rtl_write_word(rtlpriv, REG_PROT_MODE_CTRL, 0x0402);
         } else {
@@ -791,8 +857,8 @@ static void _rtl8723ae_hw_configure(struct ieee80211_hw *hw)
                 rtl_write_word(rtlpriv, REG_NAV_PROT_LEN, 0x0020);
         }
 
-        if ((pcipriv->bt_coexist.bt_coexistence) &&
-             (pcipriv->bt_coexist.bt_coexist_type == BT_CSR_BC4))
+        if ((rtlpriv->btcoexist.bt_coexistence) &&
+            (rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4))
                 rtl_write_dword(rtlpriv, REG_FAST_EDCA_CTRL, 0x03086666);
         else
                 rtl_write_dword(rtlpriv, REG_FAST_EDCA_CTRL, 0x086666);
@@ -812,7 +878,7 @@ static void _rtl8723ae_hw_configure(struct ieee80211_hw *hw)
         rtl_write_dword(rtlpriv, 0x394, 0x1);
 }
 
-static void _rtl8723ae_enable_aspm_back_door(struct ieee80211_hw *hw)
+static void _rtl8723e_enable_aspm_back_door(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
@@ -830,15 +896,15 @@ static void _rtl8723ae_enable_aspm_back_door(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, 0x352, 0x1);
 }
 
-void rtl8723ae_enable_hw_security_config(struct ieee80211_hw *hw)
+void rtl8723e_enable_hw_security_config(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 sec_reg_value;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                 rtlpriv->sec.pairwise_enc_algorithm,
-                 rtlpriv->sec.group_enc_algorithm);
+                  rtlpriv->sec.pairwise_enc_algorithm,
+                  rtlpriv->sec.group_enc_algorithm);
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
@@ -846,11 +912,11 @@ void rtl8723ae_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);
@@ -864,7 +930,7 @@ void rtl8723ae_enable_hw_security_config(struct ieee80211_hw *hw)
 
 }
 
-int rtl8723ae_hw_init(struct ieee80211_hw *hw)
+int rtl8723e_hw_init(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -887,6 +953,7 @@ int rtl8723ae_hw_init(struct ieee80211_hw *hw)
          */
         local_save_flags(flags);
         local_irq_enable();
+        rtlhal->fw_ready = false;
 
         rtlpriv->intf_ops->disable_aspm(hw);
         rtstatus = _rtl8712e_init_mac(hw);
@@ -896,20 +963,19 @@ int rtl8723ae_hw_init(struct ieee80211_hw *hw)
                 goto exit;
         }
 
-        err = rtl8723_download_fw(hw, false);
+        err = rtl8723_download_fw(hw, false, FW_8723A_POLLING_TIMEOUT_COUNT);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Failed to download FW. Init HW without FW now..\n");
                 err = 1;
                 goto exit;
-        } else {
-                rtlhal->fw_ready = true;
         }
+        rtlhal->fw_ready = true;
 
         rtlhal->last_hmeboxnum = 0;
-        rtl8723ae_phy_mac_config(hw);
-        /* because the last function modifies RCR, we update
-         * rcr var here, or TP will be unstable as ther receive_config
+        rtl8723e_phy_mac_config(hw);
+        /* because last function modify RCR, so we update
+         * rcr var here, or TP will unstable for receive_config
          * is wrong, RX RCR_ACRC32 will cause TP unstable & Rx
          * RCR_APP_ICV will cause mac80211 unassoc for cisco 1252
          */
@@ -917,9 +983,9 @@ int rtl8723ae_hw_init(struct ieee80211_hw *hw)
         rtlpci->receive_config &= ~(RCR_ACRC32 | RCR_AICV);
         rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
 
-        rtl8723ae_phy_bb_config(hw);
+        rtl8723e_phy_bb_config(hw);
         rtlphy->rf_mode = RF_OP_BY_SW_3WIRE;
-        rtl8723ae_phy_rf_config(hw);
+        rtl8723e_phy_rf_config(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);
@@ -938,28 +1004,29 @@ int rtl8723ae_hw_init(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, RFPGA0_RFMOD, BCCKEN, 0x1);
         rtl_set_bbreg(hw, RFPGA0_RFMOD, BOFDMEN, 0x1);
         rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER2, BIT(10), 1);
-        _rtl8723ae_hw_configure(hw);
+        _rtl8723e_hw_configure(hw);
         rtl_cam_reset_all_entry(hw);
-        rtl8723ae_enable_hw_security_config(hw);
+        rtl8723e_enable_hw_security_config(hw);
 
         ppsc->rfpwr_state = ERFON;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ETHER_ADDR, mac->mac_addr);
-        _rtl8723ae_enable_aspm_back_door(hw);
+        _rtl8723e_enable_aspm_back_door(hw);
         rtlpriv->intf_ops->enable_aspm(hw);
 
-        rtl8723ae_bt_hw_init(hw);
+        rtl8723e_bt_hw_init(hw);
 
         if (ppsc->rfpwr_state == ERFON) {
-                rtl8723ae_phy_set_rfpath_switch(hw, 1);
+                rtl8723e_phy_set_rfpath_switch(hw, 1);
                 if (rtlphy->iqk_initialized) {
-                        rtl8723ae_phy_iq_calibrate(hw, true);
+                        rtl8723e_phy_iq_calibrate(hw, true);
                 } else {
-                        rtl8723ae_phy_iq_calibrate(hw, false);
+                        rtl8723e_phy_iq_calibrate(hw, false);
                         rtlphy->iqk_initialized = true;
                 }
 
-                rtl8723ae_phy_lc_calibrate(hw);
+                rtl8723e_dm_check_txpower_tracking(hw);
+                rtl8723e_phy_lc_calibrate(hw);
         }
 
         tmp_u1b = efuse_read_1byte(hw, 0x1FA);
@@ -969,20 +1036,21 @@ int rtl8723ae_hw_init(struct ieee80211_hw *hw)
         }
 
         if (!(tmp_u1b & BIT(4))) {
-                tmp_u1b = rtl_read_byte(rtlpriv, 0x16) & 0x0F;
+                tmp_u1b = rtl_read_byte(rtlpriv, 0x16);
+                tmp_u1b &= 0x0F;
                 rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x80);
                 udelay(10);
                 rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x90);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "under 1.5V\n");
         }
-        rtl8723ae_dm_init(hw);
+        rtl8723e_dm_init(hw);
 exit:
         local_irq_restore(flags);
         rtlpriv->rtlhal.being_init_adapter = false;
         return err;
 }
 
-static enum version_8723e _rtl8723ae_read_chip_version(struct ieee80211_hw *hw)
+static enum version_8723e _rtl8723e_read_chip_version(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -992,41 +1060,41 @@ static enum version_8723e _rtl8723ae_read_chip_version(struct ieee80211_hw *hw)
         value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
         if (value32 & TRP_VAUX_EN) {
                 version = (enum version_8723e)(version |
-                          ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0));
+                        ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0));
                 /* RTL8723 with BT function. */
                 version = (enum version_8723e)(version |
-                          ((value32 & BT_FUNC) ? CHIP_8723 : 0));
+                        ((value32 & BT_FUNC) ? CHIP_8723 : 0));
 
         } else {
                 /* Normal mass production chip. */
                 version = (enum version_8723e) NORMAL_CHIP;
                 version = (enum version_8723e)(version |
-                          ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0));
+                        ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0));
                 /* RTL8723 with BT function. */
                 version = (enum version_8723e)(version |
-                          ((value32 & BT_FUNC) ? CHIP_8723 : 0));
+                        ((value32 & BT_FUNC) ? CHIP_8723 : 0));
                 if (IS_CHIP_VENDOR_UMC(version))
                         version = (enum version_8723e)(version |
                         ((value32 & CHIP_VER_RTL_MASK)));/* IC version (CUT) */
                 if (IS_8723_SERIES(version)) {
                         value32 = rtl_read_dword(rtlpriv, REG_GPIO_OUTSTS);
-                        /* ROM code version */
+                        /* ROM code version. */
                         version = (enum version_8723e)(version |
-                                  ((value32 & RF_RL_ID)>>20));
+                                ((value32 & RF_RL_ID)>>20));
                 }
         }
 
         if (IS_8723_SERIES(version)) {
                 value32 = rtl_read_dword(rtlpriv, REG_MULTI_FUNC_CTRL);
                 rtlphy->polarity_ctl = ((value32 & WL_HWPDN_SL) ?
-                                       RT_POLARITY_HIGH_ACT :
-                                       RT_POLARITY_LOW_ACT);
+                                        RT_POLARITY_HIGH_ACT :
+                                        RT_POLARITY_LOW_ACT);
         }
         switch (version) {
         case VERSION_TEST_UMC_CHIP_8723:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Chip Version ID: VERSION_TEST_UMC_CHIP_8723.\n");
-                break;
+                        break;
         case VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Chip Version ID: VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT.\n");
@@ -1050,113 +1118,124 @@ static enum version_8723e _rtl8723ae_read_chip_version(struct ieee80211_hw *hw)
         return version;
 }
 
-static int _rtl8723ae_set_media_status(struct ieee80211_hw *hw,
-                                     enum nl80211_iftype type)
+static int _rtl8723e_set_media_status(struct ieee80211_hw *hw,
+                                      enum nl80211_iftype type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 bt_msr = rtl_read_byte(rtlpriv, MSR) & 0xfc;
         enum led_ctl_mode ledaction = LED_CTL_NO_LINK;
+        u8 mode = MSR_NOLINK;
 
         rtl_write_dword(rtlpriv, REG_BCN_CTRL, 0);
         RT_TRACE(rtlpriv, COMP_BEACON, DBG_LOUD,
-                 "clear 0x550 when set HW_VAR_MEDIA_STATUS\n");
-
-        if (type == NL80211_IFTYPE_UNSPECIFIED ||
-            type == NL80211_IFTYPE_STATION) {
-                _rtl8723ae_stop_tx_beacon(hw);
-                _rtl8723ae_enable_bcn_sufunc(hw);
-        } else if (type == NL80211_IFTYPE_ADHOC ||
-                type == NL80211_IFTYPE_AP) {
-                _rtl8723ae_resume_tx_beacon(hw);
-                _rtl8723ae_disable_bcn_sufunc(hw);
-        } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
-                         type);
-        }
+                "clear 0x550 when set HW_VAR_MEDIA_STATUS\n");
 
         switch (type) {
         case NL80211_IFTYPE_UNSPECIFIED:
-                bt_msr |= MSR_NOLINK;
-                ledaction = LED_CTL_LINK;
+                mode = MSR_NOLINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Set Network type to NO LINK!\n");
+                        "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
-                bt_msr |= MSR_ADHOC;
+                mode = MSR_ADHOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Set Network type to Ad Hoc!\n");
+                        "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
-                bt_msr |= MSR_INFRA;
+                mode = MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Set Network type to STA!\n");
+                        "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
-                bt_msr |= MSR_AP;
+                mode = MSR_AP;
+                ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Set Network type to AP!\n");
+                        "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "Network type %d not supported!\n",
-                         type);
+                        "Network type %d not support!\n", type);
                 return 1;
+                break;
+        }
 
+        /* MSR_INFRA == Link in infrastructure network;
+         * MSR_ADHOC == Link in ad hoc network;
+         * Therefore, check link state is necessary.
+         *
+         * MSR_AP == AP mode; link state is not cared here.
+         */
+        if (mode != MSR_AP &&
+            rtlpriv->mac80211.link_state < MAC80211_LINKED) {
+                mode = MSR_NOLINK;
+                ledaction = LED_CTL_NO_LINK;
+        }
+        if (mode == MSR_NOLINK || mode == MSR_INFRA) {
+                _rtl8723e_stop_tx_beacon(hw);
+                _rtl8723e_enable_bcn_sub_func(hw);
+        } else if (mode == MSR_ADHOC || mode == MSR_AP) {
+                _rtl8723e_resume_tx_beacon(hw);
+                _rtl8723e_disable_bcn_sub_func(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
+                         mode);
         }
 
-        rtl_write_byte(rtlpriv, (MSR), bt_msr);
+        rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
-        if ((bt_msr & MSR_MASK) == MSR_AP)
+        if (mode == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
         else
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);
         return 0;
 }
 
-void rtl8723ae_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
+void rtl8723e_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 reg_rcr;
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 reg_rcr = rtlpci->receive_config;
 
         if (rtlpriv->psc.rfpwr_state != ERFON)
                 return;
 
-        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
-
-        if (check_bssid == true) {
+        if (check_bssid) {
                 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
                                               (u8 *)(&reg_rcr));
-                _rtl8723ae_set_bcn_ctrl_reg(hw, 0, BIT(4));
-        } else if (check_bssid == false) {
+                _rtl8723e_set_bcn_ctrl_reg(hw, 0, BIT(4));
+        } else if (!check_bssid) {
                 reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN));
-                _rtl8723ae_set_bcn_ctrl_reg(hw, BIT(4), 0);
+                _rtl8723e_set_bcn_ctrl_reg(hw, BIT(4), 0);
                 rtlpriv->cfg->ops->set_hw_reg(hw,
-                        HW_VAR_RCR, (u8 *) (&reg_rcr));
+                        HW_VAR_RCR, (u8 *)(&reg_rcr));
         }
 }
 
-int rtl8723ae_set_network_type(struct ieee80211_hw *hw,
-                               enum nl80211_iftype type)
+int rtl8723e_set_network_type(struct ieee80211_hw *hw,
+                              enum nl80211_iftype type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        if (_rtl8723ae_set_media_status(hw, type))
+        if (_rtl8723e_set_media_status(hw, type))
                 return -EOPNOTSUPP;
 
         if (rtlpriv->mac80211.link_state == MAC80211_LINKED) {
                 if (type != NL80211_IFTYPE_AP)
-                        rtl8723ae_set_check_bssid(hw, true);
+                        rtl8723e_set_check_bssid(hw, true);
         } else {
-                rtl8723ae_set_check_bssid(hw, false);
+                rtl8723e_set_check_bssid(hw, false);
         }
+
         return 0;
 }
 
-/* don't set REG_EDCA_BE_PARAM here because mac80211 will send pkt when scan */
-void rtl8723ae_set_qos(struct ieee80211_hw *hw, int aci)
+/* don't set REG_EDCA_BE_PARAM here
+ * because mac80211 will send pkt when scan
+ */
+void rtl8723e_set_qos(struct ieee80211_hw *hw, int aci)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
@@ -1166,7 +1245,6 @@ void rtl8723ae_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, 0xa44f);
                 break;
         case AC0_BE:
-                /* rtl_write_dword(rtlpriv, REG_EDCA_BE_PARAM, u4ac_param); */
                 break;
         case AC2_VI:
                 rtl_write_dword(rtlpriv, REG_EDCA_VI_PARAM, 0x5e4322);
@@ -1180,7 +1258,19 @@ void rtl8723ae_set_qos(struct ieee80211_hw *hw, int aci)
         }
 }
 
-void rtl8723ae_enable_interrupt(struct ieee80211_hw *hw)
+static void rtl8723e_clear_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 tmp;
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISR);
+        rtl_write_dword(rtlpriv, REG_HISR, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISRE);
+        rtl_write_dword(rtlpriv, REG_HISRE, tmp);
+}
+
+void rtl8723e_enable_interrupt(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -1190,37 +1280,39 @@ void rtl8723ae_enable_interrupt(struct ieee80211_hw *hw)
         rtlpci->irq_enabled = true;
 }
 
-void rtl8723ae_disable_interrupt(struct ieee80211_hw *hw)
+void rtl8723e_disable_interrupt(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-
+        rtl8723e_clear_interrupt(hw);/*clear it here first*/
         rtl_write_dword(rtlpriv, 0x3a8, IMR8190_DISABLED);
         rtl_write_dword(rtlpriv, 0x3ac, IMR8190_DISABLED);
         rtlpci->irq_enabled = false;
-        synchronize_irq(rtlpci->pdev->irq);
+        /*synchronize_irq(rtlpci->pdev->irq);*/
 }
 
-static void _rtl8723ae_poweroff_adapter(struct ieee80211_hw *hw)
+static void _rtl8723e_poweroff_adapter(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 u1tmp;
+        u8 u1b_tmp;
 
         /* 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 */
         rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x00);
-        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready)
+        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) &&
+            rtlhal->fw_ready) {
                 rtl8723ae_firmware_selfreset(hw);
+        }
 
         /* Reset MCU. Suggested by Filen. */
-        u1tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);
-        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1tmp & (~BIT(2))));
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp & (~BIT(2))));
 
         /* g.   MCUFWDL 0x80[1:0]=0      */
         /* reset MCU ready status */
@@ -1231,39 +1323,38 @@ static void _rtl8723ae_poweroff_adapter(struct ieee80211_hw *hw)
                 PWR_INTF_PCI_MSK, Rtl8723_NIC_DISABLE_FLOW);
 
         /* Reset MCU IO Wrapper */
-        u1tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
-        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1tmp & (~BIT(0))));
-        u1tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
-        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, u1tmp | BIT(0));
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1b_tmp & (~BIT(0))));
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, u1b_tmp | BIT(0));
 
         /* 7. RSV_CTRL 0x1C[7:0] = 0x0E */
         /* lock ISO/CLK/Power control register */
         rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x0e);
 }
 
-void rtl8723ae_card_disable(struct ieee80211_hw *hw)
+void rtl8723e_card_disable(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         enum nl80211_iftype opmode;
 
         mac->link_state = MAC80211_NOLINK;
         opmode = NL80211_IFTYPE_UNSPECIFIED;
-        _rtl8723ae_set_media_status(hw, opmode);
-        if (rtlpci->driver_is_goingto_unload ||
+        _rtl8723e_set_media_status(hw, opmode);
+        if (rtlpriv->rtlhal.driver_is_goingto_unload ||
             ppsc->rfoff_reason > RF_CHANGE_BY_PS)
                 rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
         RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
-        _rtl8723ae_poweroff_adapter(hw);
+        _rtl8723e_poweroff_adapter(hw);
 
         /* after power off we should do iqk again */
         rtlpriv->phy.iqk_initialized = false;
 }
 
-void rtl8723ae_interrupt_recognized(struct ieee80211_hw *hw,
-                                    u32 *p_inta, u32 *p_intb)
+void rtl8723e_interrupt_recognized(struct ieee80211_hw *hw,
+                                   u32 *p_inta, u32 *p_intb)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -1272,7 +1363,7 @@ void rtl8723ae_interrupt_recognized(struct ieee80211_hw *hw,
         rtl_write_dword(rtlpriv, 0x3a0, *p_inta);
 }
 
-void rtl8723ae_set_beacon_related_registers(struct ieee80211_hw *hw)
+void rtl8723e_set_beacon_related_registers(struct ieee80211_hw *hw)
 {
 
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1281,17 +1372,17 @@ void rtl8723ae_set_beacon_related_registers(struct ieee80211_hw *hw)
 
         bcn_interval = mac->beacon_interval;
         atim_window = 2;        /*FIX MERGE */
-        rtl8723ae_disable_interrupt(hw);
+        rtl8723e_disable_interrupt(hw);
         rtl_write_word(rtlpriv, REG_ATIMWND, atim_window);
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
         rtl_write_word(rtlpriv, REG_BCNTCFG, 0x660f);
         rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_CCK, 0x18);
         rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_OFDM, 0x18);
         rtl_write_byte(rtlpriv, 0x606, 0x30);
-        rtl8723ae_enable_interrupt(hw);
+        rtl8723e_enable_interrupt(hw);
 }
 
-void rtl8723ae_set_beacon_interval(struct ieee80211_hw *hw)
+void rtl8723e_set_beacon_interval(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -1299,13 +1390,13 @@ void rtl8723ae_set_beacon_interval(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
                  "beacon_interval:%d\n", bcn_interval);
-        rtl8723ae_disable_interrupt(hw);
+        rtl8723e_disable_interrupt(hw);
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
-        rtl8723ae_enable_interrupt(hw);
+        rtl8723e_enable_interrupt(hw);
 }
 
-void rtl8723ae_update_interrupt_mask(struct ieee80211_hw *hw,
-                                     u32 add_msr, u32 rm_msr)
+void rtl8723e_update_interrupt_mask(struct ieee80211_hw *hw,
+                                    u32 add_msr, u32 rm_msr)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -1317,11 +1408,11 @@ void rtl8723ae_update_interrupt_mask(struct ieee80211_hw *hw,
                 rtlpci->irq_mask[0] |= add_msr;
         if (rm_msr)
                 rtlpci->irq_mask[0] &= (~rm_msr);
-        rtl8723ae_disable_interrupt(hw);
-        rtl8723ae_enable_interrupt(hw);
+        rtl8723e_disable_interrupt(hw);
+        rtl8723e_enable_interrupt(hw);
 }
 
-static u8 _rtl8723ae_get_chnl_group(u8 chnl)
+static u8 _rtl8723e_get_chnl_group(u8 chnl)
 {
         u8 group;
 
@@ -1334,9 +1425,9 @@ static u8 _rtl8723ae_get_chnl_group(u8 chnl)
         return group;
 }
 
-static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
-                                                   bool autoload_fail,
-                                                   u8 *hwinfo)
+static void _rtl8723e_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
+                                                  bool autoload_fail,
+                                                  u8 *hwinfo)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
@@ -1346,19 +1437,14 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         for (rf_path = 0; rf_path < 1; rf_path++) {
                 for (i = 0; i < 3; i++) {
                         if (!autoload_fail) {
-                                rtlefuse->eeprom_chnlarea_txpwr_cck
-                                    [rf_path][i] =
+                                rtlefuse->eeprom_chnlarea_txpwr_cck[rf_path][i] =
                                     hwinfo[EEPROM_TXPOWERCCK + rf_path * 3 + i];
-                                rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                    [rf_path][i] =
-                                    hwinfo[EEPROM_TXPOWERHT40_1S + rf_path *
-                                    3 + i];
+                                rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][i] =
+                                    hwinfo[EEPROM_TXPOWERHT40_1S + rf_path * 3 + i];
                         } else {
-                                rtlefuse->eeprom_chnlarea_txpwr_cck
-                                    [rf_path][i] =
+                                rtlefuse->eeprom_chnlarea_txpwr_cck[rf_path][i] =
                                     EEPROM_DEFAULT_TXPOWERLEVEL;
-                                rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                    [rf_path][i] =
+                                rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][i] =
                                     EEPROM_DEFAULT_TXPOWERLEVEL;
                         }
                 }
@@ -1379,43 +1465,43 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
                                 "RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path,
-                                i, rtlefuse->eeprom_chnlarea_txpwr_cck
-                                [rf_path][i]);
+                                 i, rtlefuse->eeprom_chnlarea_txpwr_cck
+                                        [rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
                                 "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
                                 rf_path, i,
                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                [rf_path][i]);
+                                        [rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
                                 "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
-                                rf_path, i,
-                                rtlefuse->eprom_chnl_txpwr_ht40_2sdf
-                                [rf_path][i]);
+                                 rf_path, i,
+                                 rtlefuse->eprom_chnl_txpwr_ht40_2sdf
+                                        [rf_path][i]);
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
-                        index = _rtl8723ae_get_chnl_group((u8) i);
+                        index = _rtl8723e_get_chnl_group((u8)i);
 
                         rtlefuse->txpwrlevel_cck[rf_path][i] =
                                 rtlefuse->eeprom_chnlarea_txpwr_cck
-                                                        [rf_path][index];
+                                        [rf_path][index];
                         rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                                        [rf_path][index];
+                                        [rf_path][index];
 
                         if ((rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                            [rf_path][index] -
-                            rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path]
-                            [index]) > 0) {
-                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =
-                                        rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
                                         [rf_path][index] -
-                                        rtlefuse->eprom_chnl_txpwr_ht40_2sdf
-                                        [rf_path][index];
+                             rtlefuse->eprom_chnl_txpwr_ht40_2sdf
+                                        [rf_path][index]) > 0) {
+                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =
+                                  rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
+                                  [rf_path][index] -
+                                  rtlefuse->eprom_chnl_txpwr_ht40_2sdf
+                                  [rf_path][index];
                         } else {
                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i] = 0;
                         }
@@ -1423,8 +1509,8 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
-                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
-                                "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
+                                rf_path, i,
                                 rtlefuse->txpwrlevel_cck[rf_path][i],
                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
@@ -1445,22 +1531,20 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
-                        index = _rtl8723ae_get_chnl_group((u8) i);
+                        index = _rtl8723e_get_chnl_group((u8)i);
 
                         if (rf_path == RF90_PATH_A) {
                                 rtlefuse->pwrgroup_ht20[rf_path][i] =
-                                    (rtlefuse->eeprom_pwrlimit_ht20[index] &
-                                    0xf);
+                                  (rtlefuse->eeprom_pwrlimit_ht20[index] & 0xf);
                                 rtlefuse->pwrgroup_ht40[rf_path][i] =
-                                    (rtlefuse->eeprom_pwrlimit_ht40[index] &
-                                    0xf);
+                                  (rtlefuse->eeprom_pwrlimit_ht40[index] & 0xf);
                         } else if (rf_path == RF90_PATH_B) {
                                 rtlefuse->pwrgroup_ht20[rf_path][i] =
-                                    ((rtlefuse->eeprom_pwrlimit_ht20[index] &
-                                    0xf0) >> 4);
+                                  ((rtlefuse->eeprom_pwrlimit_ht20[index] &
+                                   0xf0) >> 4);
                                 rtlefuse->pwrgroup_ht40[rf_path][i] =
-                                    ((rtlefuse->eeprom_pwrlimit_ht40[index] &
-                                    0xf0) >> 4);
+                                  ((rtlefuse->eeprom_pwrlimit_ht40[index] &
+                                   0xf0) >> 4);
                         }
 
                         RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
@@ -1473,7 +1557,7 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         }
 
         for (i = 0; i < 14; i++) {
-                index = _rtl8723ae_get_chnl_group((u8) i);
+                index = _rtl8723e_get_chnl_group((u8)i);
 
                 if (!autoload_fail)
                         tempval = hwinfo[EEPROM_TXPOWERHT20DIFF + index];
@@ -1490,7 +1574,7 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 if (rtlefuse->txpwr_ht20diff[RF90_PATH_B][i] & BIT(3))
                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i] |= 0xF0;
 
-                index = _rtl8723ae_get_chnl_group((u8) i);
+                index = _rtl8723e_get_chnl_group((u8)i);
 
                 if (!autoload_fail)
                         tempval = hwinfo[EEPROM_TXPOWER_OFDMDIFF + index];
@@ -1508,19 +1592,19 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                        rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
+                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
-                        rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
+                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                        rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
+                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
-                        rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
+                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
         if (!autoload_fail)
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
@@ -1533,10 +1617,11 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
         else
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
+
         RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
-                rtlefuse->eeprom_tssi[RF90_PATH_A],
-                rtlefuse->eeprom_tssi[RF90_PATH_B]);
+                 rtlefuse->eeprom_tssi[RF90_PATH_A],
+                 rtlefuse->eeprom_tssi[RF90_PATH_B]);
 
         if (!autoload_fail)
                 tempval = hwinfo[EEPROM_THERMAL_METER];
@@ -1552,8 +1637,8 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
-static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
-                                         bool pseudo_test)
+static void _rtl8723e_read_adapter_info(struct ieee80211_hw *hw,
+                                        bool b_pseudo_test)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
@@ -1562,7 +1647,7 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
         u8 hwinfo[HWSET_MAX_SIZE];
         u16 eeprom_id;
 
-        if (pseudo_test) {
+        if (b_pseudo_test) {
                 /* need add */
                 return;
         }
@@ -1576,7 +1661,7 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                          "RTL819X Not boot from eeprom, check it !!");
         }
 
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP\n",
                       hwinfo, HWSET_MAX_SIZE);
 
         eeprom_id = *((u16 *)&hwinfo[0]);
@@ -1589,13 +1674,13 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                 rtlefuse->autoload_failflag = false;
         }
 
-        if (rtlefuse->autoload_failflag == true)
+        if (rtlefuse->autoload_failflag)
                 return;
 
-        rtlefuse->eeprom_vid = *(u16 *) &hwinfo[EEPROM_VID];
-        rtlefuse->eeprom_did = *(u16 *) &hwinfo[EEPROM_DID];
-        rtlefuse->eeprom_svid = *(u16 *) &hwinfo[EEPROM_SVID];
-        rtlefuse->eeprom_smid = *(u16 *) &hwinfo[EEPROM_SMID];
+        rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
+        rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
+        rtlefuse->eeprom_svid = *(u16 *)&hwinfo[EEPROM_SVID];
+        rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "EEPROMId = 0x%4x\n", eeprom_id);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
@@ -1609,16 +1694,16 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
 
         for (i = 0; i < 6; i += 2) {
                 usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
-                *((u16 *) (&rtlefuse->dev_addr[i])) = usvalue;
+                *((u16 *)(&rtlefuse->dev_addr[i])) = usvalue;
         }
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  "dev_addr: %pM\n", rtlefuse->dev_addr);
 
-        _rtl8723ae_read_txpower_info_from_hwpg(hw,
-                        rtlefuse->autoload_failflag, hwinfo);
+        _rtl8723e_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag,
+                                              hwinfo);
 
-        rtl8723ae_read_bt_coexist_info_from_hwpg(hw,
+        rtl8723e_read_bt_coexist_info_from_hwpg(hw,
                         rtlefuse->autoload_failflag, hwinfo);
 
         rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];
@@ -1644,6 +1729,14 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                                     CHK_SVID_SMID(0x10EC, 0x6178) ||
                                     CHK_SVID_SMID(0x10EC, 0x6179) ||
                                     CHK_SVID_SMID(0x10EC, 0x6180) ||
+                                    CHK_SVID_SMID(0x10EC, 0x7151) ||
+                                    CHK_SVID_SMID(0x10EC, 0x7152) ||
+                                    CHK_SVID_SMID(0x10EC, 0x7154) ||
+                                    CHK_SVID_SMID(0x10EC, 0x7155) ||
+                                    CHK_SVID_SMID(0x10EC, 0x7177) ||
+                                    CHK_SVID_SMID(0x10EC, 0x7178) ||
+                                    CHK_SVID_SMID(0x10EC, 0x7179) ||
+                                    CHK_SVID_SMID(0x10EC, 0x7180) ||
                                     CHK_SVID_SMID(0x10EC, 0x8151) ||
                                     CHK_SVID_SMID(0x10EC, 0x8152) ||
                                     CHK_SVID_SMID(0x10EC, 0x8154) ||
@@ -1671,7 +1764,10 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                                          CHK_SVID_SMID(0x10EC, 0x7193) ||
                                          CHK_SVID_SMID(0x10EC, 0x8191) ||
                                          CHK_SVID_SMID(0x10EC, 0x8192) ||
-                                         CHK_SVID_SMID(0x10EC, 0x8193))
+                                         CHK_SVID_SMID(0x10EC, 0x8193) ||
+                                         CHK_SVID_SMID(0x10EC, 0x9191) ||
+                                         CHK_SVID_SMID(0x10EC, 0x9192) ||
+                                         CHK_SVID_SMID(0x10EC, 0x9193))
                                         rtlhal->oem_id = RT_CID_819X_SAMSUNG;
                                 else if (CHK_SVID_SMID(0x10EC, 0x8195) ||
                                          CHK_SVID_SMID(0x10EC, 0x9195) ||
@@ -1728,7 +1824,7 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                                 else
                                         rtlhal->oem_id = RT_CID_DEFAULT;
                         } else {
-                                        rtlhal->oem_id = RT_CID_DEFAULT;
+                                rtlhal->oem_id = RT_CID_DEFAULT;
                         }
                         break;
                 case EEPROM_CID_TOSHIBA:
@@ -1750,18 +1846,31 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
         }
 }
 
-static void _rtl8723ae_hal_customized_behavior(struct ieee80211_hw *hw)
+static void _rtl8723e_hal_customized_behavior(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
         pcipriv->ledctl.led_opendrain = true;
+        switch (rtlhal->oem_id) {
+        case RT_CID_819X_HP:
+                pcipriv->ledctl.led_opendrain = true;
+                break;
+        case RT_CID_819X_LENOVO:
+        case RT_CID_DEFAULT:
+        case RT_CID_TOSHIBA:
+        case RT_CID_CCX:
+        case RT_CID_819X_ACER:
+        case RT_CID_WHQL:
+        default:
+                break;
+        }
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
 }
 
-void rtl8723ae_read_eeprom_info(struct ieee80211_hw *hw)
+void rtl8723e_read_eeprom_info(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
@@ -1774,7 +1883,7 @@ void rtl8723ae_read_eeprom_info(struct ieee80211_hw *hw)
         value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0);
         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[EFUSE_TEST], value32);
 
-        rtlhal->version = _rtl8723ae_read_chip_version(hw);
+        rtlhal->version = _rtl8723e_read_chip_version(hw);
 
         if (get_rf_type(rtlphy) == RF_1T1R)
                 rtlpriv->dm.rfpath_rxenable[0] = true;
@@ -1782,7 +1891,7 @@ void rtl8723ae_read_eeprom_info(struct ieee80211_hw *hw)
                 rtlpriv->dm.rfpath_rxenable[0] =
                     rtlpriv->dm.rfpath_rxenable[1] = true;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
-                 rtlhal->version);
+                                                rtlhal->version);
 
         tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
         if (tmp_u1b & BIT(4)) {
@@ -1795,33 +1904,34 @@ void rtl8723ae_read_eeprom_info(struct ieee80211_hw *hw)
         if (tmp_u1b & BIT(5)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
-                _rtl8723ae_read_adapter_info(hw, false);
+                _rtl8723e_read_adapter_info(hw, false);
         } else {
                 rtlefuse->autoload_failflag = true;
-                _rtl8723ae_read_adapter_info(hw, false);
+                _rtl8723e_read_adapter_info(hw, false);
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
         }
-        _rtl8723ae_hal_customized_behavior(hw);
+        _rtl8723e_hal_customized_behavior(hw);
 }
 
-static void rtl8723ae_update_hal_rate_table(struct ieee80211_hw *hw,
-                                            struct ieee80211_sta *sta)
+static void rtl8723e_update_hal_rate_table(struct ieee80211_hw *hw,
+                                           struct ieee80211_sta *sta)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 ratr_value;
         u8 ratr_index = 0;
-        u8 nmode = mac->ht_enable;
-        u8 mimo_ps = IEEE80211_SMPS_OFF;
+        u8 b_nmode = mac->ht_enable;
+        u16 shortgi_rate;
+        u32 tmp_ratr_value;
         u8 curtxbw_40mhz = mac->bw_40;
         u8 curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
                                 1 : 0;
         u8 curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
                                 1 : 0;
         enum wireless_mode wirelessmode = mac->mode;
+        u32 ratr_mask;
 
         if (rtlhal->current_bandtype == BAND_ON_5G)
                 ratr_value = sta->supp_rates[1] << 4;
@@ -1830,7 +1940,7 @@ static void rtl8723ae_update_hal_rate_table(struct ieee80211_hw *hw,
         if (mac->opmode == NL80211_IFTYPE_ADHOC)
                 ratr_value = 0xfff;
         ratr_value |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
-                       sta->ht_cap.mcs.rx_mask[0] << 12);
+                        sta->ht_cap.mcs.rx_mask[0] << 12);
         switch (wirelessmode) {
         case WIRELESS_MODE_B:
                 if (ratr_value & 0x0000000c)
@@ -1843,20 +1953,14 @@ static void rtl8723ae_update_hal_rate_table(struct ieee80211_hw *hw,
                 break;
         case WIRELESS_MODE_N_24G:
         case WIRELESS_MODE_N_5G:
-                nmode = 1;
-                if (mimo_ps == IEEE80211_SMPS_STATIC) {
-                        ratr_value &= 0x0007F005;
-                } else {
-                        u32 ratr_mask;
-
-                        if (get_rf_type(rtlphy) == RF_1T2R ||
-                            get_rf_type(rtlphy) == RF_1T1R)
-                                ratr_mask = 0x000ff005;
-                        else
-                                ratr_mask = 0x0f0ff005;
+                b_nmode = 1;
+                if (get_rf_type(rtlphy) == RF_1T2R ||
+                    get_rf_type(rtlphy) == RF_1T1R)
+                        ratr_mask = 0x000ff005;
+                else
+                        ratr_mask = 0x0f0ff005;
 
-                        ratr_value &= ratr_mask;
-                }
+                ratr_value &= ratr_mask;
                 break;
         default:
                 if (rtlphy->rf_type == RF_1T2R)
@@ -1867,19 +1971,30 @@ static void rtl8723ae_update_hal_rate_table(struct ieee80211_hw *hw,
                 break;
         }
 
-        if ((pcipriv->bt_coexist.bt_coexistence) &&
-            (pcipriv->bt_coexist.bt_coexist_type == BT_CSR_BC4) &&
-            (pcipriv->bt_coexist.bt_cur_state) &&
-            (pcipriv->bt_coexist.bt_ant_isolation) &&
-            ((pcipriv->bt_coexist.bt_service == BT_SCO) ||
-            (pcipriv->bt_coexist.bt_service == BT_BUSY)))
+        if ((rtlpriv->btcoexist.bt_coexistence) &&
+            (rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4) &&
+            (rtlpriv->btcoexist.bt_cur_state) &&
+            (rtlpriv->btcoexist.bt_ant_isolation) &&
+            ((rtlpriv->btcoexist.bt_service == BT_SCO) ||
+            (rtlpriv->btcoexist.bt_service == BT_BUSY)))
                 ratr_value &= 0x0fffcfc0;
         else
                 ratr_value &= 0x0FFFFFFF;
 
-        if (nmode && ((curtxbw_40mhz && curshortgi_40mhz) ||
-           (!curtxbw_40mhz && curshortgi_20mhz)))
+        if (b_nmode &&
+            ((curtxbw_40mhz && curshortgi_40mhz) ||
+             (!curtxbw_40mhz && curshortgi_20mhz))) {
                 ratr_value |= 0x10000000;
+                tmp_ratr_value = (ratr_value >> 12);
+
+                for (shortgi_rate = 15; shortgi_rate > 0; shortgi_rate--) {
+                        if ((1 << shortgi_rate) & tmp_ratr_value)
+                                break;
+                }
+
+                shortgi_rate = (shortgi_rate << 12) | (shortgi_rate << 8) |
+                    (shortgi_rate << 4) | (shortgi_rate);
+        }
 
         rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
 
@@ -1887,8 +2002,9 @@ static void rtl8723ae_update_hal_rate_table(struct ieee80211_hw *hw,
                  "%x\n", rtl_read_dword(rtlpriv, REG_ARFR0));
 }
 
-static void rtl8723ae_update_hal_rate_mask(struct ieee80211_hw *hw,
-                struct ieee80211_sta *sta, u8 rssi_level)
+static void rtl8723e_update_hal_rate_mask(struct ieee80211_hw *hw,
+                                          struct ieee80211_sta *sta,
+                                          u8 rssi_level)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
@@ -1897,7 +2013,8 @@ static void rtl8723ae_update_hal_rate_mask(struct ieee80211_hw *hw,
         struct rtl_sta_info *sta_entry = NULL;
         u32 ratr_bitmap;
         u8 ratr_index;
-        u8 curtxbw_40mhz = (sta->bandwidth >= IEEE80211_STA_RX_BW_40) ? 1 : 0;
+        u8 curtxbw_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
+                                ? 1 : 0;
         u8 curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
                                 1 : 0;
         u8 curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
@@ -1906,9 +2023,9 @@ static void rtl8723ae_update_hal_rate_mask(struct ieee80211_hw *hw,
         bool shortgi = false;
         u8 rate_mask[5];
         u8 macid = 0;
-        u8 mimo_ps = IEEE80211_SMPS_OFF;
+        /*u8 mimo_ps = IEEE80211_SMPS_OFF;*/
 
-        sta_entry = (struct rtl_sta_info *) sta->drv_priv;
+        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
         wirelessmode = sta_entry->wireless_mode;
         if (mac->opmode == NL80211_IFTYPE_STATION)
                 curtxbw_40mhz = mac->bw_40;
@@ -1943,54 +2060,44 @@ static void rtl8723ae_update_hal_rate_mask(struct ieee80211_hw *hw,
                         ratr_bitmap &= 0x00000ff5;
                 break;
         case WIRELESS_MODE_A:
-                ratr_index = RATR_INX_WIRELESS_A;
+                ratr_index = RATR_INX_WIRELESS_G;
                 ratr_bitmap &= 0x00000ff0;
                 break;
         case WIRELESS_MODE_N_24G:
         case WIRELESS_MODE_N_5G:
                 ratr_index = RATR_INX_WIRELESS_NGB;
-
-                if (mimo_ps == IEEE80211_SMPS_STATIC) {
-                        if (rssi_level == 1)
-                                ratr_bitmap &= 0x00070000;
-                        else if (rssi_level == 2)
-                                ratr_bitmap &= 0x0007f000;
-                        else
-                                ratr_bitmap &= 0x0007f005;
+                if (rtlphy->rf_type == RF_1T2R ||
+                    rtlphy->rf_type == RF_1T1R) {
+                        if (curtxbw_40mhz) {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x000f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x000ff000;
+                                else
+                                        ratr_bitmap &= 0x000ff015;
+                        } else {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x000f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x000ff000;
+                                else
+                                        ratr_bitmap &= 0x000ff005;
+                        }
                 } else {
-                        if (rtlphy->rf_type == RF_1T2R ||
-                            rtlphy->rf_type == RF_1T1R) {
-                                if (curtxbw_40mhz) {
-                                        if (rssi_level == 1)
-                                                ratr_bitmap &= 0x000f0000;
-                                        else if (rssi_level == 2)
-                                                ratr_bitmap &= 0x000ff000;
-                                        else
-                                                ratr_bitmap &= 0x000ff015;
-                                } else {
-                                        if (rssi_level == 1)
-                                                ratr_bitmap &= 0x000f0000;
-                                        else if (rssi_level == 2)
-                                                ratr_bitmap &= 0x000ff000;
-                                        else
-                                                ratr_bitmap &= 0x000ff005;
-                                }
+                        if (curtxbw_40mhz) {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x0f0f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x0f0ff000;
+                                else
+                                        ratr_bitmap &= 0x0f0ff015;
                         } else {
-                                if (curtxbw_40mhz) {
-                                        if (rssi_level == 1)
-                                                ratr_bitmap &= 0x0f0f0000;
-                                        else if (rssi_level == 2)
-                                                ratr_bitmap &= 0x0f0ff000;
-                                        else
-                                                ratr_bitmap &= 0x0f0ff015;
-                                } else {
-                                        if (rssi_level == 1)
-                                                ratr_bitmap &= 0x0f0f0000;
-                                        else if (rssi_level == 2)
-                                                ratr_bitmap &= 0x0f0ff000;
-                                        else
-                                                ratr_bitmap &= 0x0f0ff005;
-                                }
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x0f0f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x0f0ff000;
+                                else
+                                        ratr_bitmap &= 0x0f0ff005;
                         }
                 }
 
@@ -2015,30 +2122,30 @@ static void rtl8723ae_update_hal_rate_mask(struct ieee80211_hw *hw,
 
         RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
                  "ratr_bitmap :%x\n", ratr_bitmap);
-        /* convert ratr_bitmap to le byte array */
-        rate_mask[0] = ratr_bitmap;
-        rate_mask[1] = (ratr_bitmap >>= 8);
-        rate_mask[2] = (ratr_bitmap >>= 8);
-        rate_mask[3] = ((ratr_bitmap >> 8) & 0x0f) | (ratr_index << 4);
+        *(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |
+                             (ratr_index << 28);
         rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
         RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 "Rate_index:%x, ratr_bitmap: %*phC\n",
-                 ratr_index, 5, rate_mask);
-        rtl8723ae_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);
+                 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
+                  ratr_index, ratr_bitmap,
+                  rate_mask[0], rate_mask[1],
+                  rate_mask[2], rate_mask[3],
+                  rate_mask[4]);
+        rtl8723e_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);
 }
 
-void rtl8723ae_update_hal_rate_tbl(struct ieee80211_hw *hw,
-                struct ieee80211_sta *sta, u8 rssi_level)
+void rtl8723e_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                                  struct ieee80211_sta *sta, u8 rssi_level)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         if (rtlpriv->dm.useramask)
-                rtl8723ae_update_hal_rate_mask(hw, sta, rssi_level);
+                rtl8723e_update_hal_rate_mask(hw, sta, rssi_level);
         else
-                rtl8723ae_update_hal_rate_table(hw, sta);
+                rtl8723e_update_hal_rate_table(hw, sta);
 }
 
-void rtl8723ae_update_channel_access_setting(struct ieee80211_hw *hw)
+void rtl8723e_update_channel_access_setting(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -2052,14 +2159,14 @@ void rtl8723ae_update_channel_access_setting(struct ieee80211_hw *hw)
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SIFS, (u8 *)&sifs_timer);
 }
 
-bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
+bool rtl8723e_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        enum rf_pwrstate e_rfpowerstate_toset;
+        enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;
         u8 u1tmp;
-        bool actuallyset = false;
+        bool b_actuallyset = false;
 
         if (rtlpriv->rtlhal.being_init_adapter)
                 return false;
@@ -2076,6 +2183,8 @@ bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
                 spin_unlock(&rtlpriv->locks.rf_ps_lock);
         }
 
+        cur_rfstate = ppsc->rfpwr_state;
+
         rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2,
                        rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL_2)&~(BIT(1)));
 
@@ -2086,24 +2195,23 @@ bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         else
                 e_rfpowerstate_toset = (u1tmp & BIT(1)) ? ERFON : ERFOFF;
 
-        if ((ppsc->hwradiooff == true) && (e_rfpowerstate_toset == ERFON)) {
+        if (ppsc->hwradiooff && (e_rfpowerstate_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          "GPIOChangeRF  - HW Radio ON, RF ON\n");
 
                 e_rfpowerstate_toset = ERFON;
                 ppsc->hwradiooff = false;
-                actuallyset = true;
-        } else if ((ppsc->hwradiooff == false)
-                   && (e_rfpowerstate_toset == ERFOFF)) {
+                b_actuallyset = true;
+        } else if (!ppsc->hwradiooff && (e_rfpowerstate_toset == ERFOFF)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
 
                 e_rfpowerstate_toset = ERFOFF;
                 ppsc->hwradiooff = true;
-                actuallyset = true;
+                b_actuallyset = true;
         }
 
-        if (actuallyset) {
+        if (b_actuallyset) {
                 spin_lock(&rtlpriv->locks.rf_ps_lock);
                 ppsc->rfchange_inprogress = false;
                 spin_unlock(&rtlpriv->locks.rf_ps_lock);
@@ -2118,11 +2226,12 @@ bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 
         *valid = 1;
         return !ppsc->hwradiooff;
+
 }
 
-void rtl8723ae_set_key(struct ieee80211_hw *hw, u32 key_index,
-                       u8 *p_macaddr, bool is_group, u8 enc_algo,
-                       bool is_wepkey, bool clear_all)
+void rtl8723e_set_key(struct ieee80211_hw *hw, u32 key_index,
+                      u8 *p_macaddr, bool is_group, u8 enc_algo,
+                      bool is_wepkey, bool clear_all)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -2130,6 +2239,7 @@ void rtl8723ae_set_key(struct ieee80211_hw *hw, u32 key_index,
         u8 *macaddr = p_macaddr;
         u32 entry_id = 0;
         bool is_pairwise = false;
+
         static u8 cam_const_addr[4][6] = {
                 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
                 {0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
@@ -2157,6 +2267,7 @@ void rtl8723ae_set_key(struct ieee80211_hw *hw, u32 key_index,
                                 rtlpriv->sec.key_len[idx] = 0;
                         }
                 }
+
         } else {
                 switch (enc_algo) {
                 case WEP40_ENCRYPTION:
@@ -2172,8 +2283,8 @@ void rtl8723ae_set_key(struct ieee80211_hw *hw, u32 key_index,
                         enc_algo = CAM_AES;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -2187,8 +2298,8 @@ void rtl8723ae_set_key(struct ieee80211_hw *hw, u32 key_index,
                                 entry_id = key_index;
                         } else {
                                 if (mac->opmode == NL80211_IFTYPE_AP) {
-                                        entry_id = rtl_cam_get_free_entry(hw,
-                                                                macaddr);
+                                        entry_id =
+                                          rtl_cam_get_free_entry(hw, p_macaddr);
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv, COMP_SEC,
                                                          DBG_EMERG,
@@ -2219,22 +2330,22 @@ void rtl8723ae_set_key(struct ieee80211_hw *hw, u32 key_index,
                                          "set Pairwiase key\n");
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
-                                        entry_id, enc_algo,
-                                        CAM_CONFIG_NO_USEDK,
-                                        rtlpriv->sec.key_buf[key_index]);
+                                                      entry_id, enc_algo,
+                                                      CAM_CONFIG_NO_USEDK,
+                                                      rtlpriv->sec.key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                                          "set group key\n");
 
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
-                                                rtlefuse->dev_addr,
-                                                PAIRWISE_KEYIDX,
-                                                CAM_PAIRWISE_KEY_POSITION,
-                                                enc_algo,
-                                                CAM_CONFIG_NO_USEDK,
-                                                rtlpriv->sec.key_buf
-                                                [entry_id]);
+                                                        rtlefuse->dev_addr,
+                                                        PAIRWISE_KEYIDX,
+                                                        CAM_PAIRWISE_KEY_POSITION,
+                                                        enc_algo,
+                                                        CAM_CONFIG_NO_USEDK,
+                                                        rtlpriv->sec.key_buf
+                                                        [entry_id]);
                                 }
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
@@ -2247,45 +2358,43 @@ void rtl8723ae_set_key(struct ieee80211_hw *hw, u32 key_index,
         }
 }
 
-static void rtl8723ae_bt_var_init(struct ieee80211_hw *hw)
+static void rtl8723e_bt_var_init(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        pcipriv->bt_coexist.bt_coexistence =
-                                        pcipriv->bt_coexist.eeprom_bt_coexist;
-        pcipriv->bt_coexist.bt_ant_num =
-                                        pcipriv->bt_coexist.eeprom_bt_ant_num;
-        pcipriv->bt_coexist.bt_coexist_type =
-                                        pcipriv->bt_coexist.eeprom_bt_type;
+        rtlpriv->btcoexist.bt_coexistence =
+                rtlpriv->btcoexist.eeprom_bt_coexist;
+        rtlpriv->btcoexist.bt_ant_num =
+                rtlpriv->btcoexist.eeprom_bt_ant_num;
+        rtlpriv->btcoexist.bt_coexist_type =
+                rtlpriv->btcoexist.eeprom_bt_type;
 
-                pcipriv->bt_coexist.bt_ant_isolation =
-                                pcipriv->bt_coexist.eeprom_bt_ant_isol;
+        rtlpriv->btcoexist.bt_ant_isolation =
+                rtlpriv->btcoexist.eeprom_bt_ant_isol;
 
-        pcipriv->bt_coexist.bt_radio_shared_type =
-                                pcipriv->bt_coexist.eeprom_bt_radio_shared;
+        rtlpriv->btcoexist.bt_radio_shared_type =
+                rtlpriv->btcoexist.eeprom_bt_radio_shared;
 
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                  "BT Coexistance = 0x%x\n",
-                 pcipriv->bt_coexist.bt_coexistence);
+                 rtlpriv->btcoexist.bt_coexistence);
 
-        if (pcipriv->bt_coexist.bt_coexistence) {
-                pcipriv->bt_coexist.bt_busy_traffic = false;
-                pcipriv->bt_coexist.bt_traffic_mode_set = false;
-                pcipriv->bt_coexist.bt_non_traffic_mode_set = false;
+        if (rtlpriv->btcoexist.bt_coexistence) {
+                rtlpriv->btcoexist.bt_busy_traffic = false;
+                rtlpriv->btcoexist.bt_traffic_mode_set = false;
+                rtlpriv->btcoexist.bt_non_traffic_mode_set = false;
 
-                pcipriv->bt_coexist.cstate = 0;
-                pcipriv->bt_coexist.previous_state = 0;
+                rtlpriv->btcoexist.cstate = 0;
+                rtlpriv->btcoexist.previous_state = 0;
 
-                if (pcipriv->bt_coexist.bt_ant_num == ANT_X2) {
+                if (rtlpriv->btcoexist.bt_ant_num == ANT_X2) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                  "BlueTooth BT_Ant_Num = Antx2\n");
-                } else if (pcipriv->bt_coexist.bt_ant_num == ANT_X1) {
+                } else if (rtlpriv->btcoexist.bt_ant_num == ANT_X1) {
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                  "BlueTooth BT_Ant_Num = Antx1\n");
                 }
-
-                switch (pcipriv->bt_coexist.bt_coexist_type) {
+                switch (rtlpriv->btcoexist.bt_coexist_type) {
                 case BT_2WIRE:
                         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                                  "BlueTooth BT_CoexistType = BT_2Wire\n");
@@ -2317,20 +2426,19 @@ static void rtl8723ae_bt_var_init(struct ieee80211_hw *hw)
                 }
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "BlueTooth BT_Ant_isolation = %d\n",
-                         pcipriv->bt_coexist.bt_ant_isolation);
+                         rtlpriv->btcoexist.bt_ant_isolation);
                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
                          "BT_RadioSharedType = 0x%x\n",
-                         pcipriv->bt_coexist.bt_radio_shared_type);
-                pcipriv->bt_coexist.bt_active_zero_cnt = 0;
-                pcipriv->bt_coexist.cur_bt_disabled = false;
-                pcipriv->bt_coexist.pre_bt_disabled = false;
+                         rtlpriv->btcoexist.bt_radio_shared_type);
+                rtlpriv->btcoexist.bt_active_zero_cnt = 0;
+                rtlpriv->btcoexist.cur_bt_disabled = false;
+                rtlpriv->btcoexist.pre_bt_disabled = false;
         }
 }
 
-void rtl8723ae_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
-                                              bool auto_load_fail, u8 *hwinfo)
+void rtl8723e_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
+                                             bool auto_load_fail, u8 *hwinfo)
 {
-        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 value;
         u32 tmpu_32;
@@ -2338,47 +2446,50 @@ void rtl8723ae_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
         if (!auto_load_fail) {
                 tmpu_32 = rtl_read_dword(rtlpriv, REG_MULTI_FUNC_CTRL);
                 if (tmpu_32 & BIT(18))
-                        pcipriv->bt_coexist.eeprom_bt_coexist = 1;
+                        rtlpriv->btcoexist.eeprom_bt_coexist = 1;
                 else
-                        pcipriv->bt_coexist.eeprom_bt_coexist = 0;
+                        rtlpriv->btcoexist.eeprom_bt_coexist = 0;
                 value = hwinfo[RF_OPTION4];
-                pcipriv->bt_coexist.eeprom_bt_type = BT_RTL8723A;
-                pcipriv->bt_coexist.eeprom_bt_ant_num = (value & 0x1);
-                pcipriv->bt_coexist.eeprom_bt_ant_isol = ((value & 0x10) >> 4);
-                pcipriv->bt_coexist.eeprom_bt_radio_shared =
-                                ((value & 0x20) >> 5);
+                rtlpriv->btcoexist.eeprom_bt_type = BT_RTL8723A;
+                rtlpriv->btcoexist.eeprom_bt_ant_num = (value & 0x1);
+                rtlpriv->btcoexist.eeprom_bt_ant_isol = ((value & 0x10) >> 4);
+                rtlpriv->btcoexist.eeprom_bt_radio_shared =
+                  ((value & 0x20) >> 5);
         } else {
-                pcipriv->bt_coexist.eeprom_bt_coexist = 0;
-                pcipriv->bt_coexist.eeprom_bt_type = BT_RTL8723A;
-                pcipriv->bt_coexist.eeprom_bt_ant_num = ANT_X2;
-                pcipriv->bt_coexist.eeprom_bt_ant_isol = 0;
-                pcipriv->bt_coexist.eeprom_bt_radio_shared = BT_RADIO_SHARED;
+                rtlpriv->btcoexist.eeprom_bt_coexist = 0;
+                rtlpriv->btcoexist.eeprom_bt_type = BT_RTL8723A;
+                rtlpriv->btcoexist.eeprom_bt_ant_num = ANT_X2;
+                rtlpriv->btcoexist.eeprom_bt_ant_isol = 0;
+                rtlpriv->btcoexist.eeprom_bt_radio_shared = BT_RADIO_SHARED;
         }
 
-        rtl8723ae_bt_var_init(hw);
+        rtl8723e_bt_var_init(hw);
 }
 
-void rtl8723ae_bt_reg_init(struct ieee80211_hw *hw)
+void rtl8723e_bt_reg_init(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         /* 0:Low, 1:High, 2:From Efuse. */
-        pcipriv->bt_coexist.reg_bt_iso = 2;
+        rtlpriv->btcoexist.reg_bt_iso = 2;
         /* 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter. */
-        pcipriv->bt_coexist.reg_bt_sco = 3;
+        rtlpriv->btcoexist.reg_bt_sco = 3;
         /* 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. */
-        pcipriv->bt_coexist.reg_bt_sco = 0;
+        rtlpriv->btcoexist.reg_bt_sco = 0;
 }
 
-
-void rtl8723ae_bt_hw_init(struct ieee80211_hw *hw)
+void rtl8723e_bt_hw_init(struct ieee80211_hw *hw)
 {
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->cfg->ops->get_btc_status())
+                rtlpriv->btcoexist.btc_ops->btc_init_hw_config(rtlpriv);
 }
 
-void rtl8723ae_suspend(struct ieee80211_hw *hw)
+void rtl8723e_suspend(struct ieee80211_hw *hw)
 {
 }
 
-void rtl8723ae_resume(struct ieee80211_hw *hw)
+void rtl8723e_resume(struct ieee80211_hw *hw)
 {
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.h b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.h
index d3bc39fb27a5..32c1ace97c3f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -34,38 +30,38 @@
         ((rtlefuse->eeprom_svid == (_val1)) &&                  \
          (rtlefuse->eeprom_smid == (_val2)))
 
-void rtl8723ae_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
-void rtl8723ae_read_eeprom_info(struct ieee80211_hw *hw);
+void rtl8723e_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
+void rtl8723e_read_eeprom_info(struct ieee80211_hw *hw);
 
-void rtl8723ae_interrupt_recognized(struct ieee80211_hw *hw,
-                                    u32 *p_inta, u32 *p_intb);
-int rtl8723ae_hw_init(struct ieee80211_hw *hw);
-void rtl8723ae_card_disable(struct ieee80211_hw *hw);
-void rtl8723ae_enable_interrupt(struct ieee80211_hw *hw);
-void rtl8723ae_disable_interrupt(struct ieee80211_hw *hw);
-int rtl8723ae_set_network_type(struct ieee80211_hw *hw,
-                               enum nl80211_iftype type);
-void rtl8723ae_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid);
-void rtl8723ae_set_qos(struct ieee80211_hw *hw, int aci);
-void rtl8723ae_set_beacon_related_registers(struct ieee80211_hw *hw);
-void rtl8723ae_set_beacon_interval(struct ieee80211_hw *hw);
-void rtl8723ae_update_interrupt_mask(struct ieee80211_hw *hw,
-                                     u32 add_msr, u32 rm_msr);
-void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
-void rtl8723ae_update_hal_rate_tbl(struct ieee80211_hw *hw,
-                                   struct ieee80211_sta *sta, u8 rssi_level);
-void rtl8723ae_update_channel_access_setting(struct ieee80211_hw *hw);
-bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid);
-void rtl8723ae_enable_hw_security_config(struct ieee80211_hw *hw);
-void rtl8723ae_set_key(struct ieee80211_hw *hw, u32 key_index,
-                       u8 *p_macaddr, bool is_group, u8 enc_algo,
-                       bool is_wepkey, bool clear_all);
+void rtl8723e_interrupt_recognized(struct ieee80211_hw *hw,
+                                   u32 *p_inta, u32 *p_intb);
+int rtl8723e_hw_init(struct ieee80211_hw *hw);
+void rtl8723e_card_disable(struct ieee80211_hw *hw);
+void rtl8723e_enable_interrupt(struct ieee80211_hw *hw);
+void rtl8723e_disable_interrupt(struct ieee80211_hw *hw);
+int rtl8723e_set_network_type(struct ieee80211_hw *hw,
+                              enum nl80211_iftype type);
+void rtl8723e_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid);
+void rtl8723e_set_qos(struct ieee80211_hw *hw, int aci);
+void rtl8723e_set_beacon_related_registers(struct ieee80211_hw *hw);
+void rtl8723e_set_beacon_interval(struct ieee80211_hw *hw);
+void rtl8723e_update_interrupt_mask(struct ieee80211_hw *hw,
+                                    u32 add_msr, u32 rm_msr);
+void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
+void rtl8723e_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                                  struct ieee80211_sta *sta, u8 rssi_level);
+void rtl8723e_update_channel_access_setting(struct ieee80211_hw *hw);
+bool rtl8723e_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid);
+void rtl8723e_enable_hw_security_config(struct ieee80211_hw *hw);
+void rtl8723e_set_key(struct ieee80211_hw *hw, u32 key_index,
+                      u8 *p_macaddr, bool is_group, u8 enc_algo,
+                      bool is_wepkey, bool clear_all);
 
-void rtl8723ae_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
-                                              bool autoload_fail, u8 *hwinfo);
-void rtl8723ae_bt_reg_init(struct ieee80211_hw *hw);
-void rtl8723ae_bt_hw_init(struct ieee80211_hw *hw);
-void rtl8723ae_suspend(struct ieee80211_hw *hw);
-void rtl8723ae_resume(struct ieee80211_hw *hw);
+void rtl8723e_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
+                                             bool autoload_fail, u8 *hwinfo);
+void rtl8723e_bt_reg_init(struct ieee80211_hw *hw);
+void rtl8723e_bt_hw_init(struct ieee80211_hw *hw);
+void rtl8723e_suspend(struct ieee80211_hw *hw);
+void rtl8723e_resume(struct ieee80211_hw *hw);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/led.c b/drivers/net/wireless/rtlwifi/rtl8723ae/led.c
index 061526fe6e2d..13173351cbfd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/led.c
@@ -32,44 +32,44 @@
 #include "reg.h"
 #include "led.h"
 
-static void _rtl8723ae_init_led(struct ieee80211_hw *hw,
-                                struct rtl_led *pled, enum rtl_led_pin ledpin)
+static void _rtl8723e_init_led(struct ieee80211_hw *hw,
+                               struct rtl_led *pled, enum rtl_led_pin ledpin)
 {
         pled->hw = hw;
         pled->ledpin = ledpin;
         pled->ledon = false;
 }
 
-void rtl8723ae_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
+void rtl8723e_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 ledcfg;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
                  "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
 
-        ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
-
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
                 break;
         case LED_PIN_LED0:
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
                 ledcfg &= ~BIT(6);
                 rtl_write_byte(rtlpriv,
                                REG_LEDCFG2, (ledcfg & 0xf0) | BIT(5));
                 break;
         case LED_PIN_LED1:
-                rtl_write_byte(rtlpriv, REG_LEDCFG2, (ledcfg & 0x0f) | BIT(5));
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1);
+                rtl_write_byte(rtlpriv, REG_LEDCFG1, ledcfg & 0x10);
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                         "switch case not process\n");
                 break;
         }
         pled->ledon = true;
 }
 
-void rtl8723ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
+void rtl8723e_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
@@ -86,7 +86,7 @@ void rtl8723ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         case LED_PIN_LED0:
                 ledcfg &= 0xf0;
                 if (pcipriv->ledctl.led_opendrain) {
-                        ledcfg &= 0x90;
+                        ledcfg &= 0x90; /* Set to software control. */
                         rtl_write_byte(rtlpriv, REG_LEDCFG2, (ledcfg|BIT(3)));
                         ledcfg = rtl_read_byte(rtlpriv, REG_MAC_PINMUX_CFG);
                         ledcfg &= 0xFE;
@@ -94,50 +94,51 @@ void rtl8723ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 } else {
                         ledcfg &= ~BIT(6);
                         rtl_write_byte(rtlpriv, REG_LEDCFG2,
-                                       (ledcfg | BIT(3) | BIT(5)));
+                                        (ledcfg | BIT(3) | BIT(5)));
                 }
                 break;
         case LED_PIN_LED1:
-                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1) & 0x10;
-                rtl_write_byte(rtlpriv, REG_LEDCFG1, (ledcfg | BIT(3)));
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1);
+                ledcfg &= 0x10; /* Set to software control. */
+                rtl_write_byte(rtlpriv, REG_LEDCFG1, ledcfg|BIT(3));
+
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                         "switch case not process\n");
                 break;
         }
         pled->ledon = false;
 }
 
-void rtl8723ae_init_sw_leds(struct ieee80211_hw *hw)
+void rtl8723e_init_sw_leds(struct ieee80211_hw *hw)
 {
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
-
-        _rtl8723ae_init_led(hw, &(pcipriv->ledctl.sw_led0), LED_PIN_LED0);
-        _rtl8723ae_init_led(hw, &(pcipriv->ledctl.sw_led1), LED_PIN_LED1);
+        _rtl8723e_init_led(hw, &pcipriv->ledctl.sw_led0, LED_PIN_LED0);
+        _rtl8723e_init_led(hw, &pcipriv->ledctl.sw_led1, LED_PIN_LED1);
 }
 
-static void _rtl8723ae_sw_led_control(struct ieee80211_hw *hw,
-                                    enum led_ctl_mode ledaction)
+static void _rtl8723e_sw_led_control(struct ieee80211_hw *hw,
+                                     enum led_ctl_mode ledaction)
 {
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);
-
         switch (ledaction) {
         case LED_CTL_POWER_ON:
         case LED_CTL_LINK:
         case LED_CTL_NO_LINK:
-                rtl8723ae_sw_led_on(hw, pLed0);
+                rtl8723e_sw_led_on(hw, pLed0);
                 break;
         case LED_CTL_POWER_OFF:
-                rtl8723ae_sw_led_off(hw, pLed0);
+                rtl8723e_sw_led_off(hw, pLed0);
                 break;
         default:
                 break;
         }
 }
 
-void rtl8723ae_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
+void rtl8723e_led_control(struct ieee80211_hw *hw,
+                          enum led_ctl_mode ledaction)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
@@ -152,6 +153,7 @@ void rtl8723ae_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
              ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d,\n", ledaction);
-        _rtl8723ae_sw_led_control(hw, ledaction);
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d,\n",
+                 ledaction);
+        _rtl8723e_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/led.h b/drivers/net/wireless/rtlwifi/rtl8723ae/led.h
index 2cb88e78f62a..c22b19f542a6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/led.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,10 +26,9 @@
 #ifndef __RTL92CE_LED_H__
 #define __RTL92CE_LED_H__
 
-void rtl8723ae_init_sw_leds(struct ieee80211_hw *hw);
-void rtl8723ae_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled);
-void rtl8723ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled);
-void rtl8723ae_led_control(struct ieee80211_hw *hw,
-                           enum led_ctl_mode ledaction);
+void rtl8723e_init_sw_leds(struct ieee80211_hw *hw);
+void rtl8723e_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl8723e_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl8723e_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c
index 3ea78afdec73..d367097f490b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,7 +26,6 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../ps.h"
-#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -39,29 +34,31 @@
 #include "table.h"
 #include "../rtl8723com/phy_common.h"
 
-/* static forward definitions */
-static u32 _phy_fw_rf_serial_read(struct ieee80211_hw *hw,
-                                  enum radio_path rfpath, u32 offset);
-static void _phy_fw_rf_serial_write(struct ieee80211_hw *hw,
-                                    enum radio_path rfpath,
-                                    u32 offset, u32 data);
-static bool _phy_bb8192c_config_parafile(struct ieee80211_hw *hw);
-static bool _phy_cfg_mac_w_header(struct ieee80211_hw *hw);
-static bool _phy_cfg_bb_w_header(struct ieee80211_hw *hw, u8 configtype);
-static bool _phy_cfg_bb_w_pgheader(struct ieee80211_hw *hw, u8 configtype);
-static bool _phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 channel,
-                                      u8 *stage, u8 *step, u32 *delay);
-static u8 _phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,
-                                enum wireless_mode wirelessmode,
-                                long power_indbm);
-static void rtl8723ae_phy_set_io(struct ieee80211_hw *hw);
-
-u32 rtl8723ae_phy_query_rf_reg(struct ieee80211_hw *hw,
-                               enum radio_path rfpath, u32 regaddr, u32 bitmask)
+static void _rtl8723e_phy_fw_rf_serial_write(struct ieee80211_hw *hw,
+                                             enum radio_path rfpath, u32 offset,
+                                             u32 data);
+static bool _rtl8723e_phy_bb8192c_config_parafile(struct ieee80211_hw *hw);
+static bool _rtl8723e_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
+static bool _rtl8723e_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
+                                                    u8 configtype);
+static bool _rtl8723e_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
+                                                      u8 configtype);
+static bool _rtl8723e_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+                                               u8 channel, u8 *stage, u8 *step,
+                                               u32 *delay);
+static u8 _rtl8723e_phy_dbm_to_txpwr_idx(struct ieee80211_hw *hw,
+                                         enum wireless_mode wirelessmode,
+                                         long power_indbm);
+static void rtl8723e_phy_set_rf_on(struct ieee80211_hw *hw);
+static void rtl8723e_phy_set_io(struct ieee80211_hw *hw);
+
+u32 rtl8723e_phy_query_rf_reg(struct ieee80211_hw *hw,
+                              enum radio_path rfpath,
+                              u32 regaddr, u32 bitmask)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 original_value, readback_value, bitshift;
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        u32 original_value = 0, readback_value, bitshift;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         unsigned long flags;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
@@ -70,10 +67,10 @@ u32 rtl8723ae_phy_query_rf_reg(struct ieee80211_hw *hw,
 
         spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
 
-        if (rtlphy->rf_mode != RF_OP_BY_FW)
-                original_value = rtl8723_phy_rf_serial_read(hw, rfpath, regaddr);
-        else
-                original_value = _phy_fw_rf_serial_read(hw, rfpath, regaddr);
+        if (rtlphy->rf_mode != RF_OP_BY_FW) {
+                original_value = rtl8723_phy_rf_serial_read(hw,
+                                                            rfpath, regaddr);
+        }
 
         bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
         readback_value = (original_value & bitmask) >> bitshift;
@@ -82,45 +79,46 @@ u32 rtl8723ae_phy_query_rf_reg(struct ieee80211_hw *hw,
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                  "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
-                 regaddr, rfpath, bitmask, original_value);
+                  regaddr, rfpath, bitmask, original_value);
 
         return readback_value;
 }
 
-void rtl8723ae_phy_set_rf_reg(struct ieee80211_hw *hw,
-                              enum radio_path rfpath,
-                              u32 regaddr, u32 bitmask, u32 data)
+void rtl8723e_phy_set_rf_reg(struct ieee80211_hw *hw,
+                             enum radio_path rfpath,
+                           u32 regaddr, u32 bitmask, u32 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        u32 original_value, bitshift;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 original_value = 0, bitshift;
         unsigned long flags;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                  "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                 regaddr, bitmask, data, rfpath);
+                  regaddr, bitmask, data, rfpath);
 
         spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
 
         if (rtlphy->rf_mode != RF_OP_BY_FW) {
                 if (bitmask != RFREG_OFFSET_MASK) {
-                        original_value = rtl8723_phy_rf_serial_read(hw, rfpath,
+                        original_value = rtl8723_phy_rf_serial_read(hw,
+                                                                    rfpath,
                                                                     regaddr);
                         bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
-                        data = ((original_value & (~bitmask)) |
-                               (data << bitshift));
+                        data =
+                            ((original_value & (~bitmask)) |
+                             (data << bitshift));
                 }
 
                 rtl8723_phy_rf_serial_write(hw, rfpath, regaddr, data);
         } else {
                 if (bitmask != RFREG_OFFSET_MASK) {
-                        original_value = _phy_fw_rf_serial_read(hw, rfpath,
-                                                                regaddr);
                         bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
-                        data = ((original_value & (~bitmask)) |
-                               (data << bitshift));
+                        data =
+                            ((original_value & (~bitmask)) |
+                             (data << bitshift));
                 }
-                _phy_fw_rf_serial_write(hw, rfpath, regaddr, data);
+                _rtl8723e_phy_fw_rf_serial_write(hw, rfpath, regaddr, data);
         }
 
         spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
@@ -128,23 +126,17 @@ void rtl8723ae_phy_set_rf_reg(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                  "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                  regaddr, bitmask, data, rfpath);
-}
 
-static u32 _phy_fw_rf_serial_read(struct ieee80211_hw *hw,
-                                            enum radio_path rfpath, u32 offset)
-{
-        RT_ASSERT(false, "deprecated!\n");
-        return 0;
 }
 
-static void _phy_fw_rf_serial_write(struct ieee80211_hw *hw,
-                                    enum radio_path rfpath,
-                                    u32 offset, u32 data)
+static void _rtl8723e_phy_fw_rf_serial_write(struct ieee80211_hw *hw,
+                                             enum radio_path rfpath, u32 offset,
+                                             u32 data)
 {
         RT_ASSERT(false, "deprecated!\n");
 }
 
-static void _rtl8723ae_phy_bb_config_1t(struct ieee80211_hw *hw)
+static void _rtl8723e_phy_bb_config_1t(struct ieee80211_hw *hw)
 {
         rtl_set_bbreg(hw, RFPGA0_TXINFO, 0x3, 0x2);
         rtl_set_bbreg(hw, RFPGA1_TXINFO, 0x300033, 0x200022);
@@ -158,20 +150,20 @@ static void _rtl8723ae_phy_bb_config_1t(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, 0xe88, 0x0c000000, 0x2);
 }
 
-bool rtl8723ae_phy_mac_config(struct ieee80211_hw *hw)
+bool rtl8723e_phy_mac_config(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        bool rtstatus = _phy_cfg_mac_w_header(hw);
+        bool rtstatus = _rtl8723e_phy_config_mac_with_headerfile(hw);
         rtl_write_byte(rtlpriv, 0x04CA, 0x0A);
         return rtstatus;
 }
 
-bool rtl8723ae_phy_bb_config(struct ieee80211_hw *hw)
+bool rtl8723e_phy_bb_config(struct ieee80211_hw *hw)
 {
         bool rtstatus = true;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmpu1b;
-        u8 reg_hwparafile = 1;
+        u8 b_reg_hwparafile = 1;
 
         rtl8723_phy_init_bb_rf_reg_def(hw);
 
@@ -186,67 +178,72 @@ bool rtl8723ae_phy_bb_config(struct ieee80211_hw *hw)
 
         /* 3. 0x02[1:0] = 2b'11 */
         tmpu1b = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN);
-        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, (tmpu1b |
-                       FEN_BB_GLB_RSTn | FEN_BBRSTB));
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN,
+                       (tmpu1b | FEN_BB_GLB_RSTN | FEN_BBRSTB));
 
         /* 4. 0x25[6] = 0 */
         tmpu1b = rtl_read_byte(rtlpriv, REG_AFE_XTAL_CTRL+1);
-        rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL+1, (tmpu1b&(~BIT(6))));
+        rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL+1, (tmpu1b & (~BIT(6))));
 
-        /* 5. 0x24[20] = 0      Advised by SD3 Alex Wang. 2011.02.09. */
+        /* 5. 0x24[20] = 0      //Advised by SD3 Alex Wang. 2011.02.09. */
         tmpu1b = rtl_read_byte(rtlpriv, REG_AFE_XTAL_CTRL+2);
-        rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL+2, (tmpu1b&(~BIT(4))));
+        rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL+2, (tmpu1b & (~BIT(4))));
 
         /* 6. 0x1f[7:0] = 0x07 */
         rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x07);
 
-        if (reg_hwparafile == 1)
-                rtstatus = _phy_bb8192c_config_parafile(hw);
+        if (b_reg_hwparafile == 1)
+                rtstatus = _rtl8723e_phy_bb8192c_config_parafile(hw);
         return rtstatus;
 }
 
-bool rtl8723ae_phy_rf_config(struct ieee80211_hw *hw)
+bool rtl8723e_phy_rf_config(struct ieee80211_hw *hw)
 {
-        return rtl8723ae_phy_rf6052_config(hw);
+        return rtl8723e_phy_rf6052_config(hw);
 }
 
-static bool _phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
+static bool _rtl8723e_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         bool rtstatus;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n");
-        rtstatus = _phy_cfg_bb_w_header(hw, BASEBAND_CONFIG_PHY_REG);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "\n");
+        rtstatus = _rtl8723e_phy_config_bb_with_headerfile(hw,
+                                                BASEBAND_CONFIG_PHY_REG);
         if (rtstatus != true) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!");
                 return false;
         }
 
         if (rtlphy->rf_type == RF_1T2R) {
-                _rtl8723ae_phy_bb_config_1t(hw);
+                _rtl8723e_phy_bb_config_1t(hw);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Config to 1T!!\n");
         }
         if (rtlefuse->autoload_failflag == false) {
                 rtlphy->pwrgroup_cnt = 0;
-                rtstatus = _phy_cfg_bb_w_pgheader(hw, BASEBAND_CONFIG_PHY_REG);
+                rtstatus = _rtl8723e_phy_config_bb_with_pgheaderfile(hw,
+                                        BASEBAND_CONFIG_PHY_REG);
         }
         if (rtstatus != true) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!");
                 return false;
         }
-        rtstatus = _phy_cfg_bb_w_header(hw, BASEBAND_CONFIG_AGC_TAB);
+        rtstatus =
+          _rtl8723e_phy_config_bb_with_headerfile(hw, BASEBAND_CONFIG_AGC_TAB);
         if (rtstatus != true) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
                 return false;
         }
         rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
-                                         RFPGA0_XA_HSSIPARAMETER2, 0x200));
+                                        RFPGA0_XA_HSSIPARAMETER2,
+                                        0x200));
+
         return true;
 }
 
-static bool _phy_cfg_mac_w_header(struct ieee80211_hw *hw)
+static bool _rtl8723e_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
@@ -264,7 +261,8 @@ static bool _phy_cfg_mac_w_header(struct ieee80211_hw *hw)
         return true;
 }
 
-static bool _phy_cfg_bb_w_header(struct ieee80211_hw *hw, u8 configtype)
+static bool _rtl8723e_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
+                                                    u8 configtype)
 {
         int i;
         u32 *phy_regarray_table;
@@ -278,13 +276,23 @@ static bool _phy_cfg_bb_w_header(struct ieee80211_hw *hw, u8 configtype)
         phy_regarray_table = RTL8723EPHY_REG_1TARRAY;
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_reg_arraylen; i = i + 2) {
-                        rtl_addr_delay(phy_regarray_table[i]);
+                        if (phy_regarray_table[i] == 0xfe)
+                                mdelay(50);
+                        else if (phy_regarray_table[i] == 0xfd)
+                                mdelay(5);
+                        else if (phy_regarray_table[i] == 0xfc)
+                                mdelay(1);
+                        else if (phy_regarray_table[i] == 0xfb)
+                                udelay(50);
+                        else if (phy_regarray_table[i] == 0xfa)
+                                udelay(5);
+                        else if (phy_regarray_table[i] == 0xf9)
+                                udelay(1);
                         rtl_set_bbreg(hw, phy_regarray_table[i], MASKDWORD,
                                       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]);
                 }
@@ -294,8 +302,7 @@ static bool _phy_cfg_bb_w_header(struct ieee80211_hw *hw, u8 configtype)
                                       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]);
                 }
@@ -303,132 +310,163 @@ static bool _phy_cfg_bb_w_header(struct ieee80211_hw *hw, u8 configtype)
         return true;
 }
 
-static void _st_pwrIdx_dfrate_off(struct ieee80211_hw *hw, u32 regaddr,
-                                  u32 bitmask, u32 data)
+static void store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
+                                           u32 regaddr, u32 bitmask,
+                                           u32 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
-        switch (regaddr) {
-        case RTXAGC_A_RATE18_06:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][0] = data;
+        if (regaddr == RTXAGC_A_RATE18_06) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][0] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][0]);
-                break;
-        case RTXAGC_A_RATE54_24:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][1] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][0]);
+        }
+        if (regaddr == RTXAGC_A_RATE54_24) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][1] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][1]);
-                break;
-        case RTXAGC_A_CCK1_MCS32:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][6] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][1]);
+        }
+        if (regaddr == RTXAGC_A_CCK1_MCS32) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][6] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][6]);
-                break;
-        case RTXAGC_B_CCK11_A_CCK2_11:
-                if (bitmask == 0xffffff00) {
-                        rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][7] = data;
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
-                                 rtlphy->pwrgroup_cnt,
-                                 rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][7]);
-                }
-                if (bitmask == 0x000000ff) {
-                        rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][15] = data;
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
-                                 rtlphy->pwrgroup_cnt,
-                                 rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][15]);
-                }
-                break;
-        case RTXAGC_A_MCS03_MCS00:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][2] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][6]);
+        }
+        if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][7] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][7]);
+        }
+        if (regaddr == RTXAGC_A_MCS03_MCS00) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][2] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][2]);
-                break;
-        case RTXAGC_A_MCS07_MCS04:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][3] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][2]);
+        }
+        if (regaddr == RTXAGC_A_MCS07_MCS04) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][3] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][3]);
-                break;
-        case RTXAGC_A_MCS11_MCS08:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][4] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][3]);
+        }
+        if (regaddr == RTXAGC_A_MCS11_MCS08) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][4] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][4]);
-                break;
-        case RTXAGC_A_MCS15_MCS12:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][5] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][4]);
+        }
+        if (regaddr == RTXAGC_A_MCS15_MCS12) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][5] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][5]);
-                break;
-        case RTXAGC_B_RATE18_06:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][8] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][5]);
+        }
+        if (regaddr == RTXAGC_B_RATE18_06) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][8] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][8]);
-                break;
-        case RTXAGC_B_RATE54_24:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][9] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][8]);
+        }
+        if (regaddr == RTXAGC_B_RATE54_24) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][9] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][9]);
-                break;
-        case RTXAGC_B_CCK1_55_MCS32:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][14] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][9]);
+        }
+        if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][14] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][14]);
-                break;
-        case RTXAGC_B_MCS03_MCS00:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][10] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][14]);
+        }
+        if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][15] =
+                    data;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][15]);
+        }
+        if (regaddr == RTXAGC_B_MCS03_MCS00) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][10] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][10]);
-                break;
-        case RTXAGC_B_MCS07_MCS04:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][11] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][10]);
+        }
+        if (regaddr == RTXAGC_B_MCS07_MCS04) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][11] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][11]);
-                break;
-        case RTXAGC_B_MCS11_MCS08:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][12] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][11]);
+        }
+        if (regaddr == RTXAGC_B_MCS11_MCS08) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][12] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][12]);
-                break;
-        case RTXAGC_B_MCS15_MCS12:
-                rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][13] = data;
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][12]);
+        }
+        if (regaddr == RTXAGC_B_MCS15_MCS12) {
+                rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][13] =
+                    data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
-                         rtlphy->pwrgroup_cnt,
-                         rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][13]);
+                          rtlphy->pwrgroup_cnt,
+                          rtlphy->mcs_txpwrlevel_origoffset[rtlphy->
+                                                            pwrgroup_cnt][13]);
+
                 rtlphy->pwrgroup_cnt++;
-                break;
         }
 }
 
-static bool _phy_cfg_bb_w_pgheader(struct ieee80211_hw *hw, u8 configtype)
+static bool _rtl8723e_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
+                                                      u8 configtype)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         int i;
@@ -440,11 +478,23 @@ static bool _phy_cfg_bb_w_pgheader(struct ieee80211_hw *hw, u8 configtype)
 
         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]);
-
-                        _st_pwrIdx_dfrate_off(hw, phy_regarray_table_pg[i],
-                                              phy_regarray_table_pg[i + 1],
-                                              phy_regarray_table_pg[i + 2]);
+                        if (phy_regarray_table_pg[i] == 0xfe)
+                                mdelay(50);
+                        else if (phy_regarray_table_pg[i] == 0xfd)
+                                mdelay(5);
+                        else if (phy_regarray_table_pg[i] == 0xfc)
+                                mdelay(1);
+                        else if (phy_regarray_table_pg[i] == 0xfb)
+                                udelay(50);
+                        else if (phy_regarray_table_pg[i] == 0xfa)
+                                udelay(5);
+                        else if (phy_regarray_table_pg[i] == 0xf9)
+                                udelay(1);
+
+                        store_pwrindex_diffrate_offset(hw,
+                                                phy_regarray_table_pg[i],
+                                                phy_regarray_table_pg[i + 1],
+                                                phy_regarray_table_pg[i + 2]);
                 }
         } else {
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
@@ -453,45 +503,57 @@ static bool _phy_cfg_bb_w_pgheader(struct ieee80211_hw *hw, u8 configtype)
         return true;
 }
 
-bool rtl8723ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
-                                             enum radio_path rfpath)
+bool rtl8723e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                            enum radio_path rfpath)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
         int i;
+        bool rtstatus = true;
         u32 *radioa_array_table;
-        u16 radioa_arraylen;
+        u32 *radiob_array_table;
+        u16 radioa_arraylen, radiob_arraylen;
 
-        radioa_arraylen = Rtl8723ERADIOA_1TARRAYLENGTH;
+        radioa_arraylen = RTL8723ERADIOA_1TARRAYLENGTH;
         radioa_array_table = RTL8723E_RADIOA_1TARRAY;
+        radiob_arraylen = RTL8723E_RADIOB_1TARRAYLENGTH;
+        radiob_array_table = RTL8723E_RADIOB_1TARRAY;
+
+        rtstatus = true;
 
         switch (rfpath) {
         case RF90_PATH_A:
                 for (i = 0; i < radioa_arraylen; i = i + 2) {
-                        rtl_rfreg_delay(hw, rfpath, radioa_array_table[i],
-                                        RFREG_OFFSET_MASK,
-                                        radioa_array_table[i + 1]);
+                        if (radioa_array_table[i] == 0xfe) {
+                                mdelay(50);
+                        } else if (radioa_array_table[i] == 0xfd) {
+                                mdelay(5);
+                        } else if (radioa_array_table[i] == 0xfc) {
+                                mdelay(1);
+                        } else if (radioa_array_table[i] == 0xfb) {
+                                udelay(50);
+                        } else if (radioa_array_table[i] == 0xfa) {
+                                udelay(5);
+                        } else if (radioa_array_table[i] == 0xf9) {
+                                udelay(1);
+                        } else {
+                                rtl_set_rfreg(hw, rfpath, radioa_array_table[i],
+                                              RFREG_OFFSET_MASK,
+                                              radioa_array_table[i + 1]);
+                                udelay(1);
+                        }
                 }
                 break;
         case RF90_PATH_B:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not process\n");
-                break;
         case RF90_PATH_C:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not process\n");
-                break;
         case RF90_PATH_D:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not process\n");
                 break;
         }
         return true;
 }
 
-void rtl8723ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
+void rtl8723e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
         rtlphy->default_initialgain[0] =
             (u8) rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
@@ -504,10 +566,10 @@ void rtl8723ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                  "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
-                  rtlphy->default_initialgain[0],
-                  rtlphy->default_initialgain[1],
-                  rtlphy->default_initialgain[2],
-                  rtlphy->default_initialgain[3]);
+                 rtlphy->default_initialgain[0],
+                 rtlphy->default_initialgain[1],
+                 rtlphy->default_initialgain[2],
+                 rtlphy->default_initialgain[3]);
 
         rtlphy->framesync = (u8) rtl_get_bbreg(hw,
                                                ROFDM0_RXDETECTOR3, MASKBYTE0);
@@ -516,37 +578,43 @@ void rtl8723ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                  "Default framesync (0x%x) = 0x%x\n",
-                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
+                  ROFDM0_RXDETECTOR3, rtlphy->framesync);
 }
 
-void rtl8723ae_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel)
+void rtl8723e_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 txpwr_level;
         long txpwr_dbm;
 
         txpwr_level = rtlphy->cur_cck_txpwridx;
-        txpwr_dbm = rtl8723_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_B, txpwr_level);
+        txpwr_dbm = rtl8723_phy_txpwr_idx_to_dbm(hw,
+                                                 WIRELESS_MODE_B, txpwr_level);
         txpwr_level = rtlphy->cur_ofdm24g_txpwridx +
             rtlefuse->legacy_ht_txpowerdiff;
-        if (rtl8723_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G, txpwr_level) > txpwr_dbm)
-                txpwr_dbm = rtl8723_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G,
-                                                  txpwr_level);
+        if (rtl8723_phy_txpwr_idx_to_dbm(hw,
+                                         WIRELESS_MODE_G,
+                                         txpwr_level) > txpwr_dbm)
+                txpwr_dbm =
+                    rtl8723_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G,
+                                                 txpwr_level);
         txpwr_level = rtlphy->cur_ofdm24g_txpwridx;
-        if (rtl8723_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_N_24G, txpwr_level) >
-            txpwr_dbm)
-                txpwr_dbm = rtl8723_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_N_24G,
-                                                         txpwr_level);
+        if (rtl8723_phy_txpwr_idx_to_dbm(hw,
+                                         WIRELESS_MODE_N_24G,
+                                         txpwr_level) > txpwr_dbm)
+                txpwr_dbm =
+                    rtl8723_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_N_24G,
+                                                 txpwr_level);
         *powerlevel = txpwr_dbm;
 }
 
-static void _rtl8723ae_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
-                                         u8 *cckpowerlevel, u8 *ofdmpowerlevel)
+static void _rtl8723e_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
+                                        u8 *cckpowerlevel, u8 *ofdmpowerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 index = (channel - 1);
 
@@ -567,66 +635,70 @@ static void _rtl8723ae_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
         }
 }
 
-static void _rtl8723ae_ccxpower_index_check(struct ieee80211_hw *hw,
-                                            u8 channel, u8 *cckpowerlevel,
-                                            u8 *ofdmpowerlevel)
+static void _rtl8723e_ccxpower_index_check(struct ieee80211_hw *hw,
+                                           u8 channel, u8 *cckpowerlevel,
+                                           u8 *ofdmpowerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
         rtlphy->cur_cck_txpwridx = cckpowerlevel[0];
         rtlphy->cur_ofdm24g_txpwridx = ofdmpowerlevel[0];
+
 }
 
-void rtl8723ae_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
+void rtl8723e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
 {
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 cckpowerlevel[2], ofdmpowerlevel[2];
 
         if (rtlefuse->txpwr_fromeprom == false)
                 return;
-        _rtl8723ae_get_txpower_index(hw, channel, &cckpowerlevel[0],
-                                     &ofdmpowerlevel[0]);
-        _rtl8723ae_ccxpower_index_check(hw, channel, &cckpowerlevel[0],
-                                        &ofdmpowerlevel[0]);
-        rtl8723ae_phy_rf6052_set_cck_txpower(hw, &cckpowerlevel[0]);
-        rtl8723ae_phy_rf6052_set_ofdm_txpower(hw, &ofdmpowerlevel[0], channel);
+        _rtl8723e_get_txpower_index(hw, channel,
+                                    &cckpowerlevel[0], &ofdmpowerlevel[0]);
+        _rtl8723e_ccxpower_index_check(hw,
+                                       channel, &cckpowerlevel[0],
+                                       &ofdmpowerlevel[0]);
+        rtl8723e_phy_rf6052_set_cck_txpower(hw, &cckpowerlevel[0]);
+        rtl8723e_phy_rf6052_set_ofdm_txpower(hw, &ofdmpowerlevel[0], channel);
 }
 
-bool rtl8723ae_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm)
+bool rtl8723e_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 idx;
         u8 rf_path;
-        u8 ccktxpwridx = _phy_dbm_to_txpwr_Idx(hw, WIRELESS_MODE_B,
-                                               power_indbm);
-        u8 ofdmtxpwridx = _phy_dbm_to_txpwr_Idx(hw, WIRELESS_MODE_N_24G,
-                                                power_indbm);
+        u8 ccktxpwridx = _rtl8723e_phy_dbm_to_txpwr_idx(hw,
+                                                      WIRELESS_MODE_B,
+                                                      power_indbm);
+        u8 ofdmtxpwridx = _rtl8723e_phy_dbm_to_txpwr_idx(hw,
+                                                       WIRELESS_MODE_N_24G,
+                                                       power_indbm);
         if (ofdmtxpwridx - rtlefuse->legacy_ht_txpowerdiff > 0)
                 ofdmtxpwridx -= rtlefuse->legacy_ht_txpowerdiff;
         else
                 ofdmtxpwridx = 0;
         RT_TRACE(rtlpriv, COMP_TXAGC, DBG_TRACE,
                  "%lx dBm, ccktxpwridx = %d, ofdmtxpwridx = %d\n",
-                 power_indbm, ccktxpwridx, ofdmtxpwridx);
+                  power_indbm, ccktxpwridx, ofdmtxpwridx);
         for (idx = 0; idx < 14; idx++) {
                 for (rf_path = 0; rf_path < 2; rf_path++) {
                         rtlefuse->txpwrlevel_cck[rf_path][idx] = ccktxpwridx;
                         rtlefuse->txpwrlevel_ht40_1s[rf_path][idx] =
-                                                            ofdmtxpwridx;
+                            ofdmtxpwridx;
                         rtlefuse->txpwrlevel_ht40_2s[rf_path][idx] =
-                                                            ofdmtxpwridx;
+                            ofdmtxpwridx;
                 }
         }
-        rtl8723ae_phy_set_txpower_level(hw, rtlphy->current_channel);
+        rtl8723e_phy_set_txpower_level(hw, rtlphy->current_channel);
         return true;
 }
 
-static u8 _phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,
-                                enum wireless_mode wirelessmode,
-                                long power_indbm)
+static u8 _rtl8723e_phy_dbm_to_txpwr_idx(struct ieee80211_hw *hw,
+                                         enum wireless_mode wirelessmode,
+                                         long power_indbm)
 {
         u8 txpwridx;
         long offset;
@@ -645,7 +717,7 @@ static u8 _phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,
         }
 
         if ((power_indbm - offset) > 0)
-                txpwridx = (u8) ((power_indbm - offset) * 2);
+                txpwridx = (u8)((power_indbm - offset) * 2);
         else
                 txpwridx = 0;
 
@@ -655,19 +727,48 @@ static u8 _phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,
         return txpwridx;
 }
 
-void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
+void rtl8723e_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        enum io_type iotype;
+
+        if (!is_hal_stop(rtlhal)) {
+                switch (operation) {
+                case SCAN_OPT_BACKUP_BAND0:
+                        iotype = IO_CMD_PAUSE_BAND0_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+
+                        break;
+                case SCAN_OPT_RESTORE:
+                        iotype = IO_CMD_RESUME_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Unknown Scan Backup operation.\n");
+                        break;
+                }
+        }
+}
+
+void rtl8723e_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u8 reg_bw_opmode;
         u8 reg_prsr_rsc;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
                  "Switch to %s bandwidth\n",
-                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                 "20MHz" : "40MHz");
+                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                  "20MHz" : "40MHz");
 
         if (is_hal_stop(rtlhal)) {
                 rtlphy->set_bwmode_inprogress = false;
@@ -719,16 +820,16 @@ void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                          "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
-        rtl8723ae_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
+        rtl8723e_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
 }
 
-void rtl8723ae_phy_set_bw_mode(struct ieee80211_hw *hw,
-                               enum nl80211_channel_type ch_type)
+void rtl8723e_phy_set_bw_mode(struct ieee80211_hw *hw,
+                              enum nl80211_channel_type ch_type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 tmp_bw = rtlphy->current_chan_bw;
 
@@ -736,20 +837,20 @@ void rtl8723ae_phy_set_bw_mode(struct ieee80211_hw *hw,
                 return;
         rtlphy->set_bwmode_inprogress = true;
         if ((!is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
-                rtl8723ae_phy_set_bw_mode_callback(hw);
+                rtl8723e_phy_set_bw_mode_callback(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         "FALSE driver sleep or unload\n");
+                         "false driver sleep or unload\n");
                 rtlphy->set_bwmode_inprogress = false;
                 rtlphy->current_chan_bw = tmp_bw;
         }
 }
 
-void rtl8723ae_phy_sw_chnl_callback(struct ieee80211_hw *hw)
+void rtl8723e_phy_sw_chnl_callback(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u32 delay;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
@@ -759,7 +860,7 @@ void rtl8723ae_phy_sw_chnl_callback(struct ieee80211_hw *hw)
         do {
                 if (!rtlphy->sw_chnl_inprogress)
                         break;
-                if (!_phy_sw_chnl_step_by_step
+                if (!_rtl8723e_phy_sw_chnl_step_by_step
                     (hw, rtlphy->current_channel, &rtlphy->sw_chnl_stage,
                      &rtlphy->sw_chnl_step, &delay)) {
                         if (delay > 0)
@@ -771,13 +872,13 @@ void rtl8723ae_phy_sw_chnl_callback(struct ieee80211_hw *hw)
                 }
                 break;
         } while (true);
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
 }
 
-u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw)
+u8 rtl8723e_phy_sw_chnl(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
         if (rtlphy->sw_chnl_inprogress)
@@ -790,9 +891,9 @@ u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw)
         rtlphy->sw_chnl_stage = 0;
         rtlphy->sw_chnl_step = 0;
         if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
-                rtl8723ae_phy_sw_chnl_callback(hw);
+                rtl8723e_phy_sw_chnl_callback(hw);
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         "sw_chnl_inprogress false schedule workitem\n");
+                         "sw_chnl_inprogress false schdule workitem\n");
                 rtlphy->sw_chnl_inprogress = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
@@ -802,31 +903,33 @@ u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw)
         return 1;
 }
 
-static void _rtl8723ae_phy_sw_rf_seting(struct ieee80211_hw *hw, u8 channel)
+static void _rtl8723e_phy_sw_rf_seting(struct ieee80211_hw *hw, u8 channel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        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 (channel == 6 && rtlphy->current_chan_bw ==
-                    HT_CHANNEL_WIDTH_20)
-                        rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1, MASKDWORD,
-                                      0x00255);
+                                HT_CHANNEL_WIDTH_20)
+                        rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1,
+                                      MASKDWORD, 0x00255);
                 else{
-                        u32 backupRF0x1A = (u32)rtl_get_rfreg(hw, RF90_PATH_A,
-                                           RF_RX_G1, RFREG_OFFSET_MASK);
-                        rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1, MASKDWORD,
-                                      backupRF0x1A);
+                        u32 backuprf0x1a = (u32)rtl_get_rfreg(hw,
+                                        RF90_PATH_A, RF_RX_G1,
+                                        RFREG_OFFSET_MASK);
+                        rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1,
+                                      MASKDWORD, backuprf0x1a);
                 }
         }
 }
 
-static bool _phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 channel,
-                                      u8 *stage, u8 *step, u32 *delay)
+static bool _rtl8723e_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+                                               u8 channel, u8 *stage, u8 *step,
+                                               u32 *delay)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct swchnlcmd precommoncmd[MAX_PRECMD_CNT];
         u32 precommoncmdcnt;
         struct swchnlcmd postcommoncmd[MAX_POSTCMD_CNT];
@@ -839,14 +942,16 @@ static bool _phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 channel,
 
         precommoncmdcnt = 0;
         rtl8723_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
-                                         MAX_PRECMD_CNT, CMDID_SET_TXPOWEROWER_LEVEL,
-                                         0, 0, 0);
+                                         MAX_PRECMD_CNT,
+                                         CMDID_SET_TXPOWEROWER_LEVEL, 0, 0, 0);
         rtl8723_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
                                          MAX_PRECMD_CNT, CMDID_END, 0, 0, 0);
+
         postcommoncmdcnt = 0;
 
         rtl8723_phy_set_sw_chnl_cmdarray(postcommoncmd, postcommoncmdcnt++,
                                          MAX_POSTCMD_CNT, CMDID_END, 0, 0, 0);
+
         rfdependcmdcnt = 0;
 
         RT_ASSERT((channel >= 1 && channel <= 14),
@@ -854,10 +959,11 @@ static bool _phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 channel,
 
         rtl8723_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
                                          MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
-                                  RF_CHNLBW, channel, 10);
+                                         RF_CHNLBW, channel, 10);
 
         rtl8723_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
-                                         MAX_RFDEPENDCMD_CNT, CMDID_END, 0, 0, 0);
+                                         MAX_RFDEPENDCMD_CNT, CMDID_END, 0, 0,
+                                         0);
 
         do {
                 switch (*stage) {
@@ -870,6 +976,10 @@ static bool _phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 channel,
                 case 2:
                         currentcmd = &postcommoncmd[*step];
                         break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Invalid 'stage' = %d, Check it!\n", *stage);
+                        return true;
                 }
 
                 if (currentcmd->cmdid == CMDID_END) {
@@ -884,7 +994,7 @@ static bool _phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 channel,
 
                 switch (currentcmd->cmdid) {
                 case CMDID_SET_TXPOWEROWER_LEVEL:
-                        rtl8723ae_phy_set_txpower_level(hw, channel);
+                        rtl8723e_phy_set_txpower_level(hw, channel);
                         break;
                 case CMDID_WRITEPORT_ULONG:
                         rtl_write_dword(rtlpriv, currentcmd->para1,
@@ -909,10 +1019,10 @@ static bool _phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 channel,
                                               RFREG_OFFSET_MASK,
                                               rtlphy->rfreg_chnlval[rfpath]);
                         }
-                        _rtl8723ae_phy_sw_rf_seting(hw, channel);
+                        _rtl8723e_phy_sw_rf_seting(hw, channel);
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                                  "switch case not process\n");
                         break;
                 }
@@ -925,7 +1035,7 @@ static bool _phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 channel,
         return false;
 }
 
-static u8 _rtl8723ae_phy_path_a_iqk(struct ieee80211_hw *hw, bool config_pathb)
+static u8 _rtl8723e_phy_path_a_iqk(struct ieee80211_hw *hw, bool config_pathb)
 {
         u32 reg_eac, reg_e94, reg_e9c, reg_ea4;
         u8 result = 0x00;
@@ -968,7 +1078,7 @@ static u8 _rtl8723ae_phy_path_a_iqk(struct ieee80211_hw *hw, bool config_pathb)
         return result;
 }
 
-static u8 _rtl8723ae_phy_path_b_iqk(struct ieee80211_hw *hw)
+static u8 _rtl8723e_phy_path_b_iqk(struct ieee80211_hw *hw)
 {
         u32 reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc;
         u8 result = 0x00;
@@ -995,8 +1105,8 @@ static u8 _rtl8723ae_phy_path_b_iqk(struct ieee80211_hw *hw)
         return result;
 }
 
-static bool phy_simularity_comp(struct ieee80211_hw *hw, long result[][8],
-                                u8 c1, u8 c2)
+static bool _rtl8723e_phy_simularity_compare(struct ieee80211_hw *hw,
+                                             long result[][8], u8 c1, u8 c2)
 {
         u32 i, j, diff, simularity_bitmap, bound;
 
@@ -1047,11 +1157,11 @@ static bool phy_simularity_comp(struct ieee80211_hw *hw, long result[][8],
 
 }
 
-static void _rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw,
-                                        long result[][8], u8 t, bool is2t)
+static void _rtl8723e_phy_iq_calibrate(struct ieee80211_hw *hw,
+                                       long result[][8], u8 t, bool is2t)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u32 i;
         u8 patha_ok, pathb_ok;
         u32 adda_reg[IQK_ADDA_REG_NUM] = {
@@ -1060,22 +1170,28 @@ static void _rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw,
                 0xe88, 0xe8c, 0xed0, 0xed4,
                 0xed8, 0xedc, 0xee0, 0xeec
         };
+
         u32 iqk_mac_reg[IQK_MAC_REG_NUM] = {
                 0x522, 0x550, 0x551, 0x040
         };
+
         const u32 retrycount = 2;
 
+        u32 bbvalue;
+
         if (t == 0) {
-                rtl8723_save_adda_registers(hw, adda_reg, rtlphy->adda_backup,
-                                            16);
+                bbvalue = rtl_get_bbreg(hw, 0x800, MASKDWORD);
+
+                rtl8723_save_adda_registers(hw, adda_reg,
+                                            rtlphy->adda_backup, 16);
                 rtl8723_phy_save_mac_registers(hw, iqk_mac_reg,
                                                rtlphy->iqk_mac_backup);
         }
         rtl8723_phy_path_adda_on(hw, adda_reg, true, is2t);
         if (t == 0) {
                 rtlphy->rfpi_enable = (u8) rtl_get_bbreg(hw,
-                                                 RFPGA0_XA_HSSIPARAMETER1,
-                                                 BIT(8));
+                                        RFPGA0_XA_HSSIPARAMETER1,
+                                        BIT(8));
         }
 
         if (!rtlphy->rfpi_enable)
@@ -1101,7 +1217,7 @@ static void _rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, 0xe40, MASKDWORD, 0x01007c00);
         rtl_set_bbreg(hw, 0xe44, MASKDWORD, 0x01004800);
         for (i = 0; i < retrycount; i++) {
-                patha_ok = _rtl8723ae_phy_path_a_iqk(hw, is2t);
+                patha_ok = _rtl8723e_phy_path_a_iqk(hw, is2t);
                 if (patha_ok == 0x03) {
                         result[t][0] = (rtl_get_bbreg(hw, 0xe94, MASKDWORD) &
                                         0x3FF0000) >> 16;
@@ -1115,7 +1231,8 @@ static void _rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw,
                 } else if (i == (retrycount - 1) && patha_ok == 0x01)
 
                         result[t][0] = (rtl_get_bbreg(hw, 0xe94,
-                                        MASKDWORD) & 0x3FF0000) >> 16;
+                                                      MASKDWORD) & 0x3FF0000) >>
+                            16;
                 result[t][1] =
                     (rtl_get_bbreg(hw, 0xe9c, MASKDWORD) & 0x3FF0000) >> 16;
 
@@ -1125,11 +1242,12 @@ static void _rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw,
                 rtl8723_phy_path_a_standby(hw);
                 rtl8723_phy_path_adda_on(hw, adda_reg, false, is2t);
                 for (i = 0; i < retrycount; i++) {
-                        pathb_ok = _rtl8723ae_phy_path_b_iqk(hw);
+                        pathb_ok = _rtl8723e_phy_path_b_iqk(hw);
                         if (pathb_ok == 0x03) {
-                                result[t][4] =
-                                    (rtl_get_bbreg(hw, 0xeb4, MASKDWORD) &
-                                     0x3FF0000) >> 16;
+                                result[t][4] = (rtl_get_bbreg(hw,
+                                                              0xeb4,
+                                                              MASKDWORD) &
+                                                0x3FF0000) >> 16;
                                 result[t][5] =
                                     (rtl_get_bbreg(hw, 0xebc, MASKDWORD) &
                                      0x3FF0000) >> 16;
@@ -1141,9 +1259,10 @@ static void _rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw,
                                      0x3FF0000) >> 16;
                                 break;
                         } else if (i == (retrycount - 1) && pathb_ok == 0x01) {
-                                result[t][4] =
-                                    (rtl_get_bbreg(hw, 0xeb4, MASKDWORD) &
-                                     0x3FF0000) >> 16;
+                                result[t][4] = (rtl_get_bbreg(hw,
+                                                              0xeb4,
+                                                              MASKDWORD) &
+                                                0x3FF0000) >> 16;
                         }
                         result[t][5] = (rtl_get_bbreg(hw, 0xebc, MASKDWORD) &
                                         0x3FF0000) >> 16;
@@ -1166,11 +1285,11 @@ static void _rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw,
         }
 }
 
-static void _rtl8723ae_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
+static void _rtl8723e_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmpreg;
         u32 rf_a_mode = 0, rf_b_mode = 0, lc_cal;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         tmpreg = rtl_read_byte(rtlpriv, 0xd03);
 
@@ -1211,14 +1330,14 @@ static void _rtl8723ae_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
         }
 }
 
-static void _rtl8723ae_phy_set_rfpath_switch(struct ieee80211_hw *hw,
-                                             bool bmain, bool is2t)
+static void _rtl8723e_phy_set_rfpath_switch(struct ieee80211_hw *hw,
+                                            bool bmain, bool is2t)
 {
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(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)
@@ -1234,21 +1353,23 @@ static void _rtl8723ae_phy_set_rfpath_switch(struct ieee80211_hw *hw,
                         rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, 0x300, 0x1);
 
         }
+
 }
 
 #undef IQK_ADDA_REG_NUM
 #undef IQK_DELAY_TIME
 
-void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
+void rtl8723e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
         long result[4][8];
         u8 i, final_candidate;
-        bool patha_ok, pathb_ok;
-        long reg_e94, reg_e9c, reg_ea4, reg_eb4, reg_ebc, reg_tmp = 0;
+        bool b_patha_ok, b_pathb_ok;
+        long reg_e94, reg_e9c, reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4,
+            reg_ecc, reg_tmp = 0;
         bool is12simular, is13simular, is23simular;
-        bool start_conttx = false, singletone = false;
         u32 iqk_bb_reg[10] = {
                 ROFDM0_XARXIQIMBALANCE,
                 ROFDM0_XBRXIQIMBALANCE,
@@ -1262,13 +1383,12 @@ void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 ROFDM0_RXIQEXTANTA
         };
 
-        if (recovery) {
-                rtl8723_phy_reload_adda_registers(hw, iqk_bb_reg,
+        if (b_recovery) {
+                rtl8723_phy_reload_adda_registers(hw,
+                                                  iqk_bb_reg,
                                                   rtlphy->iqk_bb_backup, 10);
                 return;
         }
-        if (start_conttx || singletone)
-                return;
         for (i = 0; i < 8; i++) {
                 result[0][i] = 0;
                 result[1][i] = 0;
@@ -1276,30 +1396,33 @@ void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 result[3][i] = 0;
         }
         final_candidate = 0xff;
-        patha_ok = false;
-        pathb_ok = false;
+        b_patha_ok = false;
+        b_pathb_ok = false;
         is12simular = false;
         is23simular = false;
         is13simular = false;
         for (i = 0; i < 3; i++) {
-                _rtl8723ae_phy_iq_calibrate(hw, result, i, false);
+                _rtl8723e_phy_iq_calibrate(hw, result, i, false);
                 if (i == 1) {
-                        is12simular = phy_simularity_comp(hw, result, 0, 1);
+                        is12simular =
+                          _rtl8723e_phy_simularity_compare(hw, result, 0, 1);
                         if (is12simular) {
                                 final_candidate = 0;
                                 break;
                         }
                 }
                 if (i == 2) {
-                        is13simular = phy_simularity_comp(hw, result, 0, 2);
+                        is13simular =
+                          _rtl8723e_phy_simularity_compare(hw, result, 0, 2);
                         if (is13simular) {
                                 final_candidate = 0;
                                 break;
                         }
-                        is23simular = phy_simularity_comp(hw, result, 1, 2);
-                        if (is23simular) {
+                        is23simular =
+                          _rtl8723e_phy_simularity_compare(hw, result, 1, 2);
+                        if (is23simular)
                                 final_candidate = 1;
-                        } else {
+                        else {
                                 for (i = 0; i < 8; i++)
                                         reg_tmp += result[3][i];
 
@@ -1314,50 +1437,54 @@ void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 reg_e94 = result[i][0];
                 reg_e9c = result[i][1];
                 reg_ea4 = result[i][2];
+                reg_eac = result[i][3];
                 reg_eb4 = result[i][4];
                 reg_ebc = result[i][5];
+                reg_ec4 = result[i][6];
+                reg_ecc = result[i][7];
         }
         if (final_candidate != 0xff) {
                 rtlphy->reg_e94 = reg_e94 = result[final_candidate][0];
                 rtlphy->reg_e9c = reg_e9c = result[final_candidate][1];
                 reg_ea4 = result[final_candidate][2];
+                reg_eac = result[final_candidate][3];
                 rtlphy->reg_eb4 = reg_eb4 = result[final_candidate][4];
                 rtlphy->reg_ebc = reg_ebc = result[final_candidate][5];
-                patha_ok = pathb_ok = true;
+                reg_ec4 = result[final_candidate][6];
+                reg_ecc = result[final_candidate][7];
+                b_patha_ok = true;
+                b_pathb_ok = true;
         } else {
                 rtlphy->reg_e94 = rtlphy->reg_eb4 = 0x100;
                 rtlphy->reg_e9c = rtlphy->reg_ebc = 0x0;
         }
-        if (reg_e94 != 0) /*&&(reg_ea4 != 0) */
-                rtl8723_phy_path_a_fill_iqk_matrix(hw, patha_ok, result,
+        if (reg_e94 != 0)
+                rtl8723_phy_path_a_fill_iqk_matrix(hw, b_patha_ok, result,
                                                    final_candidate,
                                                    (reg_ea4 == 0));
-        rtl8723_save_adda_registers(hw, iqk_bb_reg, rtlphy->iqk_bb_backup, 10);
+        rtl8723_save_adda_registers(hw, iqk_bb_reg,
+                                    rtlphy->iqk_bb_backup, 10);
 }
 
-void rtl8723ae_phy_lc_calibrate(struct ieee80211_hw *hw)
+void rtl8723e_phy_lc_calibrate(struct ieee80211_hw *hw)
 {
-        bool start_conttx = false, singletone = false;
-
-        if (start_conttx || singletone)
-                return;
-        _rtl8723ae_phy_lc_calibrate(hw, false);
+        _rtl8723e_phy_lc_calibrate(hw, false);
 }
 
-void rtl8723ae_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain)
+void rtl8723e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain)
 {
-        _rtl8723ae_phy_set_rfpath_switch(hw, bmain, false);
+        _rtl8723e_phy_set_rfpath_switch(hw, bmain, false);
 }
 
-bool rtl8723ae_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
+bool rtl8723e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         bool postprocessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                  "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
-                 iotype, rtlphy->set_io_inprogress);
+                  iotype, rtlphy->set_io_inprogress);
         do {
                 switch (iotype) {
                 case IO_CMD_RESUME_DM_BY_SCAN:
@@ -1365,13 +1492,13 @@ bool rtl8723ae_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                                  "[IO CMD] Resume DM after scan.\n");
                         postprocessing = true;
                         break;
-                case IO_CMD_PAUSE_DM_BY_SCAN:
+                case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                                  "[IO CMD] Pause DM before scan.\n");
                         postprocessing = true;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                                  "switch case not process\n");
                         break;
                 }
@@ -1382,42 +1509,42 @@ bool rtl8723ae_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
         } else {
                 return false;
         }
-        rtl8723ae_phy_set_io(hw);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<--IO Type(%#x)\n", iotype);
+        rtl8723e_phy_set_io(hw);
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
         return true;
 }
 
-static void rtl8723ae_phy_set_io(struct ieee80211_hw *hw)
+static void rtl8723e_phy_set_io(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                  "--->Cmd(%#x), set_io_inprogress(%d)\n",
-                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
+                  rtlphy->current_io_type, rtlphy->set_io_inprogress);
         switch (rtlphy->current_io_type) {
         case IO_CMD_RESUME_DM_BY_SCAN:
                 dm_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
-                rtl8723ae_dm_write_dig(hw);
-                rtl8723ae_phy_set_txpower_level(hw, rtlphy->current_channel);
+                rtl8723e_dm_write_dig(hw);
+                rtl8723e_phy_set_txpower_level(hw, rtlphy->current_channel);
                 break;
-        case IO_CMD_PAUSE_DM_BY_SCAN:
+        case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
                 rtlphy->initgain_backup.xaagccore1 = dm_digtable->cur_igvalue;
                 dm_digtable->cur_igvalue = 0x17;
-                rtl8723ae_dm_write_dig(hw);
+                rtl8723e_dm_write_dig(hw);
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                          "switch case not process\n");
                 break;
         }
         rtlphy->set_io_inprogress = false;
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 "<---(%#x)\n", rtlphy->current_io_type);
+                 "(%#x)\n", rtlphy->current_io_type);
 }
 
-static void rtl8723ae_phy_set_rf_on(struct ieee80211_hw *hw)
+static void rtl8723e_phy_set_rf_on(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
@@ -1429,11 +1556,11 @@ static void rtl8723ae_phy_set_rf_on(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
 }
 
-static void _rtl8723ae_phy_set_rf_sleep(struct ieee80211_hw *hw)
+static void _rtl8723e_phy_set_rf_sleep(struct ieee80211_hw *hw)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 u4b_tmp;
         u8 delay = 5;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
         rtl_set_rfreg(hw, RF90_PATH_A, 0x00, RFREG_OFFSET_MASK, 0x00);
@@ -1459,45 +1586,47 @@ static void _rtl8723ae_phy_set_rf_sleep(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_SPS0_CTRL, 0x22);
 }
 
-static bool _rtl8723ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
-                                              enum rf_pwrstate rfpwr_state)
+static bool _rtl8723e_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                             enum rf_pwrstate rfpwr_state)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        struct rtl8192_tx_ring *ring = NULL;
         bool bresult = true;
         u8 i, queue_id;
+        struct rtl8192_tx_ring *ring = NULL;
 
         switch (rfpwr_state) {
         case ERFON:
                 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 != true) && (InitializeCount < 10));
+                        } while (!rtstatus && (initializecount < 10));
                         RT_CLEAR_PS_LEVEL(ppsc,
                                           RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                  "Set ERFON sleeped:%d ms\n",
-                                 jiffies_to_msecs(jiffies -
-                                 ppsc->last_sleep_jiffies));
+                                  jiffies_to_msecs(jiffies -
+                                                   ppsc->
+                                                   last_sleep_jiffies));
                         ppsc->last_awake_jiffies = jiffies;
-                        rtl8723ae_phy_set_rf_on(hw);
+                        rtl8723e_phy_set_rf_on(hw);
                 }
                 if (mac->link_state == MAC80211_LINKED) {
                         rtlpriv->cfg->ops->led_control(hw,
-                                        LED_CTL_LINK);
+                                                       LED_CTL_LINK);
                 } else {
                         rtlpriv->cfg->ops->led_control(hw,
-                                        LED_CTL_NO_LINK);
+                                                       LED_CTL_NO_LINK);
                 }
                 break;
         case ERFOFF:
@@ -1509,10 +1638,10 @@ static bool _rtl8723ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 } else {
                         if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS) {
                                 rtlpriv->cfg->ops->led_control(hw,
-                                        LED_CTL_NO_LINK);
+                                                LED_CTL_NO_LINK);
                         } else {
                                 rtlpriv->cfg->ops->led_control(hw,
-                                        LED_CTL_POWER_OFF);
+                                                LED_CTL_POWER_OFF);
                         }
                 }
                 break;
@@ -1522,7 +1651,8 @@ static bool _rtl8723ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 for (queue_id = 0, i = 0;
                      queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
                         ring = &pcipriv->dev.tx_ring[queue_id];
-                        if (skb_queue_len(&ring->queue) == 0) {
+                        if (queue_id == BEACON_QUEUE ||
+                            skb_queue_len(&ring->queue) == 0) {
                                 queue_id++;
                                 continue;
                         } else {
@@ -1536,22 +1666,23 @@ static bool _rtl8723ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
                         }
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
-                                         MAX_DOZE_WAITING_TIMES_9x,
-                                         queue_id,
-                                         skb_queue_len(&ring->queue));
+                                         "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                          MAX_DOZE_WAITING_TIMES_9x,
+                                          queue_id,
+                                          skb_queue_len(&ring->queue));
                                 break;
                         }
                 }
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          "Set ERFSLEEP awaked:%d ms\n",
-                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));
+                          jiffies_to_msecs(jiffies -
+                                           ppsc->last_awake_jiffies));
                 ppsc->last_sleep_jiffies = jiffies;
-                _rtl8723ae_phy_set_rf_sleep(hw);
+                _rtl8723e_phy_set_rf_sleep(hw);
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
                 bresult = false;
                 break;
         }
@@ -1560,14 +1691,15 @@ static bool _rtl8723ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
         return bresult;
 }
 
-bool rtl8723ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
-                                      enum rf_pwrstate rfpwr_state)
+bool rtl8723e_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                     enum rf_pwrstate rfpwr_state)
 {
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+
         bool bresult = false;
 
         if (rfpwr_state == ppsc->rfpwr_state)
                 return bresult;
-        bresult = _rtl8723ae_phy_set_rf_power_state(hw, rfpwr_state);
+        bresult = _rtl8723e_phy_set_rf_power_state(hw, rfpwr_state);
         return bresult;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.h b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.h
index cd43139ed332..b85f5c7c5c01 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -39,6 +35,7 @@
 #define RT_CANNOT_IO(hw)                        false
 #define HIGHPOWER_RADIOA_ARRAYLEN               22
 
+#define IQK_ADDA_REG_NUM                        16
 #define MAX_TOLERANCE                           5
 #define IQK_DELAY_TIME                          1
 
@@ -49,12 +46,15 @@
 
 #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 IQK_ADDA_REG_NUM                        16
 #define IQK_MAC_REG_NUM                         4
 
+#define IQK_DELAY_TIME                          1
+
 #define RF6052_MAX_PATH                         2
 
 #define CT_OFFSET_MAC_ADDR                      0X16
@@ -166,36 +166,37 @@ struct tx_power_struct {
         u32 mcs_original_offset[4][16];
 };
 
-u32 rtl8723ae_phy_query_rf_reg(struct ieee80211_hw *hw,
-                               enum radio_path rfpath, u32 regaddr,
-                               u32 bitmask);
-void rtl8723ae_phy_set_rf_reg(struct ieee80211_hw *hw,
+u32 rtl8723e_phy_query_rf_reg(struct ieee80211_hw *hw,
                               enum radio_path rfpath, u32 regaddr,
-                              u32 bitmask, u32 data);
-bool rtl8723ae_phy_mac_config(struct ieee80211_hw *hw);
-bool rtl8723ae_phy_bb_config(struct ieee80211_hw *hw);
-bool rtl8723ae_phy_rf_config(struct ieee80211_hw *hw);
+                              u32 bitmask);
+void rtl8723e_phy_set_rf_reg(struct ieee80211_hw *hw,
+                             enum radio_path rfpath, u32 regaddr,
+                             u32 bitmask, u32 data);
+bool rtl8723e_phy_mac_config(struct ieee80211_hw *hw);
+bool rtl8723e_phy_bb_config(struct ieee80211_hw *hw);
+bool rtl8723e_phy_rf_config(struct ieee80211_hw *hw);
 bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw,
                                           enum radio_path rfpath);
-void rtl8723ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw);
-void rtl8723ae_phy_get_txpower_level(struct ieee80211_hw *hw,
-                                     long *powerlevel);
-void rtl8723ae_phy_set_txpower_level(struct ieee80211_hw *hw,
-                                     u8 channel);
-bool rtl8723ae_phy_update_txpower_dbm(struct ieee80211_hw *hw,
-                                      long power_indbm);
-void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
-void rtl8723ae_phy_set_bw_mode(struct ieee80211_hw *hw,
-                               enum nl80211_channel_type ch_type);
-void rtl8723ae_phy_sw_chnl_callback(struct ieee80211_hw *hw);
-u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw);
-void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery);
-void rtl8723ae_phy_lc_calibrate(struct ieee80211_hw *hw);
-void rtl8723ae_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain);
-bool rtl8723ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
-                                             enum radio_path rfpath);
-bool rtl8723ae_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype);
-bool rtl8723ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
-                                      enum rf_pwrstate rfpwr_state);
+void rtl8723e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw);
+void rtl8723e_phy_get_txpower_level(struct ieee80211_hw *hw,
+                                    long *powerlevel);
+void rtl8723e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel);
+bool rtl8723e_phy_update_txpower_dbm(struct ieee80211_hw *hw,
+                                     long power_indbm);
+void rtl8723e_phy_scan_operation_backup(struct ieee80211_hw *hw,
+                                        u8 operation);
+void rtl8723e_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
+void rtl8723e_phy_set_bw_mode(struct ieee80211_hw *hw,
+                              enum nl80211_channel_type ch_type);
+void rtl8723e_phy_sw_chnl_callback(struct ieee80211_hw *hw);
+u8 rtl8723e_phy_sw_chnl(struct ieee80211_hw *hw);
+void rtl8723e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery);
+void rtl8723e_phy_lc_calibrate(struct ieee80211_hw *hw);
+void rtl8723e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain);
+bool rtl8723e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                            enum radio_path rfpath);
+bool rtl8723e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype);
+bool rtl8723e_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                     enum rf_pwrstate rfpwr_state);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.c b/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.c
index df6ca9a57f7f..2f7f81af8a55 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -27,83 +23,90 @@
  *
  *****************************************************************************/
 
-#include "pwrseqcmd.h"
+#include "../pwrseqcmd.h"
 #include "pwrseq.h"
 
-/* drivers should parse arrays below and do the corresponding actions */
-
+/* drivers should parse below arrays and do the corresponding actions */
 /*3 Power on  Array*/
-struct wlan_pwr_cfg rtl8723A_power_on_flow[RTL8723A_TRANS_CARDEMU_TO_ACT_STPS
-                                        + RTL8723A_TRANS_END_STPS] = {
-        RTL8723A_TRANS_CARDEMU_TO_ACT,
+struct wlan_pwr_cfg rtl8723A_power_on_flow
+                [RTL8723A_TRANS_CARDEMU_TO_ACT_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
+        RTL8723A_TRANS_CARDEMU_TO_ACT
         RTL8723A_TRANS_END
 };
 
 /*3Radio off GPIO Array */
-struct wlan_pwr_cfg rtl8723A_radio_off_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                        + RTL8723A_TRANS_END_STPS] = {
-        RTL8723A_TRANS_ACT_TO_CARDEMU,
+struct wlan_pwr_cfg rtl8723A_radio_off_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
+        RTL8723A_TRANS_ACT_TO_CARDEMU
         RTL8723A_TRANS_END
 };
 
 /*3Card Disable Array*/
-struct wlan_pwr_cfg
-rtl8723A_card_disable_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                          + RTL8723A_TRANS_CARDEMU_TO_PDN_STPS
-                          + RTL8723A_TRANS_END_STPS] = {
-        RTL8723A_TRANS_ACT_TO_CARDEMU,
-        RTL8723A_TRANS_CARDEMU_TO_CARDDIS,
+struct wlan_pwr_cfg rtl8723A_card_disable_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
+        RTL8723A_TRANS_ACT_TO_CARDEMU
+        RTL8723A_TRANS_CARDEMU_TO_CARDDIS
         RTL8723A_TRANS_END
 };
 
 /*3 Card Enable Array*/
-struct wlan_pwr_cfg rtl8723A_card_enable_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                        + RTL8723A_TRANS_CARDEMU_TO_PDN_STPS
-                                        + RTL8723A_TRANS_END_STPS] = {
-        RTL8723A_TRANS_CARDDIS_TO_CARDEMU,
-        RTL8723A_TRANS_CARDEMU_TO_ACT,
+struct wlan_pwr_cfg rtl8723A_card_enable_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
+        RTL8723A_TRANS_CARDDIS_TO_CARDEMU
+        RTL8723A_TRANS_CARDEMU_TO_ACT
         RTL8723A_TRANS_END
 };
 
 /*3Suspend Array*/
-struct wlan_pwr_cfg rtl8723A_suspend_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                        + RTL8723A_TRANS_CARDEMU_TO_SUS_STPS
-                                        + RTL8723A_TRANS_END_STPS] = {
-        RTL8723A_TRANS_ACT_TO_CARDEMU,
-        RTL8723A_TRANS_CARDEMU_TO_SUS,
+struct wlan_pwr_cfg rtl8723A_suspend_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
+        RTL8723A_TRANS_ACT_TO_CARDEMU
+        RTL8723A_TRANS_CARDEMU_TO_SUS
         RTL8723A_TRANS_END
 };
 
 /*3 Resume Array*/
-struct wlan_pwr_cfg rtl8723A_resume_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                        + RTL8723A_TRANS_CARDEMU_TO_SUS_STPS
-                                        + RTL8723A_TRANS_END_STPS] = {
-        RTL8723A_TRANS_SUS_TO_CARDEMU,
-        RTL8723A_TRANS_CARDEMU_TO_ACT,
+struct wlan_pwr_cfg rtl8723A_resume_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
+        RTL8723A_TRANS_SUS_TO_CARDEMU
+        RTL8723A_TRANS_CARDEMU_TO_ACT
         RTL8723A_TRANS_END
 };
 
 /*3HWPDN Array*/
-struct wlan_pwr_cfg rtl8723A_hwpdn_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                + RTL8723A_TRANS_CARDEMU_TO_PDN_STPS
-                                + RTL8723A_TRANS_END_STPS] = {
-        RTL8723A_TRANS_ACT_TO_CARDEMU,
-        RTL8723A_TRANS_CARDEMU_TO_PDN,
+struct wlan_pwr_cfg rtl8723A_hwpdn_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
+        RTL8723A_TRANS_ACT_TO_CARDEMU
+        RTL8723A_TRANS_CARDEMU_TO_PDN
         RTL8723A_TRANS_END
 };
 
 /*3 Enter LPS */
-struct wlan_pwr_cfg rtl8723A_enter_lps_flow[RTL8723A_TRANS_ACT_TO_LPS_STPS
-                                        + RTL8723A_TRANS_END_STPS] = {
+struct wlan_pwr_cfg rtl8723A_enter_lps_flow
+                [RTL8723A_TRANS_ACT_TO_LPS_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
         /*FW behavior*/
-        RTL8723A_TRANS_ACT_TO_LPS,
+        RTL8723A_TRANS_ACT_TO_LPS
         RTL8723A_TRANS_END
 };
 
 /*3 Leave LPS */
-struct wlan_pwr_cfg rtl8723A_leave_lps_flow[RTL8723A_TRANS_LPS_TO_ACT_STPS
-                                        + RTL8723A_TRANS_END_STPS] = {
+struct wlan_pwr_cfg rtl8723A_leave_lps_flow
+                [RTL8723A_TRANS_LPS_TO_ACT_STEPS +
+                 RTL8723A_TRANS_END_STEPS] = {
         /*FW behavior*/
-        RTL8723A_TRANS_LPS_TO_ACT,
+        RTL8723A_TRANS_LPS_TO_ACT
         RTL8723A_TRANS_END
 };
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h b/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h
index a418acb4d0ca..4ac7db526f15 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,282 +26,305 @@
 #ifndef __RTL8723E_PWRSEQ_H__
 #define __RTL8723E_PWRSEQ_H__
 
+#include "../pwrseqcmd.h"
 /*
-        Check document WM-20110607-Paul-RTL8723A_Power_Architecture-R02.vsd
-        There are 6 HW Power States:
-        0: POFF--Power Off
-        1: PDN--Power Down
-        2: CARDEMU--Card Emulation
-        3: ACT--Active Mode
-        4: LPS--Low Power State
-        5: SUS--Suspend
-
-        The transision from different states are defined below
-        TRANS_CARDEMU_TO_ACT
-        TRANS_ACT_TO_CARDEMU
-        TRANS_CARDEMU_TO_SUS
-        TRANS_SUS_TO_CARDEMU
-        TRANS_CARDEMU_TO_PDN
-        TRANS_ACT_TO_LPS
-        TRANS_LPS_TO_ACT
+ *      Check document WM-20110607-Paul-RTL8723A_Power_Architecture-R02.vsd
+ *      There are 6 HW Power States:
+ *      0: POFF--Power Off
+ *      1: PDN--Power Down
+ *      2: CARDEMU--Card Emulation
+ *      3: ACT--Active Mode
+ *      4: LPS--Low Power State
+ *      5: SUS--Suspend
+ *
+ *      The transision from different states are defined below
+ *      TRANS_CARDEMU_TO_ACT
+ *      TRANS_ACT_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_SUS
+ *      TRANS_SUS_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_PDN
+ *      TRANS_ACT_TO_LPS
+ *      TRANS_LPS_TO_ACT
+ *
+ *      TRANS_END
+ */
 
-        TRANS_END
-*/
+#define RTL8723A_TRANS_CARDEMU_TO_ACT_STEPS     10
+#define RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS     10
+#define RTL8723A_TRANS_CARDEMU_TO_SUS_STEPS     10
+#define RTL8723A_TRANS_SUS_TO_CARDEMU_STEPS     10
+#define RTL8723A_TRANS_CARDEMU_TO_PDN_STEPS     10
+#define RTL8723A_TRANS_PDN_TO_CARDEMU_STEPS     10
+#define RTL8723A_TRANS_ACT_TO_LPS_STEPS         15
+#define RTL8723A_TRANS_LPS_TO_ACT_STEPS         15
+#define RTL8723A_TRANS_END_STEPS                1
 
-#define RTL8723A_TRANS_CARDEMU_TO_ACT_STPS      10
-#define RTL8723A_TRANS_ACT_TO_CARDEMU_STPS      10
-#define RTL8723A_TRANS_CARDEMU_TO_SUS_STPS      10
-#define RTL8723A_TRANS_SUS_TO_CARDEMU_STPS      10
-#define RTL8723A_TRANS_CARDEMU_TO_PDN_STPS      10
-#define RTL8723A_TRANS_PDN_TO_CARDEMU_STPS      10
-#define RTL8723A_TRANS_ACT_TO_LPS_STPS          15
-#define RTL8723A_TRANS_LPS_TO_ACT_STPS          15
-#define RTL8723A_TRANS_END_STPS                 1
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }*/
 
+#define RTL8723A_TRANS_CARDEMU_TO_ACT   \
+        /* disable SW LPS 0x04[10]=0*/  \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(2), 0},\
+        /* wait till 0x04[17] = 1    power ready*/      \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), BIT(1)},\
+        /* release WLON reset  0x04[16]=1*/     \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},\
+        /* disable HWPDN 0x04[15]=0*/ \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},\
+        /* disable WL suspend*/ \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, (BIT(4)|BIT(3)), 0},\
+        /* polling until return 0*/ \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},\
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(0), 0},
 
-#define RTL8723A_TRANS_CARDEMU_TO_ACT                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, \
-         *  comments here*/                                             \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(2), 0},            \
-                /* disable SW LPS 0x04[10]=0*/                          \
-        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), BIT(1)},     \
-                /* wait till 0x04[17] = 1    power ready*/              \
-        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},       \
-                /* release WLON reset  0x04[16]=1*/                     \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},            \
-                /* disable HWPDN 0x04[15]=0*/                           \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, (BIT(4)|BIT(3)), 0},   \
-        /* disable WL suspend*/                                         \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},       \
-                /* polling until return 0*/                             \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(0), 0}
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */
 
-#define RTL8723A_TRANS_ACT_TO_CARDEMU                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, \
-         *  comments here*/                                             \
-        {0x001F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},              \
-                /*0x1F[7:0] = 0 turn off RF*/                           \
-        {0x004E, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},            \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},       \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), 0}
+#define RTL8723A_TRANS_ACT_TO_CARDEMU   \
+        /*0x1F[7:0] = 0 turn off RF*/ \
+        {0x001F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},      \
+        {0x004E, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},\
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)}, \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), 0},
 
-#define RTL8723A_TRANS_CARDEMU_TO_SUS                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, \
-         *  comments here*/                                             \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4)|BIT(3),         \
-                (BIT(4)|BIT(3))},                                       \
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/
+#define RTL8723A_TRANS_CARDEMU_TO_SUS                   \
                 /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/      \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK |   \
-                PWR_INTF_SDIO_MSK,                                      \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},\
-                 /*0x04[12:11] = 2b'01 enable WL suspend*/              \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
-                PWR_BASEADDR_MAC,                                       \
-                PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)|BIT(4)},           \
-                 /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/     \
-        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                PWR_BASEADDR_SDIO,                                      \
-                PWR_CMD_WRITE, BIT(0), BIT(0)},                         \
-                /*Set SDIO suspend local register*/                     \
-        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                PWR_BASEADDR_SDIO,                                      \
-                PWR_CMD_POLLING, BIT(1), 0}                             \
-                /*wait power state to suspend*/
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, \
+                BIT(4)|BIT(3), (BIT(4)|BIT(3))},\
+/*0x04[12:11] = 2b'01 enable WL suspend*/       \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK| \
+                PWR_INTF_SDIO_MSK,\
+                PWR_BASEADDR_MAC, \
+                PWR_CMD_WRITE, \
+                BIT(3)|BIT(4), BIT(3)}, \
+/*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/ \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_PCI_MSK, PWR_BASEADDR_MAC, \
+                PWR_CMD_WRITE, BIT(3)|BIT(4), \
+                BIT(3)|BIT(4)}, \
+/*Set SDIO suspend local register*/     \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_SDIO_MSK, PWR_BASEADDR_SDIO,\
+                PWR_CMD_WRITE, BIT(0), BIT(0)}, \
+/*wait power state to suspend*/ \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_SDIO_MSK, PWR_BASEADDR_SDIO,\
+                PWR_CMD_POLLING, BIT(1), 0},
+
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */
+
+#define RTL8723A_TRANS_SUS_TO_CARDEMU   \
+ /*Set SDIO suspend local register*/    \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+                PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0},\
+ /*wait power state to suspend*/ \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+                PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)},\
+ /*0x04[12:11] = 2b'01enable WL suspend*/ \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0},
+
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */
+
+#define RTL8723A_TRANS_CARDEMU_TO_CARDDIS \
+ /*0x04[12:11] = 2b'01 enable WL suspend*/       \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK, \
+                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)}, \
+/*0x04[10] = 1, enable SW LPS*/ \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_PCI_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(2), BIT(2)}, \
+/*Set SDIO suspend local register*/ \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_SDIO_MSK, PWR_BASEADDR_SDIO,\
+                PWR_CMD_WRITE, BIT(0), BIT(0)}, \
+ /*wait power state to suspend*/ \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_SDIO_MSK, PWR_BASEADDR_SDIO,\
+                PWR_CMD_POLLING, BIT(1), 0},
+
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */
 
-#define RTL8723A_TRANS_SUS_TO_CARDEMU                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
-        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0},           \
-                /*Set SDIO suspend local register*/                     \
-        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)},    \
-                /*wait power state to suspend*/                         \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0}      \
-                /*0x04[12:11] = 2b'01enable WL suspend*/
+#define RTL8723A_TRANS_CARDDIS_TO_CARDEMU\
+/*Set SDIO suspend local register*/     \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_SDIO_MSK, PWR_BASEADDR_SDIO,\
+                PWR_CMD_WRITE, BIT(0), 0}, \
+ /*wait power state to suspend*/ \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_SDIO_MSK, PWR_BASEADDR_SDIO,\
+                PWR_CMD_POLLING, BIT(1), BIT(1)},\
+ /*0x04[12:11] = 2b'00enable WL suspend*/ \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(3)|BIT(4), 0},\
+/*PCIe DMA start*/ \
+        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, 0xFF, 0},
 
-#define RTL8723A_TRANS_CARDEMU_TO_CARDDIS                               \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
-        PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,                             \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},\
-                /*0x04[12:11] = 2b'01 enable WL suspend*/               \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(2), BIT(2)},       \
-                /*0x04[10] = 1, enable SW LPS*/                         \
-        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)},      \
-                /*Set SDIO suspend local register*/                     \
-        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), 0}          \
-                /*wait power state to suspend*/
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */
+#define RTL8723A_TRANS_CARDEMU_TO_PDN   \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(0), 0},/* 0x04[16] = 0*/\
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(7), BIT(7)},/* 0x04[15] = 1*/
 
-#define RTL8723A_TRANS_CARDDIS_TO_CARDEMU                               \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
-        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0},           \
-                /*Set SDIO suspend local register*/                     \
-        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)},    \
-                /*wait power state to suspend*/                         \
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0},     \
-                /*0x04[12:11] = 2b'00enable WL suspend*/                \
-        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0}               \
-                /*PCIe DMA start*/
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */
+#define RTL8723A_TRANS_PDN_TO_CARDEMU   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(7), 0},/* 0x04[15] = 0*/
 
-#define RTL8723A_TRANS_CARDEMU_TO_PDN                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
-        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},            \
-                /* 0x04[16] = 0*/\
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)}        \
-                /* 0x04[15] = 1*/
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */
 
-#define RTL8723A_TRANS_PDN_TO_CARDEMU                                   \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
-        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0}             \
-                /* 0x04[15] = 0*/
+#define RTL8723A_TRANS_ACT_TO_LPS       \
+        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, 0xFF, 0xFF},/*PCIe DMA stop*/    \
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, 0xFF, 0x7F},/*Tx Pause*/ \
+        /*Should be zero if no packet is transmitting*/ \
+        {0x05F8, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_POLLING, 0xFF, 0},\
+        /*Should be zero if no packet is transmitting*/ \
+        {0x05F9, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_POLLING, 0xFF, 0},\
+        /*Should be zero if no packet is transmitting*/ \
+        {0x05FA, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_POLLING, 0xFF, 0},\
+        /*Should be zero if no packet is transmitting*/ \
+        {0x05FB, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_POLLING, 0xFF, 0},\
+        /*CCK and OFDM are disabled,and clock are gated*/ \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(0), 0},\
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US},/*Delay 1us*/\
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(1), 0},/*Whole BB is reset*/ \
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, 0xFF, 0x3F},/*Reset MAC TRX*/    \
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(1), 0},/*check if removed later*/    \
+        /*Respond TxOK to scheduler*/   \
+        {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(5), BIT(5)},\
 
-#define RTL8723A_TRANS_ACT_TO_LPS                                       \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
-        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF},           \
-                /*PCIe DMA stop*/                                       \
-        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x7F},           \
-                /*Tx Pause*/                                            \
-        {0x05F8, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},            \
-                /*Should be zero if no packet is transmitting*/         \
-        {0x05F9, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},            \
-                /*Should be zero if no packet is transmitting*/         \
-        {0x05FA, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},            \
-                /*Should be zero if no packet is transmitting*/         \
-        {0x05FB, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},            \
-                /*Should be zero if no packet is transmitting*/         \
-        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},            \
-                /*CCK and OFDM are disabled,and clock are gated*/       \
-        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US},   \
-                /*Delay 1us*/                                           \
-        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0},            \
-                /*Whole BB is reset*/                                   \
-        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x3F},           \
-                /*Reset MAC TRX*/                                       \
-        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0},            \
-                /*check if removed later*/                              \
-        {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(5), BIT(5)}        \
-                /*Respond TxOK to scheduler*/
+#define RTL8723A_TRANS_LPS_TO_ACT\
+/* format */    \
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */ \
+        {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_SDIO_MSK, PWR_BASEADDR_SDIO,\
+                PWR_CMD_WRITE, 0xFF, 0x84}, /*SDIO RPWM*/\
+        {0xFE58, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_USB_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, 0xFF, 0x84}, /*USB RPWM*/\
+        {0x0361, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_PCI_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, 0xFF, 0x84}, /*PCIe RPWM*/\
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS}, /*Delay*/\
+        /*.     0x08[4] = 0              switch TSF to 40M*/\
+        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(4), 0},  \
+        /*Polling 0x109[7]=0  TSF in 40M*/\
+        {0x0109, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_POLLING, BIT(7), 0}, \
+        /*.     0x29[7:6] = 2b'00        enable BB clock*/\
+        {0x0029, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(6)|BIT(7), 0},\
+         /*.    0x101[1] = 1*/\
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(1), BIT(1)},\
+         /*.    0x100[7:0] = 0xFF        enable WMAC TRX*/\
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, 0xFF, 0xFF},\
+         /*.    0x02[1:0] = 2b'11        enable BB macro*/\
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, BIT(1)|BIT(0), BIT(1)|BIT(0)},\
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
+                PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
+                PWR_CMD_WRITE, 0xFF, 0}, /*.    0x522 = 0*/
 
-#define RTL8723A_TRANS_LPS_TO_ACT                                       \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
-        {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-                 PWR_BASEADDR_SDIO, PWR_CMD_WRITE, 0xFF, 0x84},         \
-                 /*SDIO RPWM*/                                          \
-        {0xFE58, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84},           \
-                /*USB RPWM*/                                            \
-        {0x0361, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84},           \
-                /*PCIe RPWM*/                                           \
-        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                 PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS},  \
-                /*Delay*/                                               \
-        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},            \
-                /* 0x08[4] = 0 switch TSF to 40M*/                      \
-        {0x0109, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(7), 0},          \
-                /*Polling 0x109[7]=0  TSF in 40M*/                      \
-        {0x0029, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(6)|BIT(7), 0},     \
-                /*.     0x29[7:6] = 2b'00        enable BB clock*/      \
-        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},       \
-                /*.     0x101[1] = 1*/                                  \
-        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF},           \
-                /* 0x100[7:0] = 0xFF enable WMAC TRX*/                  \
-        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1)|BIT(0),         \
-                BIT(1)|BIT(0)},                                         \
-                /* 0x02[1:0] = 2b'11  enable BB macro*/                 \
-        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-                PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0}               \
-                /*.     0x522 = 0*/
+/* format */
+/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */
 
-#define RTL8723A_TRANS_END                                              \
-        /* format */                                                    \
-        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
-        {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
+#define RTL8723A_TRANS_END \
+        {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
         0, PWR_CMD_END, 0, 0}
 
-extern struct
-wlan_pwr_cfg rtl8723A_power_on_flow[RTL8723A_TRANS_CARDEMU_TO_ACT_STPS
-                                    + RTL8723A_TRANS_END_STPS];
-extern struct
-wlan_pwr_cfg rtl8723A_radio_off_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                     + RTL8723A_TRANS_END_STPS];
-extern struct
-wlan_pwr_cfg rtl8723A_card_disable_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                        + RTL8723A_TRANS_CARDEMU_TO_PDN_STPS
-                                        + RTL8723A_TRANS_END_STPS];
-extern struct
-wlan_pwr_cfg rtl8723A_card_enable_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                       + RTL8723A_TRANS_CARDEMU_TO_PDN_STPS
-                                       + RTL8723A_TRANS_END_STPS];
-extern struct
-wlan_pwr_cfg rtl8723A_suspend_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                   + RTL8723A_TRANS_CARDEMU_TO_SUS_STPS
-                                   + RTL8723A_TRANS_END_STPS];
-extern struct
-wlan_pwr_cfg rtl8723A_resume_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                  + RTL8723A_TRANS_CARDEMU_TO_SUS_STPS
-                                  + RTL8723A_TRANS_END_STPS];
-extern struct
-wlan_pwr_cfg rtl8723A_hwpdn_flow[RTL8723A_TRANS_ACT_TO_CARDEMU_STPS
-                                 + RTL8723A_TRANS_CARDEMU_TO_PDN_STPS
-                                 + RTL8723A_TRANS_END_STPS];
-extern struct
-wlan_pwr_cfg rtl8723A_enter_lps_flow[RTL8723A_TRANS_ACT_TO_LPS_STPS
-                                     + RTL8723A_TRANS_END_STPS];
-extern struct
-wlan_pwr_cfg rtl8723A_leave_lps_flow[RTL8723A_TRANS_LPS_TO_ACT_STPS
-                                     + RTL8723A_TRANS_END_STPS];
+extern struct wlan_pwr_cfg rtl8723A_power_on_flow
+                [RTL8723A_TRANS_CARDEMU_TO_ACT_STEPS +
+                 RTL8723A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8723A_radio_off_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8723A_card_disable_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8723A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8723A_card_enable_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8723A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8723A_suspend_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8723A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8723A_resume_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8723A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8723A_hwpdn_flow
+                [RTL8723A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8723A_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8723A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8723A_enter_lps_flow
+                [RTL8723A_TRANS_ACT_TO_LPS_STEPS + RTL8723A_TRANS_END_STEPS];
+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
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c b/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c
deleted file mode 100644
index 2044b5936b7f..000000000000
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/******************************************************************************
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * 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>
- *
- *****************************************************************************/
-
-#include "pwrseq.h"
-
-/*      Description:
- *              This routine deals with the Power Configuration CMD
- *               parsing for RTL8723/RTL8188E Series IC.
- *      Assumption:
- *              We should follow specific format that was released from HW SD.
- */
-bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
-                              u8 faversion, u8 interface_type,
-                              struct wlan_pwr_cfg pwrcfgcmd[])
-{
-        struct wlan_pwr_cfg cfg_cmd = {0};
-        bool polling_bit = false;
-        u32 ary_idx = 0;
-        u8 value = 0;
-        u32 offset = 0;
-        u32 polling_count = 0;
-        u32 max_polling_cnt = 5000;
-
-        do {
-                cfg_cmd = pwrcfgcmd[ary_idx];
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "rtl_hal_pwrseqcmdparsing(): offset(%#x),cut_msk(%#x), famsk(%#x),"
-                        "interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), value(%#x)\n",
-                        GET_PWR_CFG_OFFSET(cfg_cmd),
-                                           GET_PWR_CFG_CUT_MASK(cfg_cmd),
-                        GET_PWR_CFG_FAB_MASK(cfg_cmd),
-                                             GET_PWR_CFG_INTF_MASK(cfg_cmd),
-                        GET_PWR_CFG_BASE(cfg_cmd), GET_PWR_CFG_CMD(cfg_cmd),
-                        GET_PWR_CFG_MASK(cfg_cmd), GET_PWR_CFG_VALUE(cfg_cmd));
-
-                if ((GET_PWR_CFG_FAB_MASK(cfg_cmd)&faversion) &&
-                    (GET_PWR_CFG_CUT_MASK(cfg_cmd)&cut_version) &&
-                    (GET_PWR_CFG_INTF_MASK(cfg_cmd)&interface_type)) {
-                        switch (GET_PWR_CFG_CMD(cfg_cmd)) {
-                        case PWR_CMD_READ:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_READ\n");
-                                break;
-                        case PWR_CMD_WRITE:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_WRITE\n");
-                                offset = GET_PWR_CFG_OFFSET(cfg_cmd);
-
-                                /*Read the value from system register*/
-                                value = rtl_read_byte(rtlpriv, offset);
-                                value &= (~(GET_PWR_CFG_MASK(cfg_cmd)));
-                                value |= (GET_PWR_CFG_VALUE(cfg_cmd) &
-                                          GET_PWR_CFG_MASK(cfg_cmd));
-
-                                /*Write the value back to sytem register*/
-                                rtl_write_byte(rtlpriv, offset, value);
-                                break;
-                        case PWR_CMD_POLLING:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_POLLING\n");
-                                polling_bit = false;
-                                offset = GET_PWR_CFG_OFFSET(cfg_cmd);
-
-                                do {
-                                        value = rtl_read_byte(rtlpriv, offset);
-
-                                        value &= GET_PWR_CFG_MASK(cfg_cmd);
-                                        if (value ==
-                                            (GET_PWR_CFG_VALUE(cfg_cmd)
-                                            & GET_PWR_CFG_MASK(cfg_cmd)))
-                                                polling_bit = true;
-                                        else
-                                                udelay(10);
-
-                                        if (polling_count++ > max_polling_cnt)
-                                                return false;
-                                } while (!polling_bit);
-                                break;
-                        case PWR_CMD_DELAY:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "rtl_hal_pwrseqcmdparsing(): PWR_CMD_DELAY\n");
-                                if (GET_PWR_CFG_VALUE(cfg_cmd) ==
-                                    PWRSEQ_DELAY_US)
-                                        udelay(GET_PWR_CFG_OFFSET(cfg_cmd));
-                                else
-                                        mdelay(GET_PWR_CFG_OFFSET(cfg_cmd));
-                                break;
-                        case PWR_CMD_END:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtl_hal_pwrseqcmdparsing(): PWR_CMD_END\n");
-                                return true;
-                        default:
-                                RT_ASSERT(false,
-                                         "rtl_hal_pwrseqcmdparsing(): Unknown CMD!!\n");
-                                break;
-                        }
-
-                }
-                ary_idx++;
-        } while (1);
-
-        return true;
-}
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/reg.h b/drivers/net/wireless/rtlwifi/rtl8723ae/reg.h
index ce2c66fd9eee..306059f9b9cc 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/reg.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -34,13 +30,13 @@
 #define REG_SYS_FUNC_EN                         0x0002
 #define REG_APS_FSMCO                           0x0004
 #define REG_SYS_CLKR                            0x0008
-#define REG_9346CR                              0x000A
-#define REG_EE_VPD                              0x000C
+#define REG_9346CR                                      0x000A
+#define REG_EE_VPD                                      0x000C
 #define REG_AFE_MISC                            0x0010
 #define REG_SPS0_CTRL                           0x0011
 #define REG_SPS_OCP_CFG                         0x0018
 #define REG_RSV_CTRL                            0x001C
-#define REG_RF_CTRL                             0x001F
+#define REG_RF_CTRL                                     0x001F
 #define REG_LDOA15_CTRL                         0x0020
 #define REG_LDOV12D_CTRL                        0x0021
 #define REG_LDOHCI12_CTRL                       0x0022
@@ -57,12 +53,12 @@
 #define REG_MAC_PINMUX_CFG                      0x0043
 #define REG_GPIO_PIN_CTRL                       0x0044
 #define REG_GPIO_INTM                           0x0048
-#define REG_LEDCFG0                             0x004C
-#define REG_LEDCFG1                             0x004D
-#define REG_LEDCFG2                             0x004E
-#define REG_LEDCFG3                             0x004F
-#define REG_FSIMR                               0x0050
-#define REG_FSISR                               0x0054
+#define REG_LEDCFG0                                     0x004C
+#define REG_LEDCFG1                                     0x004D
+#define REG_LEDCFG2                                     0x004E
+#define REG_LEDCFG3                                     0x004F
+#define REG_FSIMR                                       0x0050
+#define REG_FSISR                                       0x0054
 #define REG_GPIO_PIN_CTRL_2                     0x0060
 #define REG_GPIO_IO_SEL_2                       0x0062
 #define REG_MULTI_FUNC_CTRL                     0x0068
@@ -80,25 +76,25 @@
 #define REG_USB_SIE_INTF                        0x00E0
 #define REG_PCIE_MIO_INTF                       0x00E4
 #define REG_PCIE_MIO_INTD                       0x00E8
-#define REG_SYS_CFG                             0x00F0
+#define REG_SYS_CFG                                     0x00F0
 #define REG_GPIO_OUTSTS                         0x00F4
 
-#define REG_CR                                  0x0100
-#define REG_PBP                                 0x0104
+#define REG_CR                                          0x0100
+#define REG_PBP                                         0x0104
 #define REG_TRXDMA_CTRL                         0x010C
 #define REG_TRXFF_BNDY                          0x0114
 #define REG_TRXFF_STATUS                        0x0118
 #define REG_RXFF_PTR                            0x011C
-#define REG_HIMR                                0x0120
-#define REG_HISR                                0x0124
-#define REG_HIMRE                               0x0128
-#define REG_HISRE                               0x012C
-#define REG_CPWM                                0x012F
-#define REG_FWIMR                               0x0130
-#define REG_FWISR                               0x0134
+#define REG_HIMR                                        0x0120
+#define REG_HISR                                        0x0124
+#define REG_HIMRE                                       0x0128
+#define REG_HISRE                                       0x012C
+#define REG_CPWM                                        0x012F
+#define REG_FWIMR                                       0x0130
+#define REG_FWISR                                       0x0134
 #define REG_PKTBUF_DBG_CTRL                     0x0140
-#define REG_PKTBUF_DBG_DATA_L                   0x0144
-#define REG_PKTBUF_DBG_DATA_H                   0x0148
+#define REG_PKTBUF_DBG_DATA_L           0x0144
+#define REG_PKTBUF_DBG_DATA_H           0x0148
 
 #define REG_TC0_CTRL                            0x0150
 #define REG_TC1_CTRL                            0x0154
@@ -109,11 +105,11 @@
 #define REG_MBIST_START                         0x0174
 #define REG_MBIST_DONE                          0x0178
 #define REG_MBIST_FAIL                          0x017C
-#define REG_C2HEVT_MSG_NORMAL                   0x01A0
+#define REG_C2HEVT_MSG_NORMAL           0x01A0
 #define REG_C2HEVT_MSG_TEST                     0x01B8
 #define REG_MCUTST_1                            0x01c0
-#define REG_FMETHR                              0x01C8
-#define REG_HMETFR                              0x01CC
+#define REG_FMETHR                                      0x01C8
+#define REG_HMETFR                                      0x01CC
 #define REG_HMEBOX_0                            0x01D0
 #define REG_HMEBOX_1                            0x01D4
 #define REG_HMEBOX_2                            0x01D8
@@ -123,10 +119,10 @@
 #define REG_BB_ACCEESS_CTRL                     0x01E8
 #define REG_BB_ACCESS_DATA                      0x01EC
 
-#define REG_RQPN                                0x0200
+#define REG_RQPN                                        0x0200
 #define REG_FIFOPAGE                            0x0204
-#define REG_TDECTRL                             0x0208
-#define REG_TXDMA_OFFSET_CHK                    0x020C
+#define REG_TDECTRL                                     0x0208
+#define REG_TXDMA_OFFSET_CHK            0x020C
 #define REG_TXDMA_STATUS                        0x0210
 #define REG_RQPN_NPQ                            0x0214
 
@@ -135,18 +131,18 @@
 #define REG_RXDMA_STATUS                        0x0288
 
 #define REG_PCIE_CTRL_REG                       0x0300
-#define REG_INT_MIG                             0x0304
+#define REG_INT_MIG                                     0x0304
 #define REG_BCNQ_DESA                           0x0308
-#define REG_HQ_DESA                             0x0310
+#define REG_HQ_DESA                                     0x0310
 #define REG_MGQ_DESA                            0x0318
 #define REG_VOQ_DESA                            0x0320
 #define REG_VIQ_DESA                            0x0328
 #define REG_BEQ_DESA                            0x0330
 #define REG_BKQ_DESA                            0x0338
-#define REG_RX_DESA                             0x0340
-#define REG_DBI                                 0x0348
-#define REG_MDIO                                0x0354
-#define REG_DBG_SEL                             0x0360
+#define REG_RX_DESA                                     0x0340
+#define REG_DBI                                         0x0348
+#define REG_MDIO                                        0x0354
+#define REG_DBG_SEL                                     0x0360
 #define REG_PCIE_HRPWM                          0x0361
 #define REG_PCIE_HCPWM                          0x0363
 #define REG_UART_CTRL                           0x0364
@@ -162,31 +158,31 @@
 #define REG_BKQ_INFORMATION                     0x040C
 #define REG_MGQ_INFORMATION                     0x0410
 #define REG_HGQ_INFORMATION                     0x0414
-#define REG_BCNQ_INFORMATION                    0x0418
+#define REG_BCNQ_INFORMATION            0x0418
 
-#define REG_CPU_MGQ_INFORMATION                 0x041C
+#define REG_CPU_MGQ_INFORMATION         0x041C
 #define REG_FWHW_TXQ_CTRL                       0x0420
 #define REG_HWSEQ_CTRL                          0x0423
-#define REG_TXPKTBUF_BCNQ_BDNY                  0x0424
-#define REG_TXPKTBUF_MGQ_BDNY                   0x0425
+#define REG_TXPKTBUF_BCNQ_BDNY          0x0424
+#define REG_TXPKTBUF_MGQ_BDNY           0x0425
 #define REG_MULTI_BCNQ_EN                       0x0426
-#define REG_MULTI_BCNQ_OFFSET                   0x0427
+#define REG_MULTI_BCNQ_OFFSET           0x0427
 #define REG_SPEC_SIFS                           0x0428
-#define REG_RL                                  0x042A
-#define REG_DARFRC                              0x0430
-#define REG_RARFRC                              0x0438
-#define REG_RRSR                                0x0440
-#define REG_ARFR0                               0x0444
-#define REG_ARFR1                               0x0448
-#define REG_ARFR2                               0x044C
-#define REG_ARFR3                               0x0450
+#define REG_RL                                          0x042A
+#define REG_DARFRC                                      0x0430
+#define REG_RARFRC                                      0x0438
+#define REG_RRSR                                        0x0440
+#define REG_ARFR0                                       0x0444
+#define REG_ARFR1                                       0x0448
+#define REG_ARFR2                                       0x044C
+#define REG_ARFR3                                       0x0450
 #define REG_AGGLEN_LMT                          0x0458
 #define REG_AMPDU_MIN_SPACE                     0x045C
-#define REG_TXPKTBUF_WMAC_LBK_BF_HD             0x045D
+#define REG_TXPKTBUF_WMAC_LBK_BF_HD     0x045D
 #define REG_FAST_EDCA_CTRL                      0x0460
 #define REG_RD_RESP_PKT_TH                      0x0463
 #define REG_INIRTS_RATE_SEL                     0x0480
-#define REG_INIDATA_RATE_SEL                    0x0484
+#define REG_INIDATA_RATE_SEL            0x0484
 #define REG_POWER_STATUS                        0x04A4
 #define REG_POWER_STAGE1                        0x04B4
 #define REG_POWER_STAGE2                        0x04B8
@@ -194,29 +190,29 @@
 #define REG_STBC_SETTING                        0x04C4
 #define REG_PROT_MODE_CTRL                      0x04C8
 #define REG_BAR_MODE_CTRL                       0x04CC
-#define REG_RA_TRY_RATE_AGG_LMT                 0x04CF
+#define REG_RA_TRY_RATE_AGG_LMT         0x04CF
 #define REG_NQOS_SEQ                            0x04DC
-#define REG_QOS_SEQ                             0x04DE
+#define REG_QOS_SEQ                                     0x04DE
 #define REG_NEED_CPU_HANDLE                     0x04E0
 #define REG_PKT_LOSE_RPT                        0x04E1
 #define REG_PTCL_ERR_STATUS                     0x04E2
-#define REG_DUMMY                               0x04FC
+#define REG_DUMMY                                       0x04FC
 
 #define REG_EDCA_VO_PARAM                       0x0500
 #define REG_EDCA_VI_PARAM                       0x0504
 #define REG_EDCA_BE_PARAM                       0x0508
 #define REG_EDCA_BK_PARAM                       0x050C
-#define REG_BCNTCFG                             0x0510
-#define REG_PIFS                                0x0512
+#define REG_BCNTCFG                                     0x0510
+#define REG_PIFS                                        0x0512
 #define REG_RDG_PIFS                            0x0513
 #define REG_SIFS_CTX                            0x0514
 #define REG_SIFS_TRX                            0x0516
 #define REG_AGGR_BREAK_TIME                     0x051A
-#define REG_SLOT                                0x051B
+#define REG_SLOT                                        0x051B
 #define REG_TX_PTCL_CTRL                        0x0520
-#define REG_TXPAUSE                             0x0522
+#define REG_TXPAUSE                                     0x0522
 #define REG_DIS_TXREQ_CLR                       0x0523
-#define REG_RD_CTRL                             0x0524
+#define REG_RD_CTRL                                     0x0524
 #define REG_TBTT_PROHIBIT                       0x0540
 #define REG_RD_NAV_NXT                          0x0544
 #define REG_NAV_PROT_LEN                        0x0546
@@ -225,21 +221,21 @@
 #define REG_MBID_NUM                            0x0552
 #define REG_DUAL_TSF_RST                        0x0553
 #define REG_BCN_INTERVAL                        0x0554
-#define REG_MBSSID_BCN_SPACE                    0x0554
+#define REG_MBSSID_BCN_SPACE            0x0554
 #define REG_DRVERLYINT                          0x0558
 #define REG_BCNDMATIM                           0x0559
-#define REG_ATIMWND                             0x055A
+#define REG_ATIMWND                                     0x055A
 #define REG_BCN_MAX_ERR                         0x055D
-#define REG_RXTSF_OFFSET_CCK                    0x055E
-#define REG_RXTSF_OFFSET_OFDM                   0x055F
-#define REG_TSFTR                               0x0560
+#define REG_RXTSF_OFFSET_CCK            0x055E
+#define REG_RXTSF_OFFSET_OFDM           0x055F
+#define REG_TSFTR                                       0x0560
 #define REG_INIT_TSFTR                          0x0564
-#define REG_PSTIMER                             0x0580
-#define REG_TIMER0                              0x0584
-#define REG_TIMER1                              0x0588
+#define REG_PSTIMER                                     0x0580
+#define REG_TIMER0                                      0x0584
+#define REG_TIMER1                                      0x0588
 #define REG_ACMHWCTRL                           0x05C0
 #define REG_ACMRSTCTRL                          0x05C1
-#define REG_ACMAVG                              0x05C2
+#define REG_ACMAVG                                      0x05C2
 #define REG_VO_ADMTIME                          0x05C4
 #define REG_VI_ADMTIME                          0x05C6
 #define REG_BE_ADMTIME                          0x05C8
@@ -248,38 +244,38 @@
 
 #define REG_APSD_CTRL                           0x0600
 #define REG_BWOPMODE                            0x0603
-#define REG_TCR                                 0x0604
-#define REG_RCR                                 0x0608
+#define REG_TCR                                         0x0604
+#define REG_RCR                                         0x0608
 #define REG_RX_PKT_LIMIT                        0x060C
 #define REG_RX_DLK_TIME                         0x060D
 #define REG_RX_DRVINFO_SZ                       0x060F
 
-#define REG_MACID                               0x0610
-#define REG_BSSID                               0x0618
-#define REG_MAR                                 0x0620
+#define REG_MACID                                       0x0610
+#define REG_BSSID                                       0x0618
+#define REG_MAR                                         0x0620
 #define REG_MBIDCAMCFG                          0x0628
 
 #define REG_USTIME_EDCA                         0x0638
 #define REG_MAC_SPEC_SIFS                       0x063A
 #define REG_RESP_SIFS_CCK                       0x063C
 #define REG_RESP_SIFS_OFDM                      0x063E
-#define REG_ACKTO                               0x0640
-#define REG_CTS2TO                              0x0641
-#define REG_EIFS                                0x0642
+#define REG_ACKTO                                       0x0640
+#define REG_CTS2TO                                      0x0641
+#define REG_EIFS                                        0x0642
 
 #define REG_NAV_CTRL                            0x0650
 #define REG_BACAMCMD                            0x0654
 #define REG_BACAMCONTENT                        0x0658
-#define REG_LBDLY                               0x0660
-#define REG_FWDLY                               0x0661
+#define REG_LBDLY                                       0x0660
+#define REG_FWDLY                                       0x0661
 #define REG_RXERR_RPT                           0x0664
-#define REG_WMAC_TRXPTCL_CTL                    0x0668
+#define REG_WMAC_TRXPTCL_CTL            0x0668
 
-#define REG_CAMCMD                              0x0670
+#define REG_CAMCMD                                      0x0670
 #define REG_CAMWRITE                            0x0674
-#define REG_CAMREAD                             0x0678
-#define REG_CAMDBG                              0x067C
-#define REG_SECCFG                              0x0680
+#define REG_CAMREAD                                     0x0678
+#define REG_CAMDBG                                      0x067C
+#define REG_SECCFG                                      0x0680
 
 #define REG_WOW_CTRL                            0x0690
 #define REG_PSSTATUS                            0x0691
@@ -294,10 +290,10 @@
 #define REG_CALB32K_CTRL                        0x06AC
 #define REG_PKT_MON_CTRL                        0x06B4
 #define REG_BT_COEX_TABLE                       0x06C0
-#define REG_WMAC_RESP_TXINFO                    0x06D8
+#define REG_WMAC_RESP_TXINFO            0x06D8
 
 #define REG_USB_INFO                            0xFE17
-#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_SPECIAL_OPTION          0xFE55
 #define REG_USB_DMA_AGG_TO                      0xFE5B
 #define REG_USB_AGG_TO                          0xFE5C
 #define REG_USB_AGG_TH                          0xFE5D
@@ -305,120 +301,148 @@
 #define REG_TEST_USB_TXQS                       0xFE48
 #define REG_TEST_SIE_VID                        0xFE60
 #define REG_TEST_SIE_PID                        0xFE62
-#define REG_TEST_SIE_OPTIONAL                   0xFE64
-#define REG_TEST_SIE_CHIRP_K                    0xFE65
+#define REG_TEST_SIE_OPTIONAL           0xFE64
+#define REG_TEST_SIE_CHIRP_K            0xFE65
 #define REG_TEST_SIE_PHY                        0xFE66
-#define REG_TEST_SIE_MAC_ADDR                   0xFE70
+#define REG_TEST_SIE_MAC_ADDR           0xFE70
 #define REG_TEST_SIE_STRING                     0xFE80
 
 #define REG_NORMAL_SIE_VID                      0xFE60
 #define REG_NORMAL_SIE_PID                      0xFE62
-#define REG_NORMAL_SIE_OPTIONAL                 0xFE64
+#define REG_NORMAL_SIE_OPTIONAL         0xFE64
 #define REG_NORMAL_SIE_EP                       0xFE65
 #define REG_NORMAL_SIE_PHY                      0xFE68
-#define REG_NORMAL_SIE_MAC_ADDR                 0xFE70
-#define REG_NORMAL_SIE_STRING                   0xFE80
+#define REG_NORMAL_SIE_MAC_ADDR         0xFE70
+#define REG_NORMAL_SIE_STRING           0xFE80
 
-#define CR9346                                  REG_9346CR
-#define MSR                                     (REG_CR + 2)
-#define ISR                                     REG_HISR
-#define TSFR                                    REG_TSFTR
+#define CR9346                          REG_9346CR
+#define MSR                             (REG_CR + 2)
+#define ISR                             REG_HISR
+#define TSFR                            REG_TSFTR
 
-#define MACIDR0                                 REG_MACID
-#define MACIDR4                                 (REG_MACID + 4)
+#define MACIDR0                         REG_MACID
+#define MACIDR4                         (REG_MACID + 4)
 
-#define PBP                                     REG_PBP
+#define PBP                             REG_PBP
 
-#define IDR0                                    MACIDR0
-#define IDR4                                    MACIDR4
+#define IDR0                            MACIDR0
+#define IDR4                            MACIDR4
 
-#define UNUSED_REGISTER                         0x1BF
-#define DCAM                                    UNUSED_REGISTER
-#define PSR                                     UNUSED_REGISTER
-#define BBADDR                                  UNUSED_REGISTER
-#define PHYDATAR                                UNUSED_REGISTER
+#define UNUSED_REGISTER                 0x1BF
+#define DCAM                            UNUSED_REGISTER
+#define PSR                             UNUSED_REGISTER
+#define BBADDR                          UNUSED_REGISTER
+#define PHYDATAR                        UNUSED_REGISTER
 
-#define INVALID_BBRF_VALUE                      0x12345678
+#define INVALID_BBRF_VALUE              0x12345678
 
-#define MAX_MSS_DENSITY_2T                      0x13
-#define MAX_MSS_DENSITY_1T                      0x0A
+#define MAX_MSS_DENSITY_2T              0x13
+#define MAX_MSS_DENSITY_1T              0x0A
 
-#define CMDEEPROM_EN                            BIT(5)
-#define CMDEEPROM_SEL                           BIT(4)
-#define CMD9346CR_9356SEL                       BIT(4)
-#define AUTOLOAD_EEPROM                         (CMDEEPROM_EN|CMDEEPROM_SEL)
-#define AUTOLOAD_EFUSE                          CMDEEPROM_EN
+#define CMDEEPROM_EN                    BIT(5)
+#define CMDEEPROM_SEL                   BIT(4)
+#define CMD9346CR_9356SEL               BIT(4)
+#define AUTOLOAD_EEPROM                 (CMDEEPROM_EN|CMDEEPROM_SEL)
+#define AUTOLOAD_EFUSE                  CMDEEPROM_EN
 
-#define GPIOSEL_GPIO                            0
-#define GPIOSEL_ENBT                            BIT(5)
+#define GPIOSEL_GPIO                    0
+#define GPIOSEL_ENBT                    BIT(5)
 
-#define GPIO_IN                                 REG_GPIO_PIN_CTRL
-#define GPIO_OUT                                (REG_GPIO_PIN_CTRL+1)
-#define GPIO_IO_SEL                             (REG_GPIO_PIN_CTRL+2)
-#define GPIO_MOD                                (REG_GPIO_PIN_CTRL+3)
+#define GPIO_IN                         REG_GPIO_PIN_CTRL
+#define GPIO_OUT                        (REG_GPIO_PIN_CTRL+1)
+#define GPIO_IO_SEL                     (REG_GPIO_PIN_CTRL+2)
+#define GPIO_MOD                        (REG_GPIO_PIN_CTRL+3)
 
-#define MSR_NOLINK                              0x00
-#define MSR_ADHOC                               0x01
-#define MSR_INFRA                               0x02
-#define MSR_AP                                  0x03
-#define MSR_MASK                                0x03
+#define MSR_NOLINK                                      0x00
+#define MSR_ADHOC                                       0x01
+#define MSR_INFRA                                       0x02
+#define MSR_AP                                          0x03
 
 #define RRSR_RSC_OFFSET                         21
 #define RRSR_SHORT_OFFSET                       23
 #define RRSR_RSC_BW_40M                         0x600000
 #define RRSR_RSC_UPSUBCHNL                      0x400000
 #define RRSR_RSC_LOWSUBCHNL                     0x200000
-#define RRSR_SHORT                              0x800000
-#define RRSR_1M                                 BIT(0)
-#define RRSR_2M                                 BIT(1)
-#define RRSR_5_5M                               BIT(2)
-#define RRSR_11M                                BIT(3)
-#define RRSR_6M                                 BIT(4)
-#define RRSR_9M                                 BIT(5)
-#define RRSR_12M                                BIT(6)
-#define RRSR_18M                                BIT(7)
-#define RRSR_24M                                BIT(8)
-#define RRSR_36M                                BIT(9)
-#define RRSR_48M                                BIT(10)
-#define RRSR_54M                                BIT(11)
-#define RRSR_MCS0                               BIT(12)
-#define RRSR_MCS1                               BIT(13)
-#define RRSR_MCS2                               BIT(14)
-#define RRSR_MCS3                               BIT(15)
-#define RRSR_MCS4                               BIT(16)
-#define RRSR_MCS5                               BIT(17)
-#define RRSR_MCS6                               BIT(18)
-#define RRSR_MCS7                               BIT(19)
+#define RRSR_SHORT                                      0x800000
+#define RRSR_1M                                         BIT(0)
+#define RRSR_2M                                         BIT(1)
+#define RRSR_5_5M                                       BIT(2)
+#define RRSR_11M                                        BIT(3)
+#define RRSR_6M                                         BIT(4)
+#define RRSR_9M                                         BIT(5)
+#define RRSR_12M                                        BIT(6)
+#define RRSR_18M                                        BIT(7)
+#define RRSR_24M                                        BIT(8)
+#define RRSR_36M                                        BIT(9)
+#define RRSR_48M                                        BIT(10)
+#define RRSR_54M                                        BIT(11)
+#define RRSR_MCS0                                       BIT(12)
+#define RRSR_MCS1                                       BIT(13)
+#define RRSR_MCS2                                       BIT(14)
+#define RRSR_MCS3                                       BIT(15)
+#define RRSR_MCS4                                       BIT(16)
+#define RRSR_MCS5                                       BIT(17)
+#define RRSR_MCS6                                       BIT(18)
+#define RRSR_MCS7                                       BIT(19)
 #define BRSR_ACKSHORTPMB                        BIT(23)
 
-#define RATR_1M                                 0x00000001
-#define RATR_2M                                 0x00000002
-#define RATR_55M                                0x00000004
-#define RATR_11M                                0x00000008
-#define RATR_6M                                 0x00000010
-#define RATR_9M                                 0x00000020
-#define RATR_12M                                0x00000040
-#define RATR_18M                                0x00000080
-#define RATR_24M                                0x00000100
-#define RATR_36M                                0x00000200
-#define RATR_48M                                0x00000400
-#define RATR_54M                                0x00000800
-#define RATR_MCS0                               0x00001000
-#define RATR_MCS1                               0x00002000
-#define RATR_MCS2                               0x00004000
-#define RATR_MCS3                               0x00008000
-#define RATR_MCS4                               0x00010000
-#define RATR_MCS5                               0x00020000
-#define RATR_MCS6                               0x00040000
-#define RATR_MCS7                               0x00080000
-#define RATR_MCS8                               0x00100000
-#define RATR_MCS9                               0x00200000
-#define RATR_MCS10                              0x00400000
-#define RATR_MCS11                              0x00800000
-#define RATR_MCS12                              0x01000000
-#define RATR_MCS13                              0x02000000
-#define RATR_MCS14                              0x04000000
-#define RATR_MCS15                              0x08000000
+#define RATR_1M                                         0x00000001
+#define RATR_2M                                         0x00000002
+#define RATR_55M                                        0x00000004
+#define RATR_11M                                        0x00000008
+#define RATR_6M                                         0x00000010
+#define RATR_9M                                         0x00000020
+#define RATR_12M                                        0x00000040
+#define RATR_18M                                        0x00000080
+#define RATR_24M                                        0x00000100
+#define RATR_36M                                        0x00000200
+#define RATR_48M                                        0x00000400
+#define RATR_54M                                        0x00000800
+#define RATR_MCS0                                       0x00001000
+#define RATR_MCS1                                       0x00002000
+#define RATR_MCS2                                       0x00004000
+#define RATR_MCS3                                       0x00008000
+#define RATR_MCS4                                       0x00010000
+#define RATR_MCS5                                       0x00020000
+#define RATR_MCS6                                       0x00040000
+#define RATR_MCS7                                       0x00080000
+#define RATR_MCS8                                       0x00100000
+#define RATR_MCS9                                       0x00200000
+#define RATR_MCS10                                      0x00400000
+#define RATR_MCS11                                      0x00800000
+#define RATR_MCS12                                      0x01000000
+#define RATR_MCS13                                      0x02000000
+#define RATR_MCS14                                      0x04000000
+#define RATR_MCS15                                      0x08000000
+
+#define RATE_1M                                         BIT(0)
+#define RATE_2M                                         BIT(1)
+#define RATE_5_5M                                       BIT(2)
+#define RATE_11M                                        BIT(3)
+#define RATE_6M                                         BIT(4)
+#define RATE_9M                                         BIT(5)
+#define RATE_12M                                        BIT(6)
+#define RATE_18M                                        BIT(7)
+#define RATE_24M                                        BIT(8)
+#define RATE_36M                                        BIT(9)
+#define RATE_48M                                        BIT(10)
+#define RATE_54M                                        BIT(11)
+#define RATE_MCS0                                       BIT(12)
+#define RATE_MCS1                                       BIT(13)
+#define RATE_MCS2                                       BIT(14)
+#define RATE_MCS3                                       BIT(15)
+#define RATE_MCS4                                       BIT(16)
+#define RATE_MCS5                                       BIT(17)
+#define RATE_MCS6                                       BIT(18)
+#define RATE_MCS7                                       BIT(19)
+#define RATE_MCS8                                       BIT(20)
+#define RATE_MCS9                                       BIT(21)
+#define RATE_MCS10                                      BIT(22)
+#define RATE_MCS11                                      BIT(23)
+#define RATE_MCS12                                      BIT(24)
+#define RATE_MCS13                                      BIT(25)
+#define RATE_MCS14                                      BIT(26)
+#define RATE_MCS15                                      BIT(27)
 
 #define RATE_ALL_CCK            (RATR_1M | RATR_2M | RATR_55M | RATR_11M)
 #define RATE_ALL_OFDM_AG        (RATR_6M | RATR_9M | RATR_12M | RATR_18M |\
@@ -434,31 +458,31 @@
 #define BW_OPMODE_5G                            BIT(1)
 #define BW_OPMODE_11J                           BIT(0)
 
-#define CAM_VALID                               BIT(15)
+#define CAM_VALID                                       BIT(15)
 #define CAM_NOTVALID                            0x0000
-#define CAM_USEDK                               BIT(5)
+#define CAM_USEDK                                       BIT(5)
 
-#define CAM_NONE                                0x0
-#define CAM_WEP40                               0x01
-#define CAM_TKIP                                0x02
-#define CAM_AES                                 0x04
-#define CAM_WEP104                              0x05
+#define CAM_NONE                                        0x0
+#define CAM_WEP40                                       0x01
+#define CAM_TKIP                                        0x02
+#define CAM_AES                                         0x04
+#define CAM_WEP104                                      0x05
 
 #define TOTAL_CAM_ENTRY                         32
 #define HALF_CAM_ENTRY                          16
 
-#define CAM_WRITE                               BIT(16)
-#define CAM_READ                                0x00000000
+#define CAM_WRITE                                       BIT(16)
+#define CAM_READ                                        0x00000000
 #define CAM_POLLINIG                            BIT(31)
 
-#define SCR_USEDK                               0x01
+#define SCR_USEDK                                       0x01
 #define SCR_TXSEC_ENABLE                        0x02
 #define SCR_RXSEC_ENABLE                        0x04
 
-#define WOW_PMEN                                BIT(0)
-#define WOW_WOMEN                               BIT(1)
-#define WOW_MAGIC                               BIT(2)
-#define WOW_UWF                                 BIT(3)
+#define WOW_PMEN                                        BIT(0)
+#define WOW_WOMEN                                       BIT(1)
+#define WOW_MAGIC                                       BIT(2)
+#define WOW_UWF                                         BIT(3)
 
 #define IMR8190_DISABLED                        0x0
 #define IMR_BCNDMAINT6                          BIT(31)
@@ -467,180 +491,179 @@
 #define IMR_BCNDMAINT3                          BIT(28)
 #define IMR_BCNDMAINT2                          BIT(27)
 #define IMR_BCNDMAINT1                          BIT(26)
-#define IMR_BCNDOK8                             BIT(25)
-#define IMR_BCNDOK7                             BIT(24)
-#define IMR_BCNDOK6                             BIT(23)
-#define IMR_BCNDOK5                             BIT(22)
-#define IMR_BCNDOK4                             BIT(21)
-#define IMR_BCNDOK3                             BIT(20)
-#define IMR_BCNDOK2                             BIT(19)
-#define IMR_BCNDOK1                             BIT(18)
+#define IMR_BCNDOK8                                     BIT(25)
+#define IMR_BCNDOK7                                     BIT(24)
+#define IMR_BCNDOK6                                     BIT(23)
+#define IMR_BCNDOK5                                     BIT(22)
+#define IMR_BCNDOK4                                     BIT(21)
+#define IMR_BCNDOK3                                     BIT(20)
+#define IMR_BCNDOK2                                     BIT(19)
+#define IMR_BCNDOK1                                     BIT(18)
 #define IMR_TIMEOUT2                            BIT(17)
 #define IMR_TIMEOUT1                            BIT(16)
-#define IMR_TXFOVW                              BIT(15)
+#define IMR_TXFOVW                                      BIT(15)
 #define IMR_PSTIMEOUT                           BIT(14)
-#define IMR_BCNINT                              BIT(13)
-#define IMR_RXFOVW                              BIT(12)
-#define IMR_RDU                                 BIT(11)
-#define IMR_ATIMEND                             BIT(10)
-#define IMR_BDOK                                BIT(9)
-#define IMR_HIGHDOK                             BIT(8)
-#define IMR_TBDOK                               BIT(7)
-#define IMR_MGNTDOK                             BIT(6)
-#define IMR_TBDER                               BIT(5)
-#define IMR_BKDOK                               BIT(4)
-#define IMR_BEDOK                               BIT(3)
-#define IMR_VIDOK                               BIT(2)
-#define IMR_VODOK                               BIT(1)
-#define IMR_ROK                                 BIT(0)
-
-#define IMR_TXERR                               BIT(11)
-#define IMR_RXERR                               BIT(10)
-#define IMR_CPWM                                BIT(8)
-#define IMR_OCPINT                              BIT(1)
-#define IMR_WLANOFF                             BIT(0)
+#define IMR_BCNINT                                      BIT(13)
+#define IMR_RXFOVW                                      BIT(12)
+#define IMR_RDU                                         BIT(11)
+#define IMR_ATIMEND                                     BIT(10)
+#define IMR_BDOK                                        BIT(9)
+#define IMR_HIGHDOK                                     BIT(8)
+#define IMR_TBDOK                                       BIT(7)
+#define IMR_MGNTDOK                                     BIT(6)
+#define IMR_TBDER                                       BIT(5)
+#define IMR_BKDOK                                       BIT(4)
+#define IMR_BEDOK                                       BIT(3)
+#define IMR_VIDOK                                       BIT(2)
+#define IMR_VODOK                                       BIT(1)
+#define IMR_ROK                                         BIT(0)
+
+#define IMR_TXERR                                       BIT(11)
+#define IMR_RXERR                                       BIT(10)
+#define IMR_CPWM                                        BIT(8)
+#define IMR_OCPINT                                      BIT(1)
+#define IMR_WLANOFF                                     BIT(0)
 
 /* 8723E series PCIE Host IMR/ISR bit */
 /* IMR DW0 Bit 0-31 */
-#define PHIMR_TIMEOUT2                          BIT(31)
-#define PHIMR_TIMEOUT1                          BIT(30)
+#define PHIMR_TIMEOUT2                                  BIT(31)
+#define PHIMR_TIMEOUT1                                  BIT(30)
 #define PHIMR_PSTIMEOUT                         BIT(29)
-#define PHIMR_GTINT4                            BIT(28)
-#define PHIMR_GTINT3                            BIT(27)
-#define PHIMR_TXBCNERR                          BIT(26)
-#define PHIMR_TXBCNOK                           BIT(25)
+#define PHIMR_GTINT4                                    BIT(28)
+#define PHIMR_GTINT3                                    BIT(27)
+#define PHIMR_TXBCNERR                                  BIT(26)
+#define PHIMR_TXBCNOK                                   BIT(25)
 #define PHIMR_TSF_BIT32_TOGGLE                  BIT(24)
-#define PHIMR_BCNDMAINT3                        BIT(23)
-#define PHIMR_BCNDMAINT2                        BIT(22)
-#define PHIMR_BCNDMAINT1                        BIT(21)
-#define PHIMR_BCNDMAINT0                        BIT(20)
-#define PHIMR_BCNDOK3                           BIT(19)
-#define PHIMR_BCNDOK2                           BIT(18)
-#define PHIMR_BCNDOK1                           BIT(17)
-#define PHIMR_BCNDOK0                           BIT(16)
+#define PHIMR_BCNDMAINT3                                BIT(23)
+#define PHIMR_BCNDMAINT2                                BIT(22)
+#define PHIMR_BCNDMAINT1                                BIT(21)
+#define PHIMR_BCNDMAINT0                                BIT(20)
+#define PHIMR_BCNDOK3                                   BIT(19)
+#define PHIMR_BCNDOK2                                   BIT(18)
+#define PHIMR_BCNDOK1                                   BIT(17)
+#define PHIMR_BCNDOK0                                   BIT(16)
 #define PHIMR_HSISR_IND_ON                      BIT(15)
-#define PHIMR_BCNDMAINT_E                       BIT(14)
+#define PHIMR_BCNDMAINT_E                               BIT(14)
 #define PHIMR_ATIMEND_E                         BIT(13)
 #define PHIMR_ATIM_CTW_END                      BIT(12)
 #define PHIMR_HISRE_IND                         BIT(11)
-#define PHIMR_C2HCMD                            BIT(10)
-#define PHIMR_CPWM2                             BIT(9)
-#define PHIMR_CPWM                              BIT(8)
-#define PHIMR_HIGHDOK                           BIT(7)
-#define PHIMR_MGNTDOK                           BIT(6)
-#define PHIMR_BKDOK                             BIT(5)
-#define PHIMR_BEDOK                             BIT(4)
-#define PHIMR_VIDOK                             BIT(3)
-#define PHIMR_VODOK                             BIT(2)
-#define PHIMR_RDU                               BIT(1)
-#define PHIMR_ROK                               BIT(0)
+#define PHIMR_C2HCMD                                    BIT(10)
+#define PHIMR_CPWM2                                     BIT(9)
+#define PHIMR_CPWM                                      BIT(8)
+#define PHIMR_HIGHDOK                                   BIT(7)
+#define PHIMR_MGNTDOK                                   BIT(6)
+#define PHIMR_BKDOK                                     BIT(5)
+#define PHIMR_BEDOK                                     BIT(4)
+#define PHIMR_VIDOK                                     BIT(3)
+#define PHIMR_VODOK                                     BIT(2)
+#define PHIMR_RDU                                               BIT(1)
+#define PHIMR_ROK                                               BIT(0)
 
 /* PCIE Host Interrupt Status Extension bit */
-#define PHIMR_BCNDMAINT7                        BIT(23)
-#define PHIMR_BCNDMAINT6                        BIT(22)
-#define PHIMR_BCNDMAINT5                        BIT(21)
-#define PHIMR_BCNDMAINT4                        BIT(20)
-#define PHIMR_BCNDOK7                           BIT(19)
-#define PHIMR_BCNDOK6                           BIT(18)
-#define PHIMR_BCNDOK5                           BIT(17)
-#define PHIMR_BCNDOK4                           BIT(16)
+#define PHIMR_BCNDMAINT7                                BIT(23)
+#define PHIMR_BCNDMAINT6                                BIT(22)
+#define PHIMR_BCNDMAINT5                                BIT(21)
+#define PHIMR_BCNDMAINT4                                BIT(20)
+#define PHIMR_BCNDOK7                                   BIT(19)
+#define PHIMR_BCNDOK6                                   BIT(18)
+#define PHIMR_BCNDOK5                                   BIT(17)
+#define PHIMR_BCNDOK4                                   BIT(16)
 /* bit12-15: RSVD */
-#define PHIMR_TXERR                             BIT(11)
-#define PHIMR_RXERR                             BIT(10)
-#define PHIMR_TXFOVW                            BIT(9)
-#define PHIMR_RXFOVW                            BIT(8)
-/* bit2-7: RSV */
-#define PHIMR_OCPINT                            BIT(1)
+#define PHIMR_TXERR                                     BIT(11)
+#define PHIMR_RXERR                                     BIT(10)
+#define PHIMR_TXFOVW                                    BIT(9)
+#define PHIMR_RXFOVW                                    BIT(8)
+/* bit2-7: RSVD */
+#define PHIMR_OCPINT                                    BIT(1)
 
 #define HWSET_MAX_SIZE                          256
 #define EFUSE_MAX_SECTION                       32
 #define EFUSE_REAL_CONTENT_LEN                  512
 #define EFUSE_OOB_PROTECT_BYTES                 15
 
-#define EEPROM_DEFAULT_TSSI                     0x0
-#define EEPROM_DEFAULT_TXPOWERDIFF              0x0
-#define EEPROM_DEFAULT_CRYSTALCAP               0x5
-#define EEPROM_DEFAULT_BOARDTYPE                0x02
-#define EEPROM_DEFAULT_TXPOWER                  0x1010
-#define EEPROM_DEFAULT_HT2T_TXPWR               0x10
+#define EEPROM_DEFAULT_TSSI                                     0x0
+#define EEPROM_DEFAULT_TXPOWERDIFF                      0x0
+#define EEPROM_DEFAULT_CRYSTALCAP                       0x5
+#define EEPROM_DEFAULT_BOARDTYPE                        0x02
+#define EEPROM_DEFAULT_TXPOWER                          0x1010
+#define EEPROM_DEFAULT_HT2T_TXPWR                       0x10
 
 #define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
-#define EEPROM_DEFAULT_THERMALMETER             0x12
+#define EEPROM_DEFAULT_THERMALMETER                     0x12
 #define EEPROM_DEFAULT_ANTTXPOWERDIFF           0x0
 #define EEPROM_DEFAULT_TXPWDIFF_CRYSTALCAP      0x5
-#define EEPROM_DEFAULT_TXPOWERLEVEL             0x22
-#define EEPROM_DEFAULT_HT40_2SDIFF              0x0
-#define EEPROM_DEFAULT_HT20_DIFF                2
+#define EEPROM_DEFAULT_TXPOWERLEVEL                     0x22
+#define EEPROM_DEFAULT_HT40_2SDIFF                      0x0
+#define EEPROM_DEFAULT_HT20_DIFF                        2
 #define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
 #define EEPROM_DEFAULT_HT40_PWRMAXOFFSET        0
 #define EEPROM_DEFAULT_HT20_PWRMAXOFFSET        0
 
-
-#define EEPROM_DEFAULT_PID                      0x1234
-#define EEPROM_DEFAULT_VID                      0x5678
-#define EEPROM_DEFAULT_CUSTOMERID               0xAB
+#define EEPROM_DEFAULT_PID                                      0x1234
+#define EEPROM_DEFAULT_VID                                      0x5678
+#define EEPROM_DEFAULT_CUSTOMERID                       0xAB
 #define EEPROM_DEFAULT_SUBCUSTOMERID            0xCD
-#define EEPROM_DEFAULT_VERSION                  0
-
-#define EEPROM_CHANNEL_PLAN_FCC                 0x0
-#define EEPROM_CHANNEL_PLAN_IC                  0x1
-#define EEPROM_CHANNEL_PLAN_ETSI                0x2
-#define EEPROM_CHANNEL_PLAN_SPAIN               0x3
-#define EEPROM_CHANNEL_PLAN_FRANCE              0x4
-#define EEPROM_CHANNEL_PLAN_MKK                 0x5
-#define EEPROM_CHANNEL_PLAN_MKK1                0x6
-#define EEPROM_CHANNEL_PLAN_ISRAEL              0x7
-#define EEPROM_CHANNEL_PLAN_TELEC               0x8
+#define EEPROM_DEFAULT_VERSION                          0
+
+#define EEPROM_CHANNEL_PLAN_FCC                         0x0
+#define EEPROM_CHANNEL_PLAN_IC                          0x1
+#define EEPROM_CHANNEL_PLAN_ETSI                        0x2
+#define EEPROM_CHANNEL_PLAN_SPAIN                       0x3
+#define EEPROM_CHANNEL_PLAN_FRANCE                      0x4
+#define EEPROM_CHANNEL_PLAN_MKK                         0x5
+#define EEPROM_CHANNEL_PLAN_MKK1                        0x6
+#define EEPROM_CHANNEL_PLAN_ISRAEL                      0x7
+#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
-#define EEPROM_CID_TOSHIBA                      0x4
-#define EEPROM_CID_CCX                          0x10
-#define EEPROM_CID_QMI                          0x0D
-#define EEPROM_CID_WHQL                         0xFE
+#define EEPROM_CID_DEFAULT                                      0x0
+#define EEPROM_CID_TOSHIBA                                      0x4
+#define EEPROM_CID_CCX                                          0x10
+#define EEPROM_CID_QMI                                          0x0D
+#define EEPROM_CID_WHQL                                         0xFE
 
-#define RTL8192_EEPROM_ID                       0x8129
+#define RTL8192_EEPROM_ID                                       0x8129
 
-#define RTL8190_EEPROM_ID                       0x8129
-#define EEPROM_HPON                             0x02
-#define EEPROM_CLK                              0x06
-#define EEPROM_TESTR                            0x08
+#define RTL8190_EEPROM_ID                                       0x8129
+#define EEPROM_HPON                                                     0x02
+#define EEPROM_CLK                                                      0x06
+#define EEPROM_TESTR                                            0x08
 
-#define EEPROM_VID                              0x49
-#define EEPROM_DID                              0x4B
-#define EEPROM_SVID                             0x4D
-#define EEPROM_SMID                             0x4F
+#define EEPROM_VID                                                      0x49
+#define EEPROM_DID                                                      0x4B
+#define EEPROM_SVID                                                     0x4D
+#define EEPROM_SMID                                                     0x4F
 
-#define EEPROM_MAC_ADDR                         0x67
+#define EEPROM_MAC_ADDR                                         0x67
 
-#define EEPROM_CCK_TX_PWR_INX                   0x5A
-#define EEPROM_HT40_1S_TX_PWR_INX               0x60
+#define EEPROM_CCK_TX_PWR_INX                           0x5A
+#define EEPROM_HT40_1S_TX_PWR_INX                       0x60
 #define EEPROM_HT40_2S_TX_PWR_INX_DIFF          0x66
-#define EEPROM_HT20_TX_PWR_INX_DIFF             0x69
-#define EEPROM_OFDM_TX_PWR_INX_DIFF             0x6C
-#define EEPROM_HT40_MAX_PWR_OFFSET              0x25
-#define EEPROM_HT20_MAX_PWR_OFFSET              0x22
-
-#define EEPROM_THERMAL_METER                    0x2a
-#define EEPROM_XTAL_K                           0x78
-#define EEPROM_RF_OPT1                          0x79
-#define EEPROM_RF_OPT2                          0x7A
-#define EEPROM_RF_OPT3                          0x7B
-#define EEPROM_RF_OPT4                          0x7C
-#define EEPROM_CHANNEL_PLAN                     0x28
-#define EEPROM_VERSION                          0x30
-#define EEPROM_CUSTOMER_ID                      0x31
+#define EEPROM_HT20_TX_PWR_INX_DIFF                     0x69
+#define EEPROM_OFDM_TX_PWR_INX_DIFF                     0x6C
+#define EEPROM_HT40_MAX_PWR_OFFSET                      0x25
+#define EEPROM_HT20_MAX_PWR_OFFSET                      0x22
+
+#define EEPROM_THERMAL_METER                            0x2a
+#define EEPROM_XTAL_K                                           0x78
+#define EEPROM_RF_OPT1                                          0x79
+#define EEPROM_RF_OPT2                                          0x7A
+#define EEPROM_RF_OPT3                                          0x7B
+#define EEPROM_RF_OPT4                                          0x7C
+#define EEPROM_CHANNEL_PLAN                                     0x28
+#define EEPROM_VERSION                                          0x30
+#define EEPROM_CUSTOMER_ID                                      0x31
 
 #define EEPROM_PWRDIFF                          0x54
 
 #define EEPROM_TXPOWERCCK                       0x10
-#define EEPROM_TXPOWERHT40_1S                   0x16
-#define EEPROM_TXPOWERHT40_2SDIFF               0x66
-#define EEPROM_TXPOWERHT20DIFF                  0x1C
-#define EEPROM_TXPOWER_OFDMDIFF                 0x1F
+#define EEPROM_TXPOWERHT40_1S           0x16
+#define EEPROM_TXPOWERHT40_2SDIFF       0x66
+#define EEPROM_TXPOWERHT20DIFF          0x1C
+#define EEPROM_TXPOWER_OFDMDIFF         0x1F
 
 #define EEPROM_TXPWR_GROUP                      0x22
 
@@ -649,169 +672,169 @@
 
 #define EEPROM_CHANNELPLAN                      0x28
 
-#define RF_OPTION1                              0x2B
-#define RF_OPTION2                              0x2C
-#define RF_OPTION3                              0x2D
-#define RF_OPTION4                              0x2E
-
-#define STOPBECON                               BIT(6)
-#define STOPHIGHT                               BIT(5)
-#define STOPMGT                                 BIT(4)
-#define STOPVO                                  BIT(3)
-#define STOPVI                                  BIT(2)
-#define STOPBE                                  BIT(1)
-#define STOPBK                                  BIT(0)
-
-#define RCR_APPFCS                              BIT(31)
-#define RCR_APP_MIC                             BIT(30)
-#define RCR_APP_ICV                             BIT(29)
+#define RF_OPTION1                                      0x2B
+#define RF_OPTION2                                      0x2C
+#define RF_OPTION3                                      0x2D
+#define RF_OPTION4                                      0x2E
+
+#define STOPBECON                                       BIT(6)
+#define STOPHIGHT                                       BIT(5)
+#define STOPMGT                                         BIT(4)
+#define STOPVO                                          BIT(3)
+#define STOPVI                                          BIT(2)
+#define STOPBE                                          BIT(1)
+#define STOPBK                                          BIT(0)
+
+#define RCR_APPFCS                                      BIT(31)
+#define RCR_APP_MIC                                     BIT(30)
+#define RCR_APP_ICV                                     BIT(29)
 #define RCR_APP_PHYST_RXFF                      BIT(28)
 #define RCR_APP_BA_SSN                          BIT(27)
-#define RCR_ENMBID                              BIT(24)
-#define RCR_LSIGEN                              BIT(23)
-#define RCR_MFBEN                               BIT(22)
+#define RCR_ENMBID                                      BIT(24)
+#define RCR_LSIGEN                                      BIT(23)
+#define RCR_MFBEN                                       BIT(22)
 #define RCR_HTC_LOC_CTRL                        BIT(14)
-#define RCR_AMF                                 BIT(13)
-#define RCR_ACF                                 BIT(12)
-#define RCR_ADF                                 BIT(11)
-#define RCR_AICV                                BIT(9)
-#define RCR_ACRC32                              BIT(8)
+#define RCR_AMF                                         BIT(13)
+#define RCR_ACF                                         BIT(12)
+#define RCR_ADF                                         BIT(11)
+#define RCR_AICV                                        BIT(9)
+#define RCR_ACRC32                                      BIT(8)
 #define RCR_CBSSID_BCN                          BIT(7)
 #define RCR_CBSSID_DATA                         BIT(6)
-#define RCR_CBSSID                              RCR_CBSSID_DATA
-#define RCR_APWRMGT                             BIT(5)
-#define RCR_ADD3                                BIT(4)
-#define RCR_AB                                  BIT(3)
-#define RCR_AM                                  BIT(2)
-#define RCR_APM                                 BIT(1)
-#define RCR_AAP                                 BIT(0)
+#define RCR_CBSSID                                      RCR_CBSSID_DATA
+#define RCR_APWRMGT                                     BIT(5)
+#define RCR_ADD3                                        BIT(4)
+#define RCR_AB                                          BIT(3)
+#define RCR_AM                                          BIT(2)
+#define RCR_APM                                         BIT(1)
+#define RCR_AAP                                         BIT(0)
 #define RCR_MXDMA_OFFSET                        8
 #define RCR_FIFO_OFFSET                         13
 
-#define RSV_CTRL                                0x001C
-#define RD_CTRL                                 0x0524
+#define RSV_CTRL                                        0x001C
+#define RD_CTRL                                         0x0524
 
 #define REG_USB_INFO                            0xFE17
-#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_SPECIAL_OPTION          0xFE55
 #define REG_USB_DMA_AGG_TO                      0xFE5B
 #define REG_USB_AGG_TO                          0xFE5C
 #define REG_USB_AGG_TH                          0xFE5D
 
-#define REG_USB_VID                             0xFE60
-#define REG_USB_PID                             0xFE62
+#define REG_USB_VID                                     0xFE60
+#define REG_USB_PID                                     0xFE62
 #define REG_USB_OPTIONAL                        0xFE64
 #define REG_USB_CHIRP_K                         0xFE65
-#define REG_USB_PHY                             0xFE66
+#define REG_USB_PHY                                     0xFE66
 #define REG_USB_MAC_ADDR                        0xFE70
 #define REG_USB_HRPWM                           0xFE58
 #define REG_USB_HCPWM                           0xFE57
 
-#define SW18_FPWM                               BIT(3)
-
-#define ISO_MD2PP                               BIT(0)
-#define ISO_UA2USB                              BIT(1)
-#define ISO_UD2CORE                             BIT(2)
-#define ISO_PA2PCIE                             BIT(3)
-#define ISO_PD2CORE                             BIT(4)
-#define ISO_IP2MAC                              BIT(5)
-#define ISO_DIOP                                BIT(6)
-#define ISO_DIOE                                BIT(7)
-#define ISO_EB2CORE                             BIT(8)
-#define ISO_DIOR                                BIT(9)
-
-#define PWC_EV25V                               BIT(14)
-#define PWC_EV12V                               BIT(15)
-
-#define FEN_BBRSTB                              BIT(0)
-#define FEN_BB_GLB_RSTn                         BIT(1)
-#define FEN_USBA                                BIT(2)
-#define FEN_UPLL                                BIT(3)
-#define FEN_USBD                                BIT(4)
+#define SW18_FPWM                                       BIT(3)
+
+#define ISO_MD2PP                                       BIT(0)
+#define ISO_UA2USB                                      BIT(1)
+#define ISO_UD2CORE                                     BIT(2)
+#define ISO_PA2PCIE                                     BIT(3)
+#define ISO_PD2CORE                                     BIT(4)
+#define ISO_IP2MAC                                      BIT(5)
+#define ISO_DIOP                                        BIT(6)
+#define ISO_DIOE                                        BIT(7)
+#define ISO_EB2CORE                                     BIT(8)
+#define ISO_DIOR                                        BIT(9)
+
+#define PWC_EV25V                                       BIT(14)
+#define PWC_EV12V                                       BIT(15)
+
+#define FEN_BBRSTB                                      BIT(0)
+#define FEN_BB_GLB_RSTN                         BIT(1)
+#define FEN_USBA                                        BIT(2)
+#define FEN_UPLL                                        BIT(3)
+#define FEN_USBD                                        BIT(4)
 #define FEN_DIO_PCIE                            BIT(5)
-#define FEN_PCIEA                               BIT(6)
-#define FEN_PPLL                                BIT(7)
-#define FEN_PCIED                               BIT(8)
-#define FEN_DIOE                                BIT(9)
-#define FEN_CPUEN                               BIT(10)
-#define FEN_DCORE                               BIT(11)
-#define FEN_ELDR                                BIT(12)
-#define FEN_DIO_RF                              BIT(13)
-#define FEN_HWPDN                               BIT(14)
-#define FEN_MREGEN                              BIT(15)
-
-#define PFM_LDALL                               BIT(0)
-#define PFM_ALDN                                BIT(1)
-#define PFM_LDKP                                BIT(2)
-#define PFM_WOWL                                BIT(3)
-#define EnPDN                                   BIT(4)
-#define PDN_PL                                  BIT(5)
-#define APFM_ONMAC                              BIT(8)
-#define APFM_OFF                                BIT(9)
-#define APFM_RSM                                BIT(10)
-#define AFSM_HSUS                               BIT(11)
-#define AFSM_PCIE                               BIT(12)
-#define APDM_MAC                                BIT(13)
-#define APDM_HOST                               BIT(14)
-#define APDM_HPDN                               BIT(15)
-#define RDY_MACON                               BIT(16)
-#define SUS_HOST                                BIT(17)
-#define ROP_ALD                                 BIT(20)
-#define ROP_PWR                                 BIT(21)
-#define ROP_SPS                                 BIT(22)
-#define SOP_MRST                                BIT(25)
-#define SOP_FUSE                                BIT(26)
-#define SOP_ABG                                 BIT(27)
-#define SOP_AMB                                 BIT(28)
-#define SOP_RCK                                 BIT(29)
-#define SOP_A8M                                 BIT(30)
-#define XOP_BTCK                                BIT(31)
-
-#define ANAD16V_EN                              BIT(0)
-#define ANA8M                                   BIT(1)
-#define MACSLP                                  BIT(4)
+#define FEN_PCIEA                                       BIT(6)
+#define FEN_PPLL                                        BIT(7)
+#define FEN_PCIED                                       BIT(8)
+#define FEN_DIOE                                        BIT(9)
+#define FEN_CPUEN                                       BIT(10)
+#define FEN_DCORE                                       BIT(11)
+#define FEN_ELDR                                        BIT(12)
+#define FEN_DIO_RF                                      BIT(13)
+#define FEN_HWPDN                                       BIT(14)
+#define FEN_MREGEN                                      BIT(15)
+
+#define PFM_LDALL                                       BIT(0)
+#define PFM_ALDN                                        BIT(1)
+#define PFM_LDKP                                        BIT(2)
+#define PFM_WOWL                                        BIT(3)
+#define ENPDN                                           BIT(4)
+#define PDN_PL                                          BIT(5)
+#define APFM_ONMAC                                      BIT(8)
+#define APFM_OFF                                        BIT(9)
+#define APFM_RSM                                        BIT(10)
+#define AFSM_HSUS                                       BIT(11)
+#define AFSM_PCIE                                       BIT(12)
+#define APDM_MAC                                        BIT(13)
+#define APDM_HOST                                       BIT(14)
+#define APDM_HPDN                                       BIT(15)
+#define RDY_MACON                                       BIT(16)
+#define SUS_HOST                                        BIT(17)
+#define ROP_ALD                                         BIT(20)
+#define ROP_PWR                                         BIT(21)
+#define ROP_SPS                                         BIT(22)
+#define SOP_MRST                                        BIT(25)
+#define SOP_FUSE                                        BIT(26)
+#define SOP_ABG                                         BIT(27)
+#define SOP_AMB                                         BIT(28)
+#define SOP_RCK                                         BIT(29)
+#define SOP_A8M                                         BIT(30)
+#define XOP_BTCK                                        BIT(31)
+
+#define ANAD16V_EN                                      BIT(0)
+#define ANA8M                                           BIT(1)
+#define MACSLP                                          BIT(4)
 #define LOADER_CLK_EN                           BIT(5)
 #define _80M_SSC_DIS                            BIT(7)
 #define _80M_SSC_EN_HO                          BIT(8)
 #define PHY_SSC_RSTB                            BIT(9)
-#define SEC_CLK_EN                              BIT(10)
-#define MAC_CLK_EN                              BIT(11)
-#define SYS_CLK_EN                              BIT(12)
-#define RING_CLK_EN                             BIT(13)
+#define SEC_CLK_EN                                      BIT(10)
+#define MAC_CLK_EN                                      BIT(11)
+#define SYS_CLK_EN                                      BIT(12)
+#define RING_CLK_EN                                     BIT(13)
 
 #define BOOT_FROM_EEPROM                        BIT(4)
-#define EEPROM_EN                               BIT(5)
+#define EEPROM_EN                                       BIT(5)
 
-#define AFE_BGEN                                BIT(0)
-#define AFE_MBEN                                BIT(1)
-#define MAC_ID_EN                               BIT(7)
+#define AFE_BGEN                                        BIT(0)
+#define AFE_MBEN                                        BIT(1)
+#define MAC_ID_EN                                       BIT(7)
 
-#define WLOCK_ALL                               BIT(0)
-#define WLOCK_00                                BIT(1)
-#define WLOCK_04                                BIT(2)
-#define WLOCK_08                                BIT(3)
-#define WLOCK_40                                BIT(4)
+#define WLOCK_ALL                                       BIT(0)
+#define WLOCK_00                                        BIT(1)
+#define WLOCK_04                                        BIT(2)
+#define WLOCK_08                                        BIT(3)
+#define WLOCK_40                                        BIT(4)
 #define R_DIS_PRST_0                            BIT(5)
 #define R_DIS_PRST_1                            BIT(6)
-#define LOCK_ALL_EN                             BIT(7)
+#define LOCK_ALL_EN                                     BIT(7)
 
-#define RF_EN                                   BIT(0)
-#define RF_RSTB                                 BIT(1)
-#define RF_SDMRSTB                              BIT(2)
+#define RF_EN                                           BIT(0)
+#define RF_RSTB                                         BIT(1)
+#define RF_SDMRSTB                                      BIT(2)
 
-#define LDA15_EN                                BIT(0)
-#define LDA15_STBY                              BIT(1)
-#define LDA15_OBUF                              BIT(2)
+#define LDA15_EN                                        BIT(0)
+#define LDA15_STBY                                      BIT(1)
+#define LDA15_OBUF                                      BIT(2)
 #define LDA15_REG_VOS                           BIT(3)
 #define _LDA15_VOADJ(x)                         (((x) & 0x7) << 4)
 
-#define LDV12_EN                                BIT(0)
-#define LDV12_SDBY                              BIT(1)
-#define LPLDO_HSM                               BIT(2)
+#define LDV12_EN                                        BIT(0)
+#define LDV12_SDBY                                      BIT(1)
+#define LPLDO_HSM                                       BIT(2)
 #define LPLDO_LSM_DIS                           BIT(3)
 #define _LDV12_VADJ(x)                          (((x) & 0xF) << 4)
 
-#define XTAL_EN                                 BIT(0)
-#define XTAL_BSEL                               BIT(1)
+#define XTAL_EN                                         BIT(0)
+#define XTAL_BSEL                                       BIT(1)
 #define _XTAL_BOSC(x)                           (((x) & 0x3) << 2)
 #define _XTAL_CADJ(x)                           (((x) & 0xF) << 4)
 #define XTAL_GATE_USB                           BIT(8)
@@ -826,146 +849,146 @@
 #define _XTAL_BT_DRV(x)                         (((x) & 0x3) << 21)
 #define _XTAL_GPIO(x)                           (((x) & 0x7) << 23)
 
-#define CKDLY_AFE                               BIT(26)
-#define CKDLY_USB                               BIT(27)
-#define CKDLY_DIG                               BIT(28)
-#define CKDLY_BT                                BIT(29)
+#define CKDLY_AFE                                       BIT(26)
+#define CKDLY_USB                                       BIT(27)
+#define CKDLY_DIG                                       BIT(28)
+#define CKDLY_BT                                        BIT(29)
 
-#define APLL_EN                                 BIT(0)
-#define APLL_320_EN                             BIT(1)
+#define APLL_EN                                         BIT(0)
+#define APLL_320_EN                                     BIT(1)
 #define APLL_FREF_SEL                           BIT(2)
 #define APLL_EDGE_SEL                           BIT(3)
-#define APLL_WDOGB                              BIT(4)
-#define APLL_LPFEN                              BIT(5)
+#define APLL_WDOGB                                      BIT(4)
+#define APLL_LPFEN                                      BIT(5)
 
 #define APLL_REF_CLK_13MHZ                      0x1
-#define APLL_REF_CLK_19_2MHZ                    0x2
+#define APLL_REF_CLK_19_2MHZ            0x2
 #define APLL_REF_CLK_20MHZ                      0x3
 #define APLL_REF_CLK_25MHZ                      0x4
 #define APLL_REF_CLK_26MHZ                      0x5
-#define APLL_REF_CLK_38_4MHZ                    0x6
+#define APLL_REF_CLK_38_4MHZ            0x6
 #define APLL_REF_CLK_40MHZ                      0x7
 
-#define APLL_320EN                              BIT(14)
-#define APLL_80EN                               BIT(15)
-#define APLL_1MEN                               BIT(24)
-
-#define ALD_EN                                  BIT(18)
-#define EF_PD                                   BIT(19)
-#define EF_FLAG                                 BIT(31)
-
-#define EF_TRPT                                 BIT(7)
-#define LDOE25_EN                               BIT(31)
-
-#define RSM_EN                                  BIT(0)
-#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 SIC_SWRST                               BIT(11)
-#define EnSIC                                   BIT(12)
-#define SIC_23                                  BIT(13)
-#define EnHDP                                   BIT(14)
-#define SIC_LBK                                 BIT(15)
-
-#define LED0PL                                  BIT(4)
-#define LED1PL                                  BIT(12)
-#define LED0DIS                                 BIT(7)
-
-#define MCUFWDL_EN                              BIT(0)
-#define MCUFWDL_RDY                             BIT(1)
-#define FWDL_ChkSum_rpt                         BIT(2)
-#define MACINI_RDY                              BIT(3)
-#define BBINI_RDY                               BIT(4)
-#define RFINI_RDY                               BIT(5)
-#define WINTINI_RDY                             BIT(6)
-#define CPRST                                   BIT(23)
-
-#define XCLK_VLD                                BIT(0)
-#define ACLK_VLD                                BIT(1)
-#define UCLK_VLD                                BIT(2)
-#define PCLK_VLD                                BIT(3)
-#define PCIRSTB                                 BIT(4)
-#define V15_VLD                                 BIT(5)
-#define TRP_B15V_EN                             BIT(7)
-#define SIC_IDLE                                BIT(8)
-#define BD_MAC2                                 BIT(9)
-#define BD_MAC1                                 BIT(10)
+#define APLL_320EN                                      BIT(14)
+#define APLL_80EN                                       BIT(15)
+#define APLL_1MEN                                       BIT(24)
+
+#define ALD_EN                                          BIT(18)
+#define EF_PD                                           BIT(19)
+#define EF_FLAG                                         BIT(31)
+
+#define EF_TRPT                                         BIT(7)
+#define LDOE25_EN                                       BIT(31)
+
+#define RSM_EN                                          BIT(0)
+#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 SIC_SWRST                                       BIT(11)
+#define ENSIC                                           BIT(12)
+#define SIC_23                                          BIT(13)
+#define ENHDP                                           BIT(14)
+#define SIC_LBK                                         BIT(15)
+
+#define LED0PL                                          BIT(4)
+#define LED1PL                                          BIT(12)
+#define LED0DIS                                         BIT(7)
+
+#define MCUFWDL_EN                                      BIT(0)
+#define MCUFWDL_RDY                                     BIT(1)
+#define FWDL_CHKSUM_RPT                         BIT(2)
+#define MACINI_RDY                                      BIT(3)
+#define BBINI_RDY                                       BIT(4)
+#define RFINI_RDY                                       BIT(5)
+#define WINTINI_RDY                                     BIT(6)
+#define CPRST                                           BIT(23)
+
+#define XCLK_VLD                                        BIT(0)
+#define ACLK_VLD                                        BIT(1)
+#define UCLK_VLD                                        BIT(2)
+#define PCLK_VLD                                        BIT(3)
+#define PCIRSTB                                         BIT(4)
+#define V15_VLD                                         BIT(5)
+#define TRP_B15V_EN                                     BIT(7)
+#define SIC_IDLE                                        BIT(8)
+#define BD_MAC2                                         BIT(9)
+#define BD_MAC1                                         BIT(10)
 #define IC_MACPHY_MODE                          BIT(11)
-#define BT_FUNC                                 BIT(16)
-#define VENDOR_ID                               BIT(19)
+#define BT_FUNC                                         BIT(16)
+#define VENDOR_ID                                       BIT(19)
 #define PAD_HWPD_IDN                            BIT(22)
-#define TRP_VAUX_EN                             BIT(23)
-#define TRP_BT_EN                               BIT(24)
-#define BD_PKG_SEL                              BIT(25)
-#define BD_HCI_SEL                              BIT(26)
-#define TYPE_ID                                 BIT(27)
+#define TRP_VAUX_EN                                     BIT(23)
+#define TRP_BT_EN                                       BIT(24)
+#define BD_PKG_SEL                                      BIT(25)
+#define BD_HCI_SEL                                      BIT(26)
+#define TYPE_ID                                         BIT(27)
 
 #define CHIP_VER_RTL_MASK                       0xF000
 #define CHIP_VER_RTL_SHIFT                      12
 
-#define REG_LBMODE                              (REG_CR + 3)
+#define REG_LBMODE                                      (REG_CR + 3)
 
 #define HCI_TXDMA_EN                            BIT(0)
 #define HCI_RXDMA_EN                            BIT(1)
-#define TXDMA_EN                                BIT(2)
-#define RXDMA_EN                                BIT(3)
-#define PROTOCOL_EN                             BIT(4)
-#define SCHEDULE_EN                             BIT(5)
-#define MACTXEN                                 BIT(6)
-#define MACRXEN                                 BIT(7)
-#define ENSWBCN                                 BIT(8)
-#define ENSEC                                   BIT(9)
-
-#define _NETTYPE(x)                             (((x) & 0x3) << 16)
+#define TXDMA_EN                                        BIT(2)
+#define RXDMA_EN                                        BIT(3)
+#define PROTOCOL_EN                                     BIT(4)
+#define SCHEDULE_EN                                     BIT(5)
+#define MACTXEN                                         BIT(6)
+#define MACRXEN                                         BIT(7)
+#define ENSWBCN                                         BIT(8)
+#define ENSEC                                           BIT(9)
+
+#define _NETTYPE(x)                                     (((x) & 0x3) << 16)
 #define MASK_NETTYPE                            0x30000
-#define NT_NO_LINK                              0x0
+#define NT_NO_LINK                                      0x0
 #define NT_LINK_AD_HOC                          0x1
-#define NT_LINK_AP                              0x2
-#define NT_AS_AP                                0x3
+#define NT_LINK_AP                                      0x2
+#define NT_AS_AP                                        0x3
 
-#define _LBMODE(x)                              (((x) & 0xF) << 24)
-#define MASK_LBMODE                             0xF000000
+#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
 
-#define GET_RX_PAGE_SIZE(value)                 ((value) & 0xF)
-#define GET_TX_PAGE_SIZE(value)                 (((value) & 0xF0) >> 4)
-#define _PSRX_MASK                              0xF
-#define _PSTX_MASK                              0xF0
-#define _PSRX(x)                                (x)
-#define _PSTX(x)                                ((x) << 4)
+#define GET_RX_PAGE_SIZE(value)         ((value) & 0xF)
+#define GET_TX_PAGE_SIZE(value)         (((value) & 0xF0) >> 4)
+#define _PSRX_MASK                                      0xF
+#define _PSTX_MASK                                      0xF0
+#define _PSRX(x)                                        (x)
+#define _PSTX(x)                                        ((x) << 4)
 
-#define PBP_64                                  0x0
-#define PBP_128                                 0x1
-#define PBP_256                                 0x2
-#define PBP_512                                 0x3
-#define PBP_1024                                0x4
+#define PBP_64                                          0x0
+#define PBP_128                                         0x1
+#define PBP_256                                         0x2
+#define PBP_512                                         0x3
+#define PBP_1024                                        0x4
 
 #define RXDMA_ARBBW_EN                          BIT(0)
-#define RXSHFT_EN                               BIT(1)
+#define RXSHFT_EN                                       BIT(1)
 #define RXDMA_AGG_EN                            BIT(2)
-#define QS_VO_QUEUE                             BIT(8)
-#define QS_VI_QUEUE                             BIT(9)
-#define QS_BE_QUEUE                             BIT(10)
-#define QS_BK_QUEUE                             BIT(11)
+#define QS_VO_QUEUE                                     BIT(8)
+#define QS_VI_QUEUE                                     BIT(9)
+#define QS_BE_QUEUE                                     BIT(10)
+#define QS_BK_QUEUE                                     BIT(11)
 #define QS_MANAGER_QUEUE                        BIT(12)
 #define QS_HIGH_QUEUE                           BIT(13)
 
-#define HQSEL_VOQ                               BIT(0)
-#define HQSEL_VIQ                               BIT(1)
-#define HQSEL_BEQ                               BIT(2)
-#define HQSEL_BKQ                               BIT(3)
-#define HQSEL_MGTQ                              BIT(4)
-#define HQSEL_HIQ                               BIT(5)
+#define HQSEL_VOQ                                       BIT(0)
+#define HQSEL_VIQ                                       BIT(1)
+#define HQSEL_BEQ                                       BIT(2)
+#define HQSEL_BKQ                                       BIT(3)
+#define HQSEL_MGTQ                                      BIT(4)
+#define HQSEL_HIQ                                       BIT(5)
 
 #define _TXDMA_HIQ_MAP(x)                       (((x)&0x3) << 14)
 #define _TXDMA_MGQ_MAP(x)                       (((x)&0x3) << 12)
@@ -974,9 +997,9 @@
 #define _TXDMA_VIQ_MAP(x)                       (((x)&0x3) << 6)
 #define _TXDMA_VOQ_MAP(x)                       (((x)&0x3) << 4)
 
-#define QUEUE_LOW                               1
+#define QUEUE_LOW                                       1
 #define QUEUE_NORMAL                            2
-#define QUEUE_HIGH                              3
+#define QUEUE_HIGH                                      3
 
 #define _LLT_NO_ACTIVE                          0x0
 #define _LLT_WRITE_ACCESS                       0x1
@@ -984,25 +1007,25 @@
 
 #define _LLT_INIT_DATA(x)                       ((x) & 0xFF)
 #define _LLT_INIT_ADDR(x)                       (((x) & 0xFF) << 8)
-#define _LLT_OP(x)                              (((x) & 0x3) << 30)
+#define _LLT_OP(x)                                      (((x) & 0x3) << 30)
 #define _LLT_OP_VALUE(x)                        (((x) >> 30) & 0x3)
 
 #define BB_WRITE_READ_MASK                      (BIT(31) | BIT(30))
-#define BB_WRITE_EN                             BIT(30)
-#define BB_READ_EN                              BIT(31)
+#define BB_WRITE_EN                                     BIT(30)
+#define BB_READ_EN                                      BIT(31)
 
-#define _HPQ(x)                                 ((x) & 0xFF)
-#define _LPQ(x)                                 (((x) & 0xFF) << 8)
-#define _PUBQ(x)                                (((x) & 0xFF) << 16)
-#define _NPQ(x)                                 ((x) & 0xFF)
+#define _HPQ(x)                 ((x) & 0xFF)
+#define _LPQ(x)                 (((x) & 0xFF) << 8)
+#define _PUBQ(x)                (((x) & 0xFF) << 16)
+#define _NPQ(x)                 ((x) & 0xFF)
 
-#define HPQ_PUBLIC_DIS                          BIT(24)
-#define LPQ_PUBLIC_DIS                          BIT(25)
-#define LD_RQPN                                 BIT(31)
+#define HPQ_PUBLIC_DIS          BIT(24)
+#define LPQ_PUBLIC_DIS          BIT(25)
+#define LD_RQPN                 BIT(31)
 
-#define BCN_VALID                               BIT(16)
-#define BCN_HEAD(x)                             (((x) & 0xFF) << 8)
-#define BCN_HEAD_MASK                           0xFF00
+#define BCN_VALID               BIT(16)
+#define BCN_HEAD(x)             (((x) & 0xFF) << 8)
+#define BCN_HEAD_MASK           0xFF00
 
 #define BLK_DESC_NUM_SHIFT                      4
 #define BLK_DESC_NUM_MASK                       0xF
@@ -1022,9 +1045,9 @@
 
 #define _RRSR_RSC(x)                            (((x) & 0x3) << 21)
 #define RRSR_RSC_RESERVED                       0x0
-#define RRSR_RSC_UPPER_SUBCHANNEL               0x1
-#define RRSR_RSC_LOWER_SUBCHANNEL               0x2
-#define RRSR_RSC_DUPLICATE_MODE                 0x3
+#define RRSR_RSC_UPPER_SUBCHANNEL       0x1
+#define RRSR_RSC_LOWER_SUBCHANNEL       0x2
+#define RRSR_RSC_DUPLICATE_MODE         0x3
 
 #define USE_SHORT_G1                            BIT(20)
 
@@ -1037,8 +1060,8 @@
 #define _AGGLMT_MCS6(x)                         (((x) & 0xF) << 24)
 #define _AGGLMT_MCS7(x)                         (((x) & 0xF) << 28)
 
-#define RETRY_LIMIT_SHORT_SHIFT                 8
-#define RETRY_LIMIT_LONG_SHIFT                  0
+#define RETRY_LIMIT_SHORT_SHIFT         8
+#define RETRY_LIMIT_LONG_SHIFT          0
 
 #define _DARF_RC1(x)                            ((x) & 0x1F)
 #define _DARF_RC2(x)                            (((x) & 0x1F) << 8)
@@ -1058,123 +1081,123 @@
 #define _RARF_RC7(x)                            (((x) & 0x1F) << 16)
 #define _RARF_RC8(x)                            (((x) & 0x1F) << 24)
 
-#define AC_PARAM_TXOP_LIMIT_OFFSET              16
-#define AC_PARAM_ECW_MAX_OFFSET                 12
-#define AC_PARAM_ECW_MIN_OFFSET                 8
-#define AC_PARAM_AIFS_OFFSET                    0
+#define AC_PARAM_TXOP_LIMIT_OFFSET      16
+#define AC_PARAM_ECW_MAX_OFFSET         12
+#define AC_PARAM_ECW_MIN_OFFSET         8
+#define AC_PARAM_AIFS_OFFSET            0
 
-#define _AIFS(x)                                (x)
+#define _AIFS(x)                                        (x)
 #define _ECW_MAX_MIN(x)                         ((x) << 8)
 #define _TXOP_LIMIT(x)                          ((x) << 16)
 
-#define _BCNIFS(x)                              ((x) & 0xFF)
-#define _BCNECW(x)                              ((((x) & 0xF)) << 8)
+#define _BCNIFS(x)                                      ((x) & 0xFF)
+#define _BCNECW(x)                                      ((((x) & 0xF)) << 8)
 
-#define _LRL(x)                                 ((x) & 0x3F)
-#define _SRL(x)                                 (((x) & 0x3F) << 8)
+#define _LRL(x)                                         ((x) & 0x3F)
+#define _SRL(x)                                         (((x) & 0x3F) << 8)
 
 #define _SIFS_CCK_CTX(x)                        ((x) & 0xFF)
-#define _SIFS_CCK_TRX(x)                        (((x) & 0xFF) << 8);
+#define _SIFS_CCK_TRX(x)                        (((x) & 0xFF) << 8)
 
 #define _SIFS_OFDM_CTX(x)                       ((x) & 0xFF)
-#define _SIFS_OFDM_TRX(x)                       (((x) & 0xFF) << 8);
+#define _SIFS_OFDM_TRX(x)                       (((x) & 0xFF) << 8)
 
-#define _TBTT_PROHIBIT_HOLD(x)                  (((x) & 0xFF) << 8)
+#define _TBTT_PROHIBIT_HOLD(x)          (((x) & 0xFF) << 8)
 
 #define DIS_EDCA_CNT_DWN                        BIT(11)
 
-#define EN_MBSSID                               BIT(1)
+#define EN_MBSSID                                       BIT(1)
 #define EN_TXBCN_RPT                            BIT(2)
 #define EN_BCN_FUNCTION                         BIT(3)
 
-#define TSFTR_RST                               BIT(0)
-#define TSFTR1_RST                              BIT(1)
+#define TSFTR_RST                                       BIT(0)
+#define TSFTR1_RST                                      BIT(1)
 
-#define STOP_BCNQ                               BIT(6)
+#define STOP_BCNQ                                       BIT(6)
 
-#define DIS_TSF_UDT0_NORMAL_CHIP                BIT(4)
-#define DIS_TSF_UDT0_TEST_CHIP                  BIT(5)
+#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                                         BIT(6)
 #define APSDOFF_STATUS                          BIT(7)
 
-#define BW_20MHZ                                BIT(2)
+#define BW_20MHZ                                        BIT(2)
 
 #define RATE_BITMAP_ALL                         0xFFFFF
 
-#define RATE_RRSR_CCK_ONLY_1M                   0xFFFF1
+#define RATE_RRSR_CCK_ONLY_1M           0xFFFF1
 
-#define TSFRST                                  BIT(0)
-#define DIS_GCLK                                BIT(1)
-#define PAD_SEL                                 BIT(2)
-#define PWR_ST                                  BIT(6)
+#define TSFRST                                          BIT(0)
+#define DIS_GCLK                                        BIT(1)
+#define PAD_SEL                                         BIT(2)
+#define PWR_ST                                          BIT(6)
 #define PWRBIT_OW_EN                            BIT(7)
-#define ACRC                                    BIT(8)
-#define CFENDFORM                               BIT(9)
-#define ICV                                     BIT(10)
-
-#define AAP                                     BIT(0)
-#define APM                                     BIT(1)
-#define AM                                      BIT(2)
-#define AB                                      BIT(3)
-#define ADD3                                    BIT(4)
-#define APWRMGT                                 BIT(5)
-#define CBSSID                                  BIT(6)
-#define CBSSID_DATA                             BIT(6)
-#define CBSSID_BCN                              BIT(7)
-#define ACRC32                                  BIT(8)
-#define AICV                                    BIT(9)
-#define ADF                                     BIT(11)
-#define ACF                                     BIT(12)
-#define AMF                                     BIT(13)
+#define ACRC                                            BIT(8)
+#define CFENDFORM                                       BIT(9)
+#define ICV                                                     BIT(10)
+
+#define AAP                                                     BIT(0)
+#define APM                                                     BIT(1)
+#define AM                                                      BIT(2)
+#define AB                                                      BIT(3)
+#define ADD3                                            BIT(4)
+#define APWRMGT                                         BIT(5)
+#define CBSSID                                          BIT(6)
+#define CBSSID_DATA                                     BIT(6)
+#define CBSSID_BCN                                      BIT(7)
+#define ACRC32                                          BIT(8)
+#define AICV                                            BIT(9)
+#define ADF                                                     BIT(11)
+#define ACF                                                     BIT(12)
+#define AMF                                                     BIT(13)
 #define HTC_LOC_CTRL                            BIT(14)
-#define UC_DATA_EN                              BIT(16)
-#define BM_DATA_EN                              BIT(17)
-#define MFBEN                                   BIT(22)
-#define LSIGEN                                  BIT(23)
-#define EnMBID                                  BIT(24)
-#define APP_BASSN                               BIT(27)
-#define APP_PHYSTS                              BIT(28)
-#define APP_ICV                                 BIT(29)
-#define APP_MIC                                 BIT(30)
-#define APP_FCS                                 BIT(31)
+#define UC_DATA_EN                                      BIT(16)
+#define BM_DATA_EN                                      BIT(17)
+#define MFBEN                                           BIT(22)
+#define LSIGEN                                          BIT(23)
+#define ENMBID                                          BIT(24)
+#define APP_BASSN                                       BIT(27)
+#define APP_PHYSTS                                      BIT(28)
+#define APP_ICV                                         BIT(29)
+#define APP_MIC                                         BIT(30)
+#define APP_FCS                                         BIT(31)
 
 #define _MIN_SPACE(x)                           ((x) & 0x7)
-#define _SHORT_GI_PADDING(x)                    (((x) & 0x1F) << 3)
+#define _SHORT_GI_PADDING(x)            (((x) & 0x1F) << 3)
 
-#define RXERR_TYPE_OFDM_PPDU                    0
-#define RXERR_TYPE_OFDM_FALSE_ALARM             1
-#define RXERR_TYPE_OFDM_MPDU_OK                 2
-#define RXERR_TYPE_OFDM_MPDU_FAIL               3
+#define RXERR_TYPE_OFDM_PPDU            0
+#define RXERR_TYPE_OFDM_FALSE_ALARM     1
+#define RXERR_TYPE_OFDM_MPDU_OK         2
+#define RXERR_TYPE_OFDM_MPDU_FAIL       3
 #define RXERR_TYPE_CCK_PPDU                     4
-#define RXERR_TYPE_CCK_FALSE_ALARM              5
-#define RXERR_TYPE_CCK_MPDU_OK                  6
-#define RXERR_TYPE_CCK_MPDU_FAIL                7
+#define RXERR_TYPE_CCK_FALSE_ALARM      5
+#define RXERR_TYPE_CCK_MPDU_OK          6
+#define RXERR_TYPE_CCK_MPDU_FAIL        7
 #define RXERR_TYPE_HT_PPDU                      8
-#define RXERR_TYPE_HT_FALSE_ALARM               9
-#define RXERR_TYPE_HT_MPDU_TOTAL                10
-#define RXERR_TYPE_HT_MPDU_OK                   11
-#define RXERR_TYPE_HT_MPDU_FAIL                 12
-#define RXERR_TYPE_RX_FULL_DROP                 15
+#define RXERR_TYPE_HT_FALSE_ALARM       9
+#define RXERR_TYPE_HT_MPDU_TOTAL        10
+#define RXERR_TYPE_HT_MPDU_OK           11
+#define RXERR_TYPE_HT_MPDU_FAIL         12
+#define RXERR_TYPE_RX_FULL_DROP         15
 
 #define RXERR_COUNTER_MASK                      0xFFFFF
 #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 _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_TXBCUSEDK                           BIT(6)
 #define SCR_RXBCUSEDK                           BIT(7)
 
@@ -1182,32 +1205,32 @@
 #define USB_IS_FULL_SPEED                       1
 #define USB_SPEED_MASK                          BIT(5)
 
-#define USB_NORMAL_SIE_EP_MASK                  0xF
-#define USB_NORMAL_SIE_EP_SHIFT                 4
+#define USB_NORMAL_SIE_EP_MASK          0xF
+#define USB_NORMAL_SIE_EP_SHIFT         4
 
 #define USB_TEST_EP_MASK                        0x30
 #define USB_TEST_EP_SHIFT                       4
 
-#define USB_AGG_EN                              BIT(3)
+#define USB_AGG_EN                                      BIT(3)
 
 #define MAC_ADDR_LEN                            6
-#define LAST_ENTRY_OF_TX_PKT_BUFFER             255
+#define LAST_ENTRY_OF_TX_PKT_BUFFER     255
 
-#define POLLING_LLT_THRESHOLD                   20
-#define POLLING_READY_TIMEOUT_COUNT             1000
+#define POLLING_LLT_THRESHOLD           20
+#define POLLING_READY_TIMEOUT_COUNT     1000
 
 #define MAX_MSS_DENSITY_2T                      0x13
 #define MAX_MSS_DENSITY_1T                      0x0A
 
-#define EPROM_CMD_OPERATING_MODE_MASK           ((1<<7)|(1<<6))
+#define EPROM_CMD_OPERATING_MODE_MASK   ((1<<7)|(1<<6))
 #define EPROM_CMD_CONFIG                        0x3
 #define EPROM_CMD_LOAD                          1
 
 #define HWSET_MAX_SIZE_92S                      HWSET_MAX_SIZE
 
-#define HAL_8192C_HW_GPIO_WPS_BIT               BIT(2)
+#define HAL_8192C_HW_GPIO_WPS_BIT       BIT(2)
 
-#define RPMAC_RESET                             0x100
+#define RPMAC_RESET                                     0x100
 #define RPMAC_TXSTART                           0x104
 #define RPMAC_TXLEGACYSIG                       0x108
 #define RPMAC_TXHTSIG1                          0x10c
@@ -1223,12 +1246,12 @@
 #define RPMAC_TXMACHEADER5                      0x134
 #define RPMAC_TXDADATYPE                        0x138
 #define RPMAC_TXRANDOMSEED                      0x13c
-#define RPMAC_CCKPLCPPREAMBLE                   0x140
+#define RPMAC_CCKPLCPPREAMBLE           0x140
 #define RPMAC_CCKPLCPHEADER                     0x144
 #define RPMAC_CCKCRC16                          0x148
 #define RPMAC_OFDMRXCRC32OK                     0x170
-#define RPMAC_OFDMRXCRC32Er                     0x174
-#define RPMAC_OFDMRXPARITYER                    0x178
+#define RPMAC_OFDMRXCRC32ER                     0x174
+#define RPMAC_OFDMRXPARITYER            0x178
 #define RPMAC_OFDMRXCRC8ER                      0x17c
 #define RPMAC_CCKCRXRC16ER                      0x180
 #define RPMAC_CCKCRXRC32ER                      0x184
@@ -1245,44 +1268,44 @@
 #define RFPGA0_RFTIMING1                        0x810
 #define RFPGA0_RFTIMING2                        0x814
 
-#define RFPGA0_XA_HSSIPARAMETER1                0x820
-#define RFPGA0_XA_HSSIPARAMETER2                0x824
-#define RFPGA0_XB_HSSIPARAMETER1                0x828
-#define RFPGA0_XB_HSSIPARAMETER2                0x82c
+#define RFPGA0_XA_HSSIPARAMETER1        0x820
+#define RFPGA0_XA_HSSIPARAMETER2        0x824
+#define RFPGA0_XB_HSSIPARAMETER1        0x828
+#define RFPGA0_XB_HSSIPARAMETER2        0x82c
 
-#define RFPGA0_XA_LSSIPARAMETER                 0x840
-#define RFPGA0_XB_LSSIPARAMETER                 0x844
+#define RFPGA0_XA_LSSIPARAMETER         0x840
+#define RFPGA0_XB_LSSIPARAMETER         0x844
 
-#define RFPGA0_RFWAKEUPPARAMETER                0x850
-#define RFPGA0_RFSLEEPUPPARAMETER               0x854
+#define RFPGA0_RFWAKEUPPARAMETER        0x850
+#define RFPGA0_RFSLEEPUPPARAMETER       0x854
 
-#define RFPGA0_XAB_SWITCHCONTROL                0x858
-#define RFPGA0_XCD_SWITCHCONTROL                0x85c
+#define RFPGA0_XAB_SWITCHCONTROL        0x858
+#define RFPGA0_XCD_SWITCHCONTROL        0x85c
 
-#define RFPGA0_XA_RFINTERFACEOE                 0x860
-#define RFPGA0_XB_RFINTERFACEOE                 0x864
+#define RFPGA0_XA_RFINTERFACEOE         0x860
+#define RFPGA0_XB_RFINTERFACEOE         0x864
 
-#define RFPGA0_XAB_RFINTERFACESW                0x870
-#define RFPGA0_XCD_RFINTERFACESW                0x874
+#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
-#define RFPGA0_ANALOGPARAMETER3                 0x888
-#define RFPGA0_ANALOGPARAMETER4                 0x88c
+#define RFPGA0_ANALOGPARAMETER1         0x880
+#define RFPGA0_ANALOGPARAMETER2         0x884
+#define RFPGA0_ANALOGPARAMETER3         0x888
+#define RFPGA0_ANALOGPARAMETER4         0x88c
 
-#define RFPGA0_XA_LSSIREADBACK                  0x8a0
-#define RFPGA0_XB_LSSIREADBACK                  0x8a4
-#define RFPGA0_XC_LSSIREADBACK                  0x8a8
-#define RFPGA0_XD_LSSIREADBACK                  0x8ac
+#define RFPGA0_XA_LSSIREADBACK          0x8a0
+#define RFPGA0_XB_LSSIREADBACK          0x8a4
+#define RFPGA0_XC_LSSIREADBACK          0x8a8
+#define RFPGA0_XD_LSSIREADBACK          0x8ac
 
 #define RFPGA0_PSDREPORT                        0x8b4
-#define TRANSCEIVEA_HSPI_READBACK               0x8b8
-#define TRANSCEIVEB_HSPI_READBACK               0x8bc
-#define RFPGA0_XAB_RFINTERFACERB                0x8e0
-#define RFPGA0_XCD_RFINTERFACERB                0x8e4
+#define TRANSCEIVEA_HSPI_READBACK       0x8b8
+#define TRANSCEIVEB_HSPI_READBACK       0x8bc
+#define RFPGA0_XAB_RFINTERFACERB        0x8e0
+#define RFPGA0_XCD_RFINTERFACERB        0x8e4
 
 #define RFPGA1_RFMOD                            0x900
 
@@ -1293,12 +1316,12 @@
 #define RCCK0_SYSTEM                            0xa00
 
 #define RCCK0_AFESETTING                        0xa04
-#define RCCK0_CCA                               0xa08
+#define RCCK0_CCA                                       0xa08
 
 #define RCCK0_RXAGC1                            0xa0c
 #define RCCK0_RXAGC2                            0xa10
 
-#define RCCK0_RXHP                              0xa14
+#define RCCK0_RXHP                                      0xa14
 
 #define RCCK0_DSPPARAMETER1                     0xa18
 #define RCCK0_DSPPARAMETER2                     0xa1c
@@ -1306,26 +1329,26 @@
 #define RCCK0_TXFILTER1                         0xa20
 #define RCCK0_TXFILTER2                         0xa24
 #define RCCK0_DEBUGPORT                         0xa28
-#define RCCK0_FALSEALARMREPORT                  0xa2c
-#define RCCK0_TRSSIREPORT                       0xa50
-#define RCCK0_RXREPORT                          0xa54
-#define RCCK0_FACOUNTERLOWER                    0xa5c
-#define RCCK0_FACOUNTERUPPER                    0xa58
+#define RCCK0_FALSEALARMREPORT          0xa2c
+#define RCCK0_TRSSIREPORT               0xa50
+#define RCCK0_RXREPORT                  0xa54
+#define RCCK0_FACOUNTERLOWER            0xa5c
+#define RCCK0_FACOUNTERUPPER            0xa58
 
-#define ROFDM0_LSTF                             0xc00
+#define ROFDM0_LSTF                                     0xc00
 
-#define ROFDM0_TRXPATHENABLE                    0xc04
+#define ROFDM0_TRXPATHENABLE            0xc04
 #define ROFDM0_TRMUXPAR                         0xc08
-#define ROFDM0_TRSWISOLATION                    0xc0c
+#define ROFDM0_TRSWISOLATION            0xc0c
 
 #define ROFDM0_XARXAFE                          0xc10
-#define ROFDM0_XARXIQIMBALANCE                  0xc14
-#define ROFDM0_XBRXAFE                          0xc18
-#define ROFDM0_XBRXIQIMBALANCE                  0xc1c
-#define ROFDM0_XCRXAFE                          0xc20
-#define ROFDM0_XCRXIQIMBANLANCE                 0xc24
-#define ROFDM0_XDRXAFE                          0xc28
-#define ROFDM0_XDRXIQIMBALANCE                  0xc2c
+#define ROFDM0_XARXIQIMBALANCE          0xc14
+#define ROFDM0_XBRXAFE                  0xc18
+#define ROFDM0_XBRXIQIMBALANCE          0xc1c
+#define ROFDM0_XCRXAFE                  0xc20
+#define ROFDM0_XCRXIQIMBANLANCE         0xc24
+#define ROFDM0_XDRXAFE                  0xc28
+#define ROFDM0_XDRXIQIMBALANCE          0xc2c
 
 #define ROFDM0_RXDETECTOR1                      0xc30
 #define ROFDM0_RXDETECTOR2                      0xc34
@@ -1334,8 +1357,8 @@
 
 #define ROFDM0_RXDSP                            0xc40
 #define ROFDM0_CFOANDDAGC                       0xc44
-#define ROFDM0_CCADROPTHRESHOLD                 0xc48
-#define ROFDM0_ECCATHRESHOLD                    0xc4c
+#define ROFDM0_CCADROPTHRESHOLD         0xc48
+#define ROFDM0_ECCATHRESHOLD            0xc4c
 
 #define ROFDM0_XAAGCCORE1                       0xc50
 #define ROFDM0_XAAGCCORE2                       0xc54
@@ -1346,24 +1369,24 @@
 #define ROFDM0_XDAGCCORE1                       0xc68
 #define ROFDM0_XDAGCCORE2                       0xc6c
 
-#define ROFDM0_AGCPARAMETER1                    0xc70
-#define ROFDM0_AGCPARAMETER2                    0xc74
+#define ROFDM0_AGCPARAMETER1            0xc70
+#define ROFDM0_AGCPARAMETER2            0xc74
 #define ROFDM0_AGCRSSITABLE                     0xc78
 #define ROFDM0_HTSTFAGC                         0xc7c
 
-#define ROFDM0_XATXIQIMBALANCE                  0xc80
+#define ROFDM0_XATXIQIMBALANCE          0xc80
 #define ROFDM0_XATXAFE                          0xc84
-#define ROFDM0_XBTXIQIMBALANCE                  0xc88
+#define ROFDM0_XBTXIQIMBALANCE          0xc88
 #define ROFDM0_XBTXAFE                          0xc8c
-#define ROFDM0_XCTXIQIMBALANCE                  0xc90
-#define ROFDM0_XCTXAFE                          0xc94
-#define ROFDM0_XDTXIQIMBALANCE                  0xc98
+#define ROFDM0_XCTXIQIMBALANCE          0xc90
+#define ROFDM0_XCTXAFE                  0xc94
+#define ROFDM0_XDTXIQIMBALANCE          0xc98
 #define ROFDM0_XDTXAFE                          0xc9c
 
 #define ROFDM0_RXIQEXTANTA                      0xca0
 
-#define ROFDM0_RXHPPARAMETER                    0xce0
-#define ROFDM0_TXPSEUDONOISEWGT                 0xce4
+#define ROFDM0_RXHPPARAMETER            0xce0
+#define ROFDM0_TXPSEUDONOISEWGT         0xce4
 #define ROFDM0_FRAMESYNC                        0xcf0
 #define ROFDM0_DFSREPORT                        0xcf4
 #define ROFDM0_TXCOEFF1                         0xca4
@@ -1373,19 +1396,19 @@
 #define ROFDM0_TXCOEFF5                         0xcb4
 #define ROFDM0_TXCOEFF6                         0xcb8
 
-#define ROFDM1_LSTF                             0xd00
-#define ROFDM1_TRXPATHENABLE                    0xd04
+#define ROFDM1_LSTF                                     0xd00
+#define ROFDM1_TRXPATHENABLE            0xd04
 
-#define ROFDM1_CF0                              0xd08
-#define ROFDM1_CSI1                             0xd10
-#define ROFDM1_SBD                              0xd14
-#define ROFDM1_CSI2                             0xd18
+#define ROFDM1_CF0                                      0xd08
+#define ROFDM1_CSI1                                     0xd10
+#define ROFDM1_SBD                                      0xd14
+#define ROFDM1_CSI2                                     0xd18
 #define ROFDM1_CFOTRACKING                      0xd2c
 #define ROFDM1_TRXMESAURE1                      0xd34
 #define ROFDM1_INTFDET                          0xd3c
-#define ROFDM1_PSEUDONOISESTATEAB               0xd50
-#define ROFDM1_PSEUDONOISESTATECD               0xd54
-#define ROFDM1_RXPSEUDONOISEWGT                 0xd58
+#define ROFDM1_PSEUDONOISESTATEAB       0xd50
+#define ROFDM1_PSEUDONOISESTATECD       0xd54
+#define ROFDM1_RXPSEUDONOISEWGT         0xd58
 
 #define ROFDM_PHYCOUNTER1                       0xda0
 #define ROFDM_PHYCOUNTER2                       0xda4
@@ -1397,35 +1420,35 @@
 #define ROFDM_LONGCFOCD                         0xdb8
 #define ROFDM_TAILCF0AB                         0xdbc
 #define ROFDM_TAILCF0CD                         0xdc0
-#define ROFDM_PWMEASURE1                        0xdc4
-#define ROFDM_PWMEASURE2                        0xdc8
+#define ROFDM_PWMEASURE1                0xdc4
+#define ROFDM_PWMEASURE2                0xdc8
 #define ROFDM_BWREPORT                          0xdcc
 #define ROFDM_AGCREPORT                         0xdd0
-#define ROFDM_RXSNR                             0xdd4
+#define ROFDM_RXSNR                                     0xdd4
 #define ROFDM_RXEVMCSI                          0xdd8
 #define ROFDM_SIGREPORT                         0xddc
 
 #define RTXAGC_A_RATE18_06                      0xe00
 #define RTXAGC_A_RATE54_24                      0xe04
 #define RTXAGC_A_CCK1_MCS32                     0xe08
-#define RTXAGC_A_MCS03_MCS00                    0xe10
-#define RTXAGC_A_MCS07_MCS04                    0xe14
-#define RTXAGC_A_MCS11_MCS08                    0xe18
-#define RTXAGC_A_MCS15_MCS12                    0xe1c
+#define RTXAGC_A_MCS03_MCS00            0xe10
+#define RTXAGC_A_MCS07_MCS04            0xe14
+#define RTXAGC_A_MCS11_MCS08            0xe18
+#define RTXAGC_A_MCS15_MCS12            0xe1c
 
 #define RTXAGC_B_RATE18_06                      0x830
 #define RTXAGC_B_RATE54_24                      0x834
-#define RTXAGC_B_CCK1_55_MCS32                  0x838
-#define RTXAGC_B_MCS03_MCS00                    0x83c
-#define RTXAGC_B_MCS07_MCS04                    0x848
-#define RTXAGC_B_MCS11_MCS08                    0x84c
-#define RTXAGC_B_MCS15_MCS12                    0x868
-#define RTXAGC_B_CCK11_A_CCK2_11                0x86c
+#define RTXAGC_B_CCK1_55_MCS32          0x838
+#define RTXAGC_B_MCS03_MCS00            0x83c
+#define RTXAGC_B_MCS07_MCS04            0x848
+#define RTXAGC_B_MCS11_MCS08            0x84c
+#define RTXAGC_B_MCS15_MCS12            0x868
+#define RTXAGC_B_CCK11_A_CCK2_11        0x86c
 
 #define RZEBRA1_HSSIENABLE                      0x0
 #define RZEBRA1_TRXENABLE1                      0x1
 #define RZEBRA1_TRXENABLE2                      0x2
-#define RZEBRA1_AGC                             0x4
+#define RZEBRA1_AGC                                     0x4
 #define RZEBRA1_CHARGEPUMP                      0x5
 #define RZEBRA1_CHANNEL                         0x7
 
@@ -1434,649 +1457,664 @@
 #define RZEBRA1_RXLPF                           0xb
 #define RZEBRA1_RXHPFCORNER                     0xc
 
-#define RGLOBALCTRL                             0
+#define RGLOBALCTRL                                     0
 #define RRTL8256_TXLPF                          19
 #define RRTL8256_RXLPF                          11
 #define RRTL8258_TXLPF                          0x11
 #define RRTL8258_RXLPF                          0x13
 #define RRTL8258_RSSILPF                        0xa
 
-#define RF_AC                                   0x00
+#define RF_AC                                           0x00
 
-#define RF_IQADJ_G1                             0x01
-#define RF_IQADJ_G2                             0x02
-#define RF_POW_TRSW                             0x05
+#define RF_IQADJ_G1                                     0x01
+#define RF_IQADJ_G2                                     0x02
+#define RF_POW_TRSW                                     0x05
 
-#define RF_GAIN_RX                              0x06
-#define RF_GAIN_TX                              0x07
+#define RF_GAIN_RX                                      0x06
+#define RF_GAIN_TX                                      0x07
 
-#define RF_TXM_IDAC                             0x08
-#define RF_BS_IQGEN                             0x0F
+#define RF_TXM_IDAC                                     0x08
+#define RF_BS_IQGEN                                     0x0F
 
-#define RF_MODE1                                0x10
-#define RF_MODE2                                0x11
+#define RF_MODE1                                        0x10
+#define RF_MODE2                                        0x11
 
 #define RF_RX_AGC_HP                            0x12
-#define RF_TX_AGC                               0x13
-#define RF_BIAS                                 0x14
-#define RF_IPA                                  0x15
+#define RF_TX_AGC                                       0x13
+#define RF_BIAS                                         0x14
+#define RF_IPA                                          0x15
 #define RF_POW_ABILITY                          0x17
-#define RF_MODE_AG                              0x18
-#define RRFCHANNEL                              0x18
-#define RF_CHNLBW                               0x18
-#define RF_TOP                                  0x19
-
-#define RF_RX_G1                                0x1A
-#define RF_RX_G2                                0x1B
-
-#define RF_RX_BB2                               0x1C
-#define RF_RX_BB1                               0x1D
-
-#define RF_RCK1                                 0x1E
-#define RF_RCK2                                 0x1F
-
-#define RF_TX_G1                                0x20
-#define RF_TX_G2                                0x21
-#define RF_TX_G3                                0x22
-
-#define RF_TX_BB1                               0x23
-#define RF_T_METER                              0x24
-
-#define RF_SYN_G1                               0x25
-#define RF_SYN_G2                               0x26
-#define RF_SYN_G3                               0x27
-#define RF_SYN_G4                               0x28
-#define RF_SYN_G5                               0x29
-#define RF_SYN_G6                               0x2A
-#define RF_SYN_G7                               0x2B
-#define RF_SYN_G8                               0x2C
-
-#define RF_RCK_OS                               0x30
-#define RF_TXPA_G1                              0x31
-#define RF_TXPA_G2                              0x32
-#define RF_TXPA_G3                              0x33
-
-#define BBBRESETB                               0x100
+#define RF_MODE_AG                                      0x18
+#define RRFCHANNEL                                      0x18
+#define RF_CHNLBW                                       0x18
+#define RF_TOP                                          0x19
+
+#define RF_RX_G1                                        0x1A
+#define RF_RX_G2                                        0x1B
+
+#define RF_RX_BB2                                       0x1C
+#define RF_RX_BB1                                       0x1D
+
+#define RF_RCK1                                         0x1E
+#define RF_RCK2                                         0x1F
+
+#define RF_TX_G1                                        0x20
+#define RF_TX_G2                                        0x21
+#define RF_TX_G3                                        0x22
+
+#define RF_TX_BB1                                       0x23
+#define RF_T_METER                                      0x24
+
+#define RF_SYN_G1                                       0x25
+#define RF_SYN_G2                                       0x26
+#define RF_SYN_G3                                       0x27
+#define RF_SYN_G4                                       0x28
+#define RF_SYN_G5                                       0x29
+#define RF_SYN_G6                                       0x2A
+#define RF_SYN_G7                                       0x2B
+#define RF_SYN_G8                                       0x2C
+
+#define RF_RCK_OS                                       0x30
+#define RF_TXPA_G1                                      0x31
+#define RF_TXPA_G2                                      0x32
+#define RF_TXPA_G3                                      0x33
+
+#define BBBRESETB                                       0x100
 #define BGLOBALRESETB                           0x200
 #define BOFDMTXSTART                            0x4
-#define BCCKTXSTART                             0x8
-#define BCRC32DEBUG                             0x100
+#define BCCKTXSTART                                     0x8
+#define BCRC32DEBUG                                     0x100
 #define BPMACLOOPBACK                           0x10
-#define BTXLSIG                                 0xffffff
-#define BOFDMTXRATE                             0xf
+#define BTXLSIG                                         0xffffff
+#define BOFDMTXRATE                                     0xf
 #define BOFDMTXRESERVED                         0x10
 #define BOFDMTXLENGTH                           0x1ffe0
 #define BOFDMTXPARITY                           0x20000
-#define BTXHTSIG1                               0xffffff
+#define BTXHTSIG1                                       0xffffff
 #define BTXHTMCSRATE                            0x7f
-#define BTXHTBW                                 0x80
-#define BTXHTLENGTH                             0xffff00
-#define BTXHTSIG2                               0xffffff
+#define BTXHTBW                                         0x80
+#define BTXHTLENGTH                                     0xffff00
+#define BTXHTSIG2                                       0xffffff
 #define BTXHTSMOOTHING                          0x1
 #define BTXHTSOUNDING                           0x2
 #define BTXHTRESERVED                           0x4
 #define BTXHTAGGREATION                         0x8
-#define BTXHTSTBC                               0x30
+#define BTXHTSTBC                                       0x30
 #define BTXHTADVANCECODING                      0x40
 #define BTXHTSHORTGI                            0x80
 #define BTXHTNUMBERHT_LTF                       0x300
-#define BTXHTCRC8                               0x3fc00
+#define BTXHTCRC8                                       0x3fc00
 #define BCOUNTERRESET                           0x10000
 #define BNUMOFOFDMTX                            0xffff
-#define BNUMOFCCKTX                             0xffff0000
+#define BNUMOFCCKTX                                     0xffff0000
 #define BTXIDLEINTERVAL                         0xffff
 #define BOFDMSERVICE                            0xffff0000
 #define BTXMACHEADER                            0xffffffff
-#define BTXDATAINIT                             0xff
-#define BTXHTMODE                               0x100
-#define BTXDATATYPE                             0x30000
+#define BTXDATAINIT                                     0xff
+#define BTXHTMODE                                       0x100
+#define BTXDATATYPE                                     0x30000
 #define BTXRANDOMSEED                           0xffffffff
 #define BCCKTXPREAMBLE                          0x1
-#define BCCKTXSFD                               0xffff0000
-#define BCCKTXSIG                               0xff
+#define BCCKTXSFD                                       0xffff0000
+#define BCCKTXSIG                                       0xff
 #define BCCKTXSERVICE                           0xff00
 #define BCCKLENGTHEXT                           0x8000
 #define BCCKTXLENGHT                            0xffff0000
-#define BCCKTXCRC16                             0xffff
+#define BCCKTXCRC16                                     0xffff
 #define BCCKTXSTATUS                            0x1
 #define BOFDMTXSTATUS                           0x2
-#define IS_BB_REG_OFFSET_92S(_Offset)   \
-        ((_Offset >= 0x800) && (_Offset <= 0xfff))
-
-#define BRFMOD                                  0x1
-#define BJAPANMODE                              0x2
-#define BCCKTXSC                                0x30
-#define BCCKEN                                  0x1000000
-#define BOFDMEN                                 0x2000000
-
-#define BOFDMRXADCPHASE                         0x10000
-#define BOFDMTXDACPHASE                         0x40000
-#define BXATXAGC                                0x3f
-
-#define BXBTXAGC                                0xf00
-#define BXCTXAGC                                0xf000
-#define BXDTXAGC                                0xf0000
-
-#define BPASTART                                0xf0000000
-#define BTRSTART                                0x00f00000
-#define BRFSTART                                0x0000f000
-#define BBBSTART                                0x000000f0
-#define BBBCCKSTART                             0x0000000f
-#define BPAEND                                  0xf
-#define BTREND                                  0x0f000000
-#define BRFEND                                  0x000f0000
-#define BCCAMASK                                0x000000f0
-#define BR2RCCAMASK                             0x00000f00
-#define BHSSI_R2TDELAY                          0xf8000000
-#define BHSSI_T2RDELAY                          0xf80000
-#define BCONTXHSSI                              0x400
-#define BIGFROMCCK                              0x200
-#define BAGCADDRESS                             0x3f
-#define BRXHPTX                                 0x7000
-#define BRXHP2RX                                0x38000
-#define BRXHPCCKINI                             0xc0000
-#define BAGCTXCODE                              0xc00000
-#define BAGCRXCODE                              0x300000
-
-#define B3WIREDATALENGTH                        0x800
-#define B3WIREADDREAALENGTH                     0x400
-
-#define B3WIRERFPOWERDOWN                       0x1
-#define B5GPAPEPOLARITY                         0x40000000
-#define B2GPAPEPOLARITY                         0x80000000
-#define BRFSW_TXDEFAULTANT                      0x3
-#define BRFSW_TXOPTIONANT                       0x30
-#define BRFSW_RXDEFAULTANT                      0x300
-#define BRFSW_RXOPTIONANT                       0x3000
-#define BRFSI_3WIREDATA                         0x1
-#define BRFSI_3WIRECLOCK                        0x2
-#define BRFSI_3WIRELOAD                         0x4
-#define BRFSI_3WIRERW                           0x8
-#define BRFSI_3WIRE                             0xf
-
-#define BRFSI_RFENV                             0x10
-
-#define BRFSI_TRSW                              0x20
-#define BRFSI_TRSWB                             0x40
-#define BRFSI_ANTSW                             0x100
-#define BRFSI_ANTSWB                            0x200
-#define BRFSI_PAPE                              0x400
-#define BRFSI_PAPE5G                            0x800
-#define BBANDSELECT                             0x1
-#define BHTSIG2_GI                              0x80
-#define BHTSIG2_SMOOTHING                       0x01
-#define BHTSIG2_SOUNDING                        0x02
-#define BHTSIG2_AGGREATON                       0x08
-#define BHTSIG2_STBC                            0x30
-#define BHTSIG2_ADVCODING                       0x40
-#define BHTSIG2_NUMOFHTLTF                      0x300
-#define BHTSIG2_CRC8                            0x3fc
-#define BHTSIG1_MCS                             0x7f
-#define BHTSIG1_BANDWIDTH                       0x80
-#define BHTSIG1_HTLENGTH                        0xffff
-#define BLSIG_RATE                              0xf
-#define BLSIG_RESERVED                          0x10
-#define BLSIG_LENGTH                            0x1fffe
-#define BLSIG_PARITY                            0x20
-#define BCCKRXPHASE                             0x4
-
-#define BLSSIREADADDRESS                        0x7f800000
-#define BLSSIREADEDGE                           0x80000000
-
-#define BLSSIREADBACKDATA                       0xfffff
-
-#define BLSSIREADOKFLAG                         0x1000
-#define BCCKSAMPLERATE                          0x8
-#define BREGULATOR0STANDBY                      0x1
-#define BREGULATORPLLSTANDBY                    0x2
-#define BREGULATOR1STANDBY                      0x4
-#define BPLLPOWERUP                             0x8
-#define BDPLLPOWERUP                            0x10
-#define BDA10POWERUP                            0x20
-#define BAD7POWERUP                             0x200
-#define BDA6POWERUP                             0x2000
-#define BXTALPOWERUP                            0x4000
-#define B40MDCLKPOWERUP                         0x8000
-#define BDA6DEBUGMODE                           0x20000
-#define BDA6SWING                               0x380000
-
-#define BADCLKPHASE                             0x4000000
-#define B80MCLKDELAY                            0x18000000
-#define BAFEWATCHDOGENABLE                      0x20000000
-
-#define BXTALCAP01                              0xc0000000
-#define BXTALCAP23                              0x3
-#define BXTALCAP92X                             0x0f000000
-#define BXTALCAP                                0x0f000000
-
-#define BINTDIFCLKENABLE                        0x400
-#define BEXTSIGCLKENABLE                        0x800
-#define BBANDGAP_MBIAS_POWERUP                  0x10000
-#define BAD11SH_GAIN                            0xc0000
-#define BAD11NPUT_RANGE                         0x700000
-#define BAD110P_CURRENT                         0x3800000
-#define BLPATH_LOOPBACK                         0x4000000
-#define BQPATH_LOOPBACK                         0x8000000
-#define BAFE_LOOPBACK                           0x10000000
-#define BDA10_SWING                             0x7e0
-#define BDA10_REVERSE                           0x800
-#define BDA_CLK_SOURCE                          0x1000
-#define BDA7INPUT_RANGE                         0x6000
-#define BDA7_GAIN                               0x38000
-#define BDA7OUTPUT_CM_MODE                      0x40000
-#define BDA7INPUT_CM_MODE                       0x380000
-#define BDA7CURRENT                             0xc00000
-#define BREGULATOR_ADJUST                       0x7000000
-#define BAD11POWERUP_ATTX                       0x1
-#define BDA10PS_ATTX                            0x10
-#define BAD11POWERUP_ATRX                       0x100
-#define BDA10PS_ATRX                            0x1000
-#define BCCKRX_AGC_FORMAT                       0x200
-#define BPSDFFT_SAMPLE_POINT                    0xc000
-#define BPSD_AVERAGE_NUM                        0x3000
-#define BIQPATH_CONTROL                         0xc00
-#define BPSD_FREQ                               0x3ff
-#define BPSD_ANTENNA_PATH                       0x30
-#define BPSD_IQ_SWITCH                          0x40
-#define BPSD_RX_TRIGGER                         0x400000
-#define BPSD_TX_TRIGGER                         0x80000000
-#define BPSD_SINE_TONE_SCALE                    0x7f000000
-#define BPSD_REPORT                             0xffff
-
-#define BOFDM_TXSC                              0x30000000
-#define BCCK_TXON                               0x1
-#define BOFDM_TXON                              0x2
-#define BDEBUG_PAGE                             0xfff
-#define BDEBUG_ITEM                             0xff
-#define BANTL                                   0x10
-#define BANT_NONHT                              0x100
-#define BANT_HT1                                0x1000
-#define BANT_HT2                                0x10000
-#define BANT_HT1S1                              0x100000
-#define BANT_NONHTS1                            0x1000000
-
-#define BCCK_BBMODE                             0x3
-#define BCCK_TXPOWERSAVING                      0x80
-#define BCCK_RXPOWERSAVING                      0x40
-
-#define BCCK_SIDEBAND                           0x10
-
-#define BCCK_SCRAMBLE                           0x8
-#define BCCK_ANTDIVERSITY                       0x8000
-#define BCCK_CARRIER_RECOVERY                   0x4000
-#define BCCK_TXRATE                             0x3000
-#define BCCK_DCCANCEL                           0x0800
-#define BCCK_ISICANCEL                          0x0400
-#define BCCK_MATCH_FILTER                       0x0200
-#define BCCK_EQUALIZER                          0x0100
-#define BCCK_PREAMBLE_DETECT                    0x800000
-#define BCCK_FAST_FALSECCAi                     0x400000
-#define BCCK_CH_ESTSTARTi                       0x300000
-#define BCCK_CCA_COUNTi                         0x080000
-#define BCCK_CS_LIM                             0x070000
-#define BCCK_BIST_MODEi                         0x80000000
-#define BCCK_CCAMASK                            0x40000000
-#define BCCK_TX_DAC_PHASE                       0x4
-#define BCCK_RX_ADC_PHASE                       0x20000000
-#define BCCKR_CP_MODE                           0x0100
-#define BCCK_TXDC_OFFSET                        0xf0
-#define BCCK_RXDC_OFFSET                        0xf
-#define BCCK_CCA_MODE                           0xc000
-#define BCCK_FALSECS_LIM                        0x3f00
-#define BCCK_CS_RATIO                           0xc00000
-#define BCCK_CORGBIT_SEL                        0x300000
-#define BCCK_PD_LIM                             0x0f0000
-#define BCCK_NEWCCA                             0x80000000
-#define BCCK_RXHP_OF_IG                         0x8000
-#define BCCK_RXIG                               0x7f00
-#define BCCK_LNA_POLARITY                       0x800000
-#define BCCK_RX1ST_BAIN                         0x7f0000
-#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
-#define BCCK_RXAGC_REPORTTYPE                   0x0300
-#define BCCK_RXDAGC_EN                          0x80000000
-#define BCCK_RXDAGC_PERIOD                      0x20000000
-#define BCCK_RXDAGC_SATLEVEL                    0x1f000000
-#define BCCK_TIMING_RECOVERY                    0x800000
-#define BCCK_TXC0                               0x3f0000
-#define BCCK_TXC1                               0x3f000000
-#define BCCK_TXC2                               0x3f
-#define BCCK_TXC3                               0x3f00
-#define BCCK_TXC4                               0x3f0000
-#define BCCK_TXC5                               0x3f000000
-#define BCCK_TXC6                               0x3f
-#define BCCK_TXC7                               0x3f00
-#define BCCK_DEBUGPORT                          0xff0000
-#define BCCK_DAC_DEBUG                          0x0f000000
-#define BCCK_FALSEALARM_ENABLE                  0x8000
-#define BCCK_FALSEALARM_READ                    0x4000
-#define BCCK_TRSSI                              0x7f
-#define BCCK_RXAGC_REPORT                       0xfe
-#define BCCK_RXREPORT_ANTSEL                    0x80000000
-#define BCCK_RXREPORT_MFOFF                     0x40000000
-#define BCCK_RXREPORT_SQLOSS                    0x20000000
-#define BCCK_RXREPORT_PKTLOSS                   0x10000000
-#define BCCK_RXREPORT_LOCKEDBIT                 0x08000000
-#define BCCK_RXREPORT_RATEERROR                 0x04000000
-#define BCCK_RXREPORT_RXRATE                    0x03000000
-#define BCCK_RXFA_COUNTER_LOWER                 0xff
-#define BCCK_RXFA_COUNTER_UPPER                 0xff000000
-#define BCCK_RXHPAGC_START                      0xe000
-#define BCCK_RXHPAGC_FINAL                      0x1c00
-#define BCCK_RXFALSEALARM_ENABLE                0x8000
-#define BCCK_FACOUNTER_FREEZE                   0x4000
-#define BCCK_TXPATH_SEL                         0x10000000
-#define BCCK_DEFAULT_RXPATH                     0xc000000
-#define BCCK_OPTION_RXPATH                      0x3000000
-
-#define BNUM_OFSTF                              0x3
-#define BSHIFT_L                                0xc0
-#define BGI_TH                                  0xc
-#define BRXPATH_A                               0x1
-#define BRXPATH_B                               0x2
-#define BRXPATH_C                               0x4
-#define BRXPATH_D                               0x8
-#define BTXPATH_A                               0x1
-#define BTXPATH_B                               0x2
-#define BTXPATH_C                               0x4
-#define BTXPATH_D                               0x8
-#define BTRSSI_FREQ                             0x200
-#define BADC_BACKOFF                            0x3000
-#define BDFIR_BACKOFF                           0xc000
-#define BTRSSI_LATCH_PHASE                      0x10000
-#define BRX_LDC_OFFSET                          0xff
-#define BRX_QDC_OFFSET                          0xff00
-#define BRX_DFIR_MODE                           0x1800000
-#define BRX_DCNF_TYPE                           0xe000000
-#define BRXIQIMB_A                              0x3ff
-#define BRXIQIMB_B                              0xfc00
-#define BRXIQIMB_C                              0x3f0000
-#define BRXIQIMB_D                              0xffc00000
-#define BDC_DC_NOTCH                            0x60000
-#define BRXNB_NOTCH                             0x1f000000
-#define BPD_TH                                  0xf
-#define BPD_TH_OPT2                             0xc000
-#define BPWED_TH                                0x700
-#define BIFMF_WIN_L                             0x800
-#define BPD_OPTION                              0x1000
-#define BMF_WIN_L                               0xe000
-#define BBW_SEARCH_L                            0x30000
-#define BWIN_ENH_L                              0xc0000
-#define BBW_TH                                  0x700000
-#define BED_TH2                                 0x3800000
-#define BBW_OPTION                              0x4000000
-#define BRADIO_TH                               0x18000000
-#define BWINDOW_L                               0xe0000000
-#define BSBD_OPTION                             0x1
-#define BFRAME_TH                               0x1c
-#define BFS_OPTION                              0x60
-#define BDC_SLOPE_CHECK                         0x80
-#define BFGUARD_COUNTER_DC_L                    0xe00
-#define BFRAME_WEIGHT_SHORT                     0x7000
-#define BSUB_TUNE                               0xe00000
-#define BFRAME_DC_LENGTH                        0xe000000
-#define BSBD_START_OFFSET                       0x30000000
-#define BFRAME_TH_2                             0x7
-#define BFRAME_GI2_TH                           0x38
-#define BGI2_SYNC_EN                            0x40
-#define BSARCH_SHORT_EARLY                      0x300
-#define BSARCH_SHORT_LATE                       0xc00
-#define BSARCH_GI2_LATE                         0x70000
-#define BCFOANTSUM                              0x1
-#define BCFOACC                                 0x2
-#define BCFOSTARTOFFSET                         0xc
-#define BCFOLOOPBACK                            0x70
-#define BCFOSUMWEIGHT                           0x80
-#define BDAGCENABLE                             0x10000
-#define BTXIQIMB_A                              0x3ff
-#define BTXIQIMB_b                              0xfc00
-#define BTXIQIMB_C                              0x3f0000
-#define BTXIQIMB_D                              0xffc00000
-#define BTXIDCOFFSET                            0xff
-#define BTXIQDCOFFSET                           0xff00
-#define BTXDFIRMODE                             0x10000
-#define BTXPESUDO_NOISEON                       0x4000000
-#define BTXPESUDO_NOISE_A                       0xff
-#define BTXPESUDO_NOISE_B                       0xff00
-#define BTXPESUDO_NOISE_C                       0xff0000
-#define BTXPESUDO_NOISE_D                       0xff000000
-#define BCCA_DROPOPTION                         0x20000
-#define BCCA_DROPTHRES                          0xfff00000
-#define BEDCCA_H                                0xf
-#define BEDCCA_L                                0xf0
-#define BLAMBDA_ED                              0x300
-#define BRX_INITIALGAIN                         0x7f
-#define BRX_ANTDIV_EN                           0x80
-#define BRX_AGC_ADDRESS_FOR_LNA                 0x7f00
-#define BRX_HIGHPOWER_FLOW                      0x8000
-#define BRX_AGC_FREEZE_THRES                    0xc0000
-#define BRX_FREEZESTEP_AGC1                     0x300000
-#define BRX_FREEZESTEP_AGC2                     0xc00000
-#define BRX_FREEZESTEP_AGC3                     0x3000000
-#define BRX_FREEZESTEP_AGC0                     0xc000000
-#define BRXRSSI_CMP_EN                          0x10000000
-#define BRXQUICK_AGCEN                          0x20000000
-#define BRXAGC_FREEZE_THRES_MODE                0x40000000
-#define BRX_OVERFLOW_CHECKTYPE                  0x80000000
-#define BRX_AGCSHIFT                            0x7f
-#define BTRSW_TRI_ONLY                          0x80
-#define BPOWER_THRES                            0x300
-#define BRXAGC_EN                               0x1
-#define BRXAGC_TOGETHER_EN                      0x2
-#define BRXAGC_MIN                              0x4
-#define BRXHP_INI                               0x7
-#define BRXHP_TRLNA                             0x70
-#define BRXHP_RSSI                              0x700
-#define BRXHP_BBP1                              0x7000
-#define BRXHP_BBP2                              0x70000
-#define BRXHP_BBP3                              0x700000
-#define BRSSI_H                                 0x7f0000
-#define BRSSI_GEN                               0x7f000000
-#define BRXSETTLE_TRSW                          0x7
-#define BRXSETTLE_LNA                           0x38
-#define BRXSETTLE_RSSI                          0x1c0
-#define BRXSETTLE_BBP                           0xe00
-#define BRXSETTLE_RXHP                          0x7000
-#define BRXSETTLE_ANTSW_RSSI                    0x38000
-#define BRXSETTLE_ANTSW                         0xc0000
-#define BRXPROCESS_TIME_DAGC                    0x300000
-#define BRXSETTLE_HSSI                          0x400000
-#define BRXPROCESS_TIME_BBPPW                   0x800000
-#define BRXANTENNA_POWER_SHIFT                  0x3000000
-#define BRSSI_TABLE_SELECT                      0xc000000
-#define BRXHP_FINAL                             0x7000000
-#define BRXHPSETTLE_BBP                         0x7
-#define BRXHTSETTLE_HSSI                        0x8
-#define BRXHTSETTLE_RXHP                        0x70
-#define BRXHTSETTLE_BBPPW                       0x80
-#define BRXHTSETTLE_IDLE                        0x300
-#define BRXHTSETTLE_RESERVED                    0x1c00
-#define BRXHT_RXHP_EN                           0x8000
-#define BRXAGC_FREEZE_THRES                     0x30000
-#define BRXAGC_TOGETHEREN                       0x40000
-#define BRXHTAGC_MIN                            0x80000
-#define BRXHTAGC_EN                             0x100000
-#define BRXHTDAGC_EN                            0x200000
-#define BRXHT_RXHP_BBP                          0x1c00000
-#define BRXHT_RXHP_FINAL                        0xe0000000
-#define BRXPW_RADIO_TH                          0x3
-#define BRXPW_RADIO_EN                          0x4
-#define BRXMF_HOLD                              0x3800
-#define BRXPD_DELAY_TH1                         0x38
-#define BRXPD_DELAY_TH2                         0x1c0
-#define BRXPD_DC_COUNT_MAX                      0x600
-#define BRXPD_DELAY_TH                          0x8000
-#define BRXPROCESS_DELAY                        0xf0000
-#define BRXSEARCHRANGE_GI2_EARLY                0x700000
-#define BRXFRAME_FUARD_COUNTER_L                0x3800000
-#define BRXSGI_GUARD_L                          0xc000000
-#define BRXSGI_SEARCH_L                         0x30000000
-#define BRXSGI_TH                               0xc0000000
-#define BDFSCNT0                                0xff
-#define BDFSCNT1                                0xff00
-#define BDFSFLAG                                0xf0000
-#define BMF_WEIGHT_SUM                          0x300000
-#define BMINIDX_TH                              0x7f000000
-#define BDAFORMAT                               0x40000
-#define BTXCH_EMU_ENABLE                        0x01000000
-#define BTRSW_ISOLATION_A                       0x7f
-#define BTRSW_ISOLATION_B                       0x7f00
-#define BTRSW_ISOLATION_C                       0x7f0000
-#define BTRSW_ISOLATION_D                       0x7f000000
-#define BEXT_LNA_GAIN                           0x7c00
-
-#define BSTBC_EN                                0x4
-#define BANTENNA_MAPPING                        0x10
-#define BNSS                                    0x20
-#define BCFO_ANTSUM_ID                          0x200
-#define BPHY_COUNTER_RESET                      0x8000000
-#define BCFO_REPORT_GET                         0x4000000
-#define BOFDM_CONTINUE_TX                       0x10000000
-#define BOFDM_SINGLE_CARRIER                    0x20000000
-#define BOFDM_SINGLE_TONE                       0x40000000
-#define BHT_DETECT                              0x100
-#define BCFOEN                                  0x10000
-#define BCFOVALUE                               0xfff00000
-#define BSIGTONE_RE                             0x3f
-#define BSIGTONE_IM                             0x7f00
-#define BCOUNTER_CCA                            0xffff
-#define BCOUNTER_PARITYFAIL                     0xffff0000
-#define BCOUNTER_RATEILLEGAL                    0xffff
-#define BCOUNTER_CRC8FAIL                       0xffff0000
-#define BCOUNTER_MCSNOSUPPORT                   0xffff
-#define BCOUNTER_FASTSYNC                       0xffff
-#define BSHORTCFO                               0xfff
-#define BSHORTCFOT_LENGTH                       12
-#define BSHORTCFOF_LENGTH                       11
-#define BLONGCFO                                0x7ff
-#define BLONGCFOT_LENGTH                        11
-#define BLONGCFOF_LENGTH                        11
-#define BTAILCFO                                0x1fff
-#define BTAILCFOT_LENGTH                        13
-#define BTAILCFOF_LENGTH                        12
-#define BNOISE_EN_PWDB                          0xffff
-#define BCC_POWER_DB                            0xffff0000
-#define BMOISE_PWDB                             0xffff
-#define BPOWERMEAST_LENGTH                      10
-#define BPOWERMEASF_LENGTH                      3
-#define BRX_HT_BW                               0x1
-#define BRXSC                                   0x6
-#define BRX_HT                                  0x8
-#define BNB_INTF_DET_ON                         0x1
-#define BINTF_WIN_LEN_CFG                       0x30
-#define BNB_INTF_TH_CFG                         0x1c0
-#define BRFGAIN                                 0x3f
-#define BTABLESEL                               0x40
-#define BTRSW                                   0x80
-#define BRXSNR_A                                0xff
-#define BRXSNR_B                                0xff00
-#define BRXSNR_C                                0xff0000
-#define BRXSNR_D                                0xff000000
-#define BSNR_EVMT_LENGTH                        8
-#define BSNR_EVMF_LENGTH                        1
-#define BCSI1ST                                 0xff
-#define BCSI2ND                                 0xff00
-#define BRXEVM1ST                               0xff0000
-#define BRXEVM2ND                               0xff000000
-#define BSIGEVM                                 0xff
-#define BPWDB                                   0xff00
-#define BSGIEN                                  0x10000
-
-#define BSFACTOR_QMA1                           0xf
-#define BSFACTOR_QMA2                           0xf0
-#define BSFACTOR_QMA3                           0xf00
-#define BSFACTOR_QMA4                           0xf000
-#define BSFACTOR_QMA5                           0xf0000
-#define BSFACTOR_QMA6                           0xf0000
-#define BSFACTOR_QMA7                           0xf00000
-#define BSFACTOR_QMA8                           0xf000000
-#define BSFACTOR_QMA9                           0xf0000000
-#define BCSI_SCHEME                             0x100000
-
-#define BNOISE_LVL_TOP_SET                      0x3
-#define BCHSMOOTH                               0x4
-#define BCHSMOOTH_CFG1                          0x38
-#define BCHSMOOTH_CFG2                          0x1c0
-#define BCHSMOOTH_CFG3                          0xe00
-#define BCHSMOOTH_CFG4                          0x7000
-#define BMRCMODE                                0x800000
-#define BTHEVMCFG                               0x7000000
-
-#define BLOOP_FIT_TYPE                          0x1
-#define BUPD_CFO                                0x40
-#define BUPD_CFO_OFFDATA                        0x80
-#define BADV_UPD_CFO                            0x100
-#define BADV_TIME_CTRL                          0x800
-#define BUPD_CLKO                               0x1000
-#define BFC                                     0x6000
-#define BTRACKING_MODE                          0x8000
-#define BPHCMP_ENABLE                           0x10000
-#define BUPD_CLKO_LTF                           0x20000
-#define BCOM_CH_CFO                             0x40000
-#define BCSI_ESTI_MODE                          0x80000
-#define BADV_UPD_EQZ                            0x100000
-#define BUCHCFG                                 0x7000000
-#define BUPDEQZ                                 0x8000000
-
-#define BRX_PESUDO_NOISE_ON                     0x20000000
-#define BRX_PESUDO_NOISE_A                      0xff
-#define BRX_PESUDO_NOISE_B                      0xff00
-#define BRX_PESUDO_NOISE_C                      0xff0000
-#define BRX_PESUDO_NOISE_D                      0xff000000
-#define BRX_PESUDO_NOISESTATE_A                 0xffff
-#define BRX_PESUDO_NOISESTATE_B                 0xffff0000
-#define BRX_PESUDO_NOISESTATE_C                 0xffff
-#define BRX_PESUDO_NOISESTATE_D                 0xffff0000
-
-#define BZEBRA1_HSSIENABLE                      0x8
-#define BZEBRA1_TRXCONTROL                      0xc00
-#define BZEBRA1_TRXGAINSETTING                  0x07f
-#define BZEBRA1_RXCOUNTER                       0xc00
-#define BZEBRA1_TXCHANGEPUMP                    0x38
-#define BZEBRA1_RXCHANGEPUMP                    0x7
-#define BZEBRA1_CHANNEL_NUM                     0xf80
-#define BZEBRA1_TXLPFBW                         0x400
-#define BZEBRA1_RXLPFBW                         0x600
-
-#define BRTL8256REG_MODE_CTRL1                  0x100
-#define BRTL8256REG_MODE_CTRL0                  0x40
-#define BRTL8256REG_TXLPFBW                     0x18
-#define BRTL8256REG_RXLPFBW                     0x600
-
-#define BRTL8258_TXLPFBW                        0xc
-#define BRTL8258_RXLPFBW                        0xc00
-#define BRTL8258_RSSILPFBW                      0xc0
-
-#define BBYTE0                                  0x1
-#define BBYTE1                                  0x2
-#define BBYTE2                                  0x4
-#define BBYTE3                                  0x8
-#define BWORD0                                  0x3
-#define BWORD1                                  0xc
-#define BWORD                                   0xf
-
-#define BENABLE                                 0x1
-#define BDISABLE                                0x0
-
-#define LEFT_ANTENNA                            0x0
-#define RIGHT_ANTENNA                           0x1
-
-#define TCHECK_TXSTATUS                         500
-#define TUPDATE_RXCOUNTER                       100
+#define IS_BB_REG_OFFSET_92S(_offset)   \
+        ((_offset >= 0x800) && (_offset <= 0xfff))
+
+#define BRFMOD                                          0x1
+#define BJAPANMODE                                      0x2
+#define BCCKTXSC                                        0x30
+#define BCCKEN                                          0x1000000
+#define BOFDMEN                                         0x2000000
+
+#define BOFDMRXADCPHASE                 0x10000
+#define BOFDMTXDACPHASE                 0x40000
+#define BXATXAGC                        0x3f
+
+#define BXBTXAGC                        0xf00
+#define BXCTXAGC                        0xf000
+#define BXDTXAGC                        0xf0000
+
+#define BPASTART                        0xf0000000
+#define BTRSTART                        0x00f00000
+#define BRFSTART                        0x0000f000
+#define BBBSTART                        0x000000f0
+#define BBBCCKSTART                     0x0000000f
+#define BPAEND                          0xf
+#define BTREND                          0x0f000000
+#define BRFEND                          0x000f0000
+#define BCCAMASK                        0x000000f0
+#define BR2RCCAMASK                     0x00000f00
+#define BHSSI_R2TDELAY                  0xf8000000
+#define BHSSI_T2RDELAY                  0xf80000
+#define BCONTXHSSI                      0x400
+#define BIGFROMCCK                      0x200
+#define BAGCADDRESS                     0x3f
+#define BRXHPTX                         0x7000
+#define BRXHP2RX                        0x38000
+#define BRXHPCCKINI                     0xc0000
+#define BAGCTXCODE                      0xc00000
+#define BAGCRXCODE                      0x300000
+
+#define B3WIREDATALENGTH                0x800
+#define B3WIREADDREAALENGTH             0x400
+
+#define B3WIRERFPOWERDOWN               0x1
+#define B5GPAPEPOLARITY                 0x40000000
+#define B2GPAPEPOLARITY                 0x80000000
+#define BRFSW_TXDEFAULTANT              0x3
+#define BRFSW_TXOPTIONANT               0x30
+#define BRFSW_RXDEFAULTANT              0x300
+#define BRFSW_RXOPTIONANT               0x3000
+#define BRFSI_3WIREDATA                 0x1
+#define BRFSI_3WIRECLOCK                0x2
+#define BRFSI_3WIRELOAD                 0x4
+#define BRFSI_3WIRERW                   0x8
+#define BRFSI_3WIRE                     0xf
+
+#define BRFSI_RFENV                     0x10
+
+#define BRFSI_TRSW                      0x20
+#define BRFSI_TRSWB                     0x40
+#define BRFSI_ANTSW                     0x100
+#define BRFSI_ANTSWB                    0x200
+#define BRFSI_PAPE                      0x400
+#define BRFSI_PAPE5G                    0x800
+#define BBANDSELECT                     0x1
+#define BHTSIG2_GI                      0x80
+#define BHTSIG2_SMOOTHING               0x01
+#define BHTSIG2_SOUNDING                0x02
+#define BHTSIG2_AGGREATON               0x08
+#define BHTSIG2_STBC                    0x30
+#define BHTSIG2_ADVCODING               0x40
+#define BHTSIG2_NUMOFHTLTF              0x300
+#define BHTSIG2_CRC8                    0x3fc
+#define BHTSIG1_MCS                     0x7f
+#define BHTSIG1_BANDWIDTH               0x80
+#define BHTSIG1_HTLENGTH                0xffff
+#define BLSIG_RATE                      0xf
+#define BLSIG_RESERVED                  0x10
+#define BLSIG_LENGTH                    0x1fffe
+#define BLSIG_PARITY                    0x20
+#define BCCKRXPHASE                     0x4
+
+#define BLSSIREADADDRESS                0x7f800000
+#define BLSSIREADEDGE                   0x80000000
+
+#define BLSSIREADBACKDATA               0xfffff
+
+#define BLSSIREADOKFLAG                 0x1000
+#define BCCKSAMPLERATE                  0x8
+#define BREGULATOR0STANDBY              0x1
+#define BREGULATORPLLSTANDBY            0x2
+#define BREGULATOR1STANDBY              0x4
+#define BPLLPOWERUP                     0x8
+#define BDPLLPOWERUP                    0x10
+#define BDA10POWERUP                    0x20
+#define BAD7POWERUP                     0x200
+#define BDA6POWERUP                     0x2000
+#define BXTALPOWERUP                    0x4000
+#define B40MDCLKPOWERUP                 0x8000
+#define BDA6DEBUGMODE                   0x20000
+#define BDA6SWING                       0x380000
+
+#define BADCLKPHASE                     0x4000000
+#define B80MCLKDELAY                    0x18000000
+#define BAFEWATCHDOGENABLE              0x20000000
+
+#define BXTALCAP01                      0xc0000000
+#define BXTALCAP23                      0x3
+#define BXTALCAP92X                                     0x0f000000
+#define BXTALCAP                        0x0f000000
+
+#define BINTDIFCLKENABLE                0x400
+#define BEXTSIGCLKENABLE                0x800
+#define BBANDGAP_MBIAS_POWERUP      0x10000
+#define BAD11SH_GAIN                    0xc0000
+#define BAD11NPUT_RANGE                 0x700000
+#define BAD110P_CURRENT                 0x3800000
+#define BLPATH_LOOPBACK                 0x4000000
+#define BQPATH_LOOPBACK                 0x8000000
+#define BAFE_LOOPBACK                   0x10000000
+#define BDA10_SWING                     0x7e0
+#define BDA10_REVERSE                   0x800
+#define BDA_CLK_SOURCE              0x1000
+#define BDA7INPUT_RANGE                 0x6000
+#define BDA7_GAIN                       0x38000
+#define BDA7OUTPUT_CM_MODE          0x40000
+#define BDA7INPUT_CM_MODE           0x380000
+#define BDA7CURRENT                     0xc00000
+#define BREGULATOR_ADJUST               0x7000000
+#define BAD11POWERUP_ATTX               0x1
+#define BDA10PS_ATTX                    0x10
+#define BAD11POWERUP_ATRX               0x100
+#define BDA10PS_ATRX                    0x1000
+#define BCCKRX_AGC_FORMAT           0x200
+#define BPSDFFT_SAMPLE_POINT            0xc000
+#define BPSD_AVERAGE_NUM            0x3000
+#define BIQPATH_CONTROL                 0xc00
+#define BPSD_FREQ                       0x3ff
+#define BPSD_ANTENNA_PATH           0x30
+#define BPSD_IQ_SWITCH              0x40
+#define BPSD_RX_TRIGGER             0x400000
+#define BPSD_TX_TRIGGER             0x80000000
+#define BPSD_SINE_TONE_SCALE        0x7f000000
+#define BPSD_REPORT                     0xffff
+
+#define BOFDM_TXSC                      0x30000000
+#define BCCK_TXON                       0x1
+#define BOFDM_TXON                      0x2
+#define BDEBUG_PAGE                     0xfff
+#define BDEBUG_ITEM                     0xff
+#define BANTL                           0x10
+#define BANT_NONHT                  0x100
+#define BANT_HT1                        0x1000
+#define BANT_HT2                        0x10000
+#define BANT_HT1S1                      0x100000
+#define BANT_NONHTS1                    0x1000000
+
+#define BCCK_BBMODE                     0x3
+#define BCCK_TXPOWERSAVING              0x80
+#define BCCK_RXPOWERSAVING              0x40
+
+#define BCCK_SIDEBAND                   0x10
+
+#define BCCK_SCRAMBLE                   0x8
+#define BCCK_ANTDIVERSITY               0x8000
+#define BCCK_CARRIER_RECOVERY           0x4000
+#define BCCK_TXRATE                     0x3000
+#define BCCK_DCCANCEL                   0x0800
+#define BCCK_ISICANCEL                  0x0400
+#define BCCK_MATCH_FILTER           0x0200
+#define BCCK_EQUALIZER                  0x0100
+#define BCCK_PREAMBLE_DETECT            0x800000
+#define BCCK_FAST_FALSECCA          0x400000
+#define BCCK_CH_ESTSTART            0x300000
+#define BCCK_CCA_COUNT              0x080000
+#define BCCK_CS_LIM                     0x070000
+#define BCCK_BIST_MODE              0x80000000
+#define BCCK_CCAMASK                    0x40000000
+#define BCCK_TX_DAC_PHASE               0x4
+#define BCCK_RX_ADC_PHASE               0x20000000
+#define BCCKR_CP_MODE                   0x0100
+#define BCCK_TXDC_OFFSET                0xf0
+#define BCCK_RXDC_OFFSET                0xf
+#define BCCK_CCA_MODE                   0xc000
+#define BCCK_FALSECS_LIM                0x3f00
+#define BCCK_CS_RATIO                   0xc00000
+#define BCCK_CORGBIT_SEL                0x300000
+#define BCCK_PD_LIM                     0x0f0000
+#define BCCK_NEWCCA                     0x80000000
+#define BCCK_RXHP_OF_IG             0x8000
+#define BCCK_RXIG                       0x7f00
+#define BCCK_LNA_POLARITY           0x800000
+#define BCCK_RX1ST_BAIN             0x7f0000
+#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
+#define BCCK_RXAGC_REPORTTYPE           0x0300
+#define BCCK_RXDAGC_EN              0x80000000
+#define BCCK_RXDAGC_PERIOD              0x20000000
+#define BCCK_RXDAGC_SATLEVEL            0x1f000000
+#define BCCK_TIMING_RECOVERY            0x800000
+#define BCCK_TXC0                       0x3f0000
+#define BCCK_TXC1                       0x3f000000
+#define BCCK_TXC2                       0x3f
+#define BCCK_TXC3                       0x3f00
+#define BCCK_TXC4                       0x3f0000
+#define BCCK_TXC5                       0x3f000000
+#define BCCK_TXC6                       0x3f
+#define BCCK_TXC7                       0x3f00
+#define BCCK_DEBUGPORT                  0xff0000
+#define BCCK_DAC_DEBUG              0x0f000000
+#define BCCK_FALSEALARM_ENABLE      0x8000
+#define BCCK_FALSEALARM_READ        0x4000
+#define BCCK_TRSSI                      0x7f
+#define BCCK_RXAGC_REPORT           0xfe
+#define BCCK_RXREPORT_ANTSEL            0x80000000
+#define BCCK_RXREPORT_MFOFF             0x40000000
+#define BCCK_RXREPORT_SQLOSS            0x20000000
+#define BCCK_RXREPORT_PKTLOSS           0x10000000
+#define BCCK_RXREPORT_LOCKEDBIT         0x08000000
+#define BCCK_RXREPORT_RATEERROR         0x04000000
+#define BCCK_RXREPORT_RXRATE            0x03000000
+#define BCCK_RXFA_COUNTER_LOWER     0xff
+#define BCCK_RXFA_COUNTER_UPPER     0xff000000
+#define BCCK_RXHPAGC_START          0xe000
+#define BCCK_RXHPAGC_FINAL          0x1c00
+#define BCCK_RXFALSEALARM_ENABLE    0x8000
+#define BCCK_FACOUNTER_FREEZE       0x4000
+#define BCCK_TXPATH_SEL             0x10000000
+#define BCCK_DEFAULT_RXPATH         0xc000000
+#define BCCK_OPTION_RXPATH          0x3000000
+
+#define BNUM_OFSTF                      0x3
+#define BSHIFT_L                        0xc0
+#define BGI_TH                          0xc
+#define BRXPATH_A                       0x1
+#define BRXPATH_B                       0x2
+#define BRXPATH_C                       0x4
+#define BRXPATH_D                       0x8
+#define BTXPATH_A                       0x1
+#define BTXPATH_B                       0x2
+#define BTXPATH_C                       0x4
+#define BTXPATH_D                       0x8
+#define BTRSSI_FREQ                     0x200
+#define BADC_BACKOFF                    0x3000
+#define BDFIR_BACKOFF                   0xc000
+#define BTRSSI_LATCH_PHASE              0x10000
+#define BRX_LDC_OFFSET                  0xff
+#define BRX_QDC_OFFSET                  0xff00
+#define BRX_DFIR_MODE                   0x1800000
+#define BRX_DCNF_TYPE                   0xe000000
+#define BRXIQIMB_A                      0x3ff
+#define BRXIQIMB_B                      0xfc00
+#define BRXIQIMB_C                      0x3f0000
+#define BRXIQIMB_D                      0xffc00000
+#define BDC_DC_NOTCH                    0x60000
+#define BRXNB_NOTCH                     0x1f000000
+#define BPD_TH                          0xf
+#define BPD_TH_OPT2                     0xc000
+#define BPWED_TH                        0x700
+#define BIFMF_WIN_L                     0x800
+#define BPD_OPTION                      0x1000
+#define BMF_WIN_L                       0xe000
+#define BBW_SEARCH_L                    0x30000
+#define BWIN_ENH_L                      0xc0000
+#define BBW_TH                          0x700000
+#define BED_TH2                         0x3800000
+#define BBW_OPTION                      0x4000000
+#define BRADIO_TH                       0x18000000
+#define BWINDOW_L                       0xe0000000
+#define BSBD_OPTION                     0x1
+#define BFRAME_TH                       0x1c
+#define BFS_OPTION                      0x60
+#define BDC_SLOPE_CHECK                 0x80
+#define BFGUARD_COUNTER_DC_L            0xe00
+#define BFRAME_WEIGHT_SHORT             0x7000
+#define BSUB_TUNE                       0xe00000
+#define BFRAME_DC_LENGTH                0xe000000
+#define BSBD_START_OFFSET               0x30000000
+#define BFRAME_TH_2                     0x7
+#define BFRAME_GI2_TH                   0x38
+#define BGI2_SYNC_EN                    0x40
+#define BSARCH_SHORT_EARLY              0x300
+#define BSARCH_SHORT_LATE               0xc00
+#define BSARCH_GI2_LATE                 0x70000
+#define BCFOANTSUM                      0x1
+#define BCFOACC                         0x2
+#define BCFOSTARTOFFSET                 0xc
+#define BCFOLOOPBACK                    0x70
+#define BCFOSUMWEIGHT                   0x80
+#define BDAGCENABLE                     0x10000
+#define BTXIQIMB_A                      0x3ff
+#define BTXIQIMB_b                      0xfc00
+#define BTXIQIMB_C                      0x3f0000
+#define BTXIQIMB_D                      0xffc00000
+#define BTXIDCOFFSET                    0xff
+#define BTXIQDCOFFSET                   0xff00
+#define BTXDFIRMODE                     0x10000
+#define BTXPESUDO_NOISEON               0x4000000
+#define BTXPESUDO_NOISE_A               0xff
+#define BTXPESUDO_NOISE_B               0xff00
+#define BTXPESUDO_NOISE_C               0xff0000
+#define BTXPESUDO_NOISE_D               0xff000000
+#define BCCA_DROPOPTION                 0x20000
+#define BCCA_DROPTHRES                  0xfff00000
+#define BEDCCA_H                        0xf
+#define BEDCCA_L                        0xf0
+#define BLAMBDA_ED                      0x300
+#define BRX_INITIALGAIN                 0x7f
+#define BRX_ANTDIV_EN                   0x80
+#define BRX_AGC_ADDRESS_FOR_LNA     0x7f00
+#define BRX_HIGHPOWER_FLOW              0x8000
+#define BRX_AGC_FREEZE_THRES        0xc0000
+#define BRX_FREEZESTEP_AGC1             0x300000
+#define BRX_FREEZESTEP_AGC2             0xc00000
+#define BRX_FREEZESTEP_AGC3             0x3000000
+#define BRX_FREEZESTEP_AGC0             0xc000000
+#define BRXRSSI_CMP_EN                  0x10000000
+#define BRXQUICK_AGCEN                  0x20000000
+#define BRXAGC_FREEZE_THRES_MODE    0x40000000
+#define BRX_OVERFLOW_CHECKTYPE          0x80000000
+#define BRX_AGCSHIFT                    0x7f
+#define BTRSW_TRI_ONLY                  0x80
+#define BPOWER_THRES                    0x300
+#define BRXAGC_EN                       0x1
+#define BRXAGC_TOGETHER_EN              0x2
+#define BRXAGC_MIN                      0x4
+#define BRXHP_INI                       0x7
+#define BRXHP_TRLNA                     0x70
+#define BRXHP_RSSI                      0x700
+#define BRXHP_BBP1                      0x7000
+#define BRXHP_BBP2                      0x70000
+#define BRXHP_BBP3                      0x700000
+#define BRSSI_H                         0x7f0000
+#define BRSSI_GEN                       0x7f000000
+#define BRXSETTLE_TRSW                  0x7
+#define BRXSETTLE_LNA                   0x38
+#define BRXSETTLE_RSSI                  0x1c0
+#define BRXSETTLE_BBP                   0xe00
+#define BRXSETTLE_RXHP                  0x7000
+#define BRXSETTLE_ANTSW_RSSI            0x38000
+#define BRXSETTLE_ANTSW                 0xc0000
+#define BRXPROCESS_TIME_DAGC            0x300000
+#define BRXSETTLE_HSSI                  0x400000
+#define BRXPROCESS_TIME_BBPPW           0x800000
+#define BRXANTENNA_POWER_SHIFT          0x3000000
+#define BRSSI_TABLE_SELECT              0xc000000
+#define BRXHP_FINAL                     0x7000000
+#define BRXHPSETTLE_BBP                 0x7
+#define BRXHTSETTLE_HSSI                0x8
+#define BRXHTSETTLE_RXHP                0x70
+#define BRXHTSETTLE_BBPPW               0x80
+#define BRXHTSETTLE_IDLE                0x300
+#define BRXHTSETTLE_RESERVED            0x1c00
+#define BRXHT_RXHP_EN                   0x8000
+#define BRXAGC_FREEZE_THRES             0x30000
+#define BRXAGC_TOGETHEREN               0x40000
+#define BRXHTAGC_MIN                    0x80000
+#define BRXHTAGC_EN                     0x100000
+#define BRXHTDAGC_EN                    0x200000
+#define BRXHT_RXHP_BBP                  0x1c00000
+#define BRXHT_RXHP_FINAL                0xe0000000
+#define BRXPW_RADIO_TH                  0x3
+#define BRXPW_RADIO_EN                  0x4
+#define BRXMF_HOLD                      0x3800
+#define BRXPD_DELAY_TH1                 0x38
+#define BRXPD_DELAY_TH2                 0x1c0
+#define BRXPD_DC_COUNT_MAX              0x600
+#define BRXPD_DELAY_TH                  0x8000
+#define BRXPROCESS_DELAY                0xf0000
+#define BRXSEARCHRANGE_GI2_EARLY        0x700000
+#define BRXFRAME_FUARD_COUNTER_L        0x3800000
+#define BRXSGI_GUARD_L                  0xc000000
+#define BRXSGI_SEARCH_L                 0x30000000
+#define BRXSGI_TH                       0xc0000000
+#define BDFSCNT0                        0xff
+#define BDFSCNT1                        0xff00
+#define BDFSFLAG                        0xf0000
+#define BMF_WEIGHT_SUM                  0x300000
+#define BMINIDX_TH                      0x7f000000
+#define BDAFORMAT                       0x40000
+#define BTXCH_EMU_ENABLE                0x01000000
+#define BTRSW_ISOLATION_A               0x7f
+#define BTRSW_ISOLATION_B               0x7f00
+#define BTRSW_ISOLATION_C               0x7f0000
+#define BTRSW_ISOLATION_D               0x7f000000
+#define BEXT_LNA_GAIN                   0x7c00
+
+#define BSTBC_EN                        0x4
+#define BANTENNA_MAPPING                0x10
+#define BNSS                            0x20
+#define BCFO_ANTSUM_ID              0x200
+#define BPHY_COUNTER_RESET              0x8000000
+#define BCFO_REPORT_GET                 0x4000000
+#define BOFDM_CONTINUE_TX               0x10000000
+#define BOFDM_SINGLE_CARRIER            0x20000000
+#define BOFDM_SINGLE_TONE               0x40000000
+#define BHT_DETECT                      0x100
+#define BCFOEN                          0x10000
+#define BCFOVALUE                       0xfff00000
+#define BSIGTONE_RE                     0x3f
+#define BSIGTONE_IM                     0x7f00
+#define BCOUNTER_CCA                    0xffff
+#define BCOUNTER_PARITYFAIL             0xffff0000
+#define BCOUNTER_RATEILLEGAL            0xffff
+#define BCOUNTER_CRC8FAIL               0xffff0000
+#define BCOUNTER_MCSNOSUPPORT           0xffff
+#define BCOUNTER_FASTSYNC               0xffff
+#define BSHORTCFO                       0xfff
+#define BSHORTCFOT_LENGTH               12
+#define BSHORTCFOF_LENGTH               11
+#define BLONGCFO                        0x7ff
+#define BLONGCFOT_LENGTH                11
+#define BLONGCFOF_LENGTH                11
+#define BTAILCFO                        0x1fff
+#define BTAILCFOT_LENGTH                13
+#define BTAILCFOF_LENGTH                12
+#define BNOISE_EN_PWDB                  0xffff
+#define BCC_POWER_DB                    0xffff0000
+#define BMOISE_PWDB                     0xffff
+#define BPOWERMEAST_LENGTH              10
+#define BPOWERMEASF_LENGTH              3
+#define BRX_HT_BW                       0x1
+#define BRXSC                           0x6
+#define BRX_HT                          0x8
+#define BNB_INTF_DET_ON                 0x1
+#define BINTF_WIN_LEN_CFG               0x30
+#define BNB_INTF_TH_CFG                 0x1c0
+#define BRFGAIN                         0x3f
+#define BTABLESEL                       0x40
+#define BTRSW                           0x80
+#define BRXSNR_A                        0xff
+#define BRXSNR_B                        0xff00
+#define BRXSNR_C                        0xff0000
+#define BRXSNR_D                        0xff000000
+#define BSNR_EVMT_LENGTH                8
+#define BSNR_EVMF_LENGTH                1
+#define BCSI1ST                         0xff
+#define BCSI2ND                         0xff00
+#define BRXEVM1ST                       0xff0000
+#define BRXEVM2ND                       0xff000000
+#define BSIGEVM                         0xff
+#define BPWDB                           0xff00
+#define BSGIEN                          0x10000
+
+#define BSFACTOR_QMA1                   0xf
+#define BSFACTOR_QMA2                   0xf0
+#define BSFACTOR_QMA3                   0xf00
+#define BSFACTOR_QMA4                   0xf000
+#define BSFACTOR_QMA5                   0xf0000
+#define BSFACTOR_QMA6                   0xf0000
+#define BSFACTOR_QMA7                   0xf00000
+#define BSFACTOR_QMA8                   0xf000000
+#define BSFACTOR_QMA9                   0xf0000000
+#define BCSI_SCHEME                     0x100000
+
+#define BNOISE_LVL_TOP_SET          0x3
+#define BCHSMOOTH                       0x4
+#define BCHSMOOTH_CFG1                  0x38
+#define BCHSMOOTH_CFG2                  0x1c0
+#define BCHSMOOTH_CFG3                  0xe00
+#define BCHSMOOTH_CFG4                  0x7000
+#define BMRCMODE                        0x800000
+#define BTHEVMCFG                       0x7000000
+
+#define BLOOP_FIT_TYPE                  0x1
+#define BUPD_CFO                        0x40
+#define BUPD_CFO_OFFDATA                0x80
+#define BADV_UPD_CFO                    0x100
+#define BADV_TIME_CTRL                  0x800
+#define BUPD_CLKO                       0x1000
+#define BFC                             0x6000
+#define BTRACKING_MODE                  0x8000
+#define BPHCMP_ENABLE                   0x10000
+#define BUPD_CLKO_LTF                   0x20000
+#define BCOM_CH_CFO                     0x40000
+#define BCSI_ESTI_MODE                  0x80000
+#define BADV_UPD_EQZ                    0x100000
+#define BUCHCFG                         0x7000000
+#define BUPDEQZ                         0x8000000
+
+#define BRX_PESUDO_NOISE_ON         0x20000000
+#define BRX_PESUDO_NOISE_A              0xff
+#define BRX_PESUDO_NOISE_B              0xff00
+#define BRX_PESUDO_NOISE_C              0xff0000
+#define BRX_PESUDO_NOISE_D              0xff000000
+#define BRX_PESUDO_NOISESTATE_A     0xffff
+#define BRX_PESUDO_NOISESTATE_B     0xffff0000
+#define BRX_PESUDO_NOISESTATE_C     0xffff
+#define BRX_PESUDO_NOISESTATE_D     0xffff0000
+
+#define BZEBRA1_HSSIENABLE              0x8
+#define BZEBRA1_TRXCONTROL              0xc00
+#define BZEBRA1_TRXGAINSETTING          0x07f
+#define BZEBRA1_RXCOUNTER               0xc00
+#define BZEBRA1_TXCHANGEPUMP            0x38
+#define BZEBRA1_RXCHANGEPUMP            0x7
+#define BZEBRA1_CHANNEL_NUM             0xf80
+#define BZEBRA1_TXLPFBW                 0x400
+#define BZEBRA1_RXLPFBW                 0x600
+
+#define BRTL8256REG_MODE_CTRL1      0x100
+#define BRTL8256REG_MODE_CTRL0      0x40
+#define BRTL8256REG_TXLPFBW         0x18
+#define BRTL8256REG_RXLPFBW         0x600
+
+#define BRTL8258_TXLPFBW                0xc
+#define BRTL8258_RXLPFBW                0xc00
+#define BRTL8258_RSSILPFBW              0xc0
+
+#define BBYTE0                          0x1
+#define BBYTE1                          0x2
+#define BBYTE2                          0x4
+#define BBYTE3                          0x8
+#define BWORD0                          0x3
+#define BWORD1                          0xc
+#define BWORD                           0xf
+
+#define MASKBYTE0                       0xff
+#define MASKBYTE1                       0xff00
+#define MASKBYTE2                       0xff0000
+#define MASKBYTE3                       0xff000000
+#define MASKHWORD                       0xffff0000
+#define MASKLWORD                       0x0000ffff
+#define MASKDWORD                                       0xffffffff
+#define MASK12BITS                                      0xfff
+#define MASKH4BITS                                      0xf0000000
+#define MASKOFDM_D                                      0xffc00000
+#define MASKCCK                                         0x3f3f3f3f
+
+#define MASK4BITS                       0x0f
+#define MASK20BITS                      0xfffff
+#define RFREG_OFFSET_MASK                       0xfffff
+
+#define BENABLE                         0x1
+#define BDISABLE                        0x0
+
+#define LEFT_ANTENNA                    0x0
+#define RIGHT_ANTENNA                   0x1
+
+#define TCHECK_TXSTATUS                 500
+#define TUPDATE_RXCOUNTER               100
 
 /* 2 EFUSE_TEST (For RTL8723 partially) */
-#define EFUSE_SEL(x)                            (((x) & 0x3) << 8)
+#define EFUSE_SEL(x)                                    (((x) & 0x3) << 8)
 #define EFUSE_SEL_MASK                          0x300
-#define EFUSE_WIFI_SEL_0                        0x0
-
+#define EFUSE_WIFI_SEL_0                                0x0
 /* Enable GPIO[9] as WiFi HW PDn source*/
-#define WL_HWPDN_EN                             BIT(0)
+#define WL_HWPDN_EN                                     BIT(0)
 /* WiFi HW PDn polarity control*/
-#define WL_HWPDN_SL                             BIT(1)
+#define WL_HWPDN_SL                                     BIT(1)
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/rf.c b/drivers/net/wireless/rtlwifi/rtl8723ae/rf.c
index 50dd2fb2c93d..9ebc8281ff99 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/rf.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -34,10 +30,12 @@
 #include "rf.h"
 #include "dm.h"
 
-void rtl8723ae_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
+static bool _rtl8723e_phy_rf6052_config_parafile(struct ieee80211_hw *hw);
+
+void rtl8723e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
         switch (bandwidth) {
         case HT_CHANNEL_WIDTH_20:
@@ -59,11 +57,11 @@ void rtl8723ae_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
         }
 }
 
-void rtl8723ae_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
-                                          u8 *ppowerlevel)
+void rtl8723e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
+                                         u8 *ppowerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u32 tx_agc[2] = {0, 0}, tmpval;
@@ -79,7 +77,8 @@ void rtl8723ae_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
                 tx_agc[RF90_PATH_B] = 0x3f3f3f3f;
 
                 if (turbo_scanoff) {
-                        for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
+                        for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B;
+                                idx1++) {
                                 tx_agc[idx1] = ppowerlevel[idx1] |
                                     (ppowerlevel[idx1] << 8) |
                                     (ppowerlevel[idx1] << 16) |
@@ -89,24 +88,27 @@ void rtl8723ae_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         } else {
                 for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
                         tx_agc[idx1] = ppowerlevel[idx1] |
-                                       (ppowerlevel[idx1] << 8) |
-                                       (ppowerlevel[idx1] << 16) |
-                                       (ppowerlevel[idx1] << 24);
+                            (ppowerlevel[idx1] << 8) |
+                            (ppowerlevel[idx1] << 16) |
+                            (ppowerlevel[idx1] << 24);
                 }
 
                 if (rtlefuse->eeprom_regulatory == 0) {
-                        tmpval = (rtlphy->mcs_offset[0][6]) +
-                                (rtlphy->mcs_offset[0][7] << 8);
+                        tmpval =
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][6]) +
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][7] <<
+                             8);
                         tx_agc[RF90_PATH_A] += tmpval;
 
-                        tmpval = (rtlphy->mcs_offset[0][14]) +
-                            (rtlphy->mcs_offset[0][15] << 24);
+                        tmpval = (rtlphy->mcs_txpwrlevel_origoffset[0][14]) +
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][15] <<
+                             24);
                         tx_agc[RF90_PATH_B] += tmpval;
                 }
         }
 
         for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
-                ptr = (u8 *) (&(tx_agc[idx1]));
+                ptr = (u8 *)&tx_agc[idx1];
                 for (idx2 = 0; idx2 < 4; idx2++) {
                         if (*ptr > RF6052_MAX_TX_PWR)
                                 *ptr = RF6052_MAX_TX_PWR;
@@ -119,7 +121,7 @@ void rtl8723ae_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                 "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_A_CCK1_MCS32);
+                 RTXAGC_A_CCK1_MCS32);
 
         tmpval = tx_agc[RF90_PATH_A] >> 8;
 
@@ -129,100 +131,99 @@ void rtl8723ae_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                 "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK11_A_CCK2_11);
+                 RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                 "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK11_A_CCK2_11);
+                 RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                 "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK1_55_MCS32);
+                 RTXAGC_B_CCK1_55_MCS32);
 }
 
-static void rtl8723ae_phy_get_power_base(struct ieee80211_hw *hw,
-                                         u8 *ppowerlevel, u8 channel,
-                                         u32 *ofdmbase, u32 *mcsbase)
+static void rtl8723e_phy_get_power_base(struct ieee80211_hw *hw,
+                                        u8 *ppowerlevel, u8 channel,
+                                        u32 *ofdmbase, u32 *mcsbase)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        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));
+                         ((i == 0) ? 'A' : 'B'), *(ofdmbase + i));
         }
 
         for (i = 0; i < 2; i++) {
                 if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20) {
-                        ht20_pwrdiff = rtlefuse->txpwr_ht20diff[i][channel - 1];
+                        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",
-                        ((i == 0) ? 'A' : 'B'), *(mcsbase + i));
+                         ((i == 0) ? 'A' : 'B'), *(mcsbase + i));
         }
 }
 
-static void rtl8723ae_get_txpwr_val_by_reg(struct ieee80211_hw *hw,
-                                           u8 channel, u8 index,
-                                           u32 *powerBase0,
-                                           u32 *powerBase1,
-                                           u32 *p_outwriteval)
+static void get_txpower_writeval_by_reg(struct ieee80211_hw *hw,
+                                        u8 channel, u8 index,
+                                        u32 *powerbase0,
+                                        u32 *powerbase1,
+                                        u32 *p_outwriteval)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        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 + (rf ? 8 : 0)] +
-                                   ((index < 2) ? powerBase0[rf] :
-                                   powerBase1[rf]);
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup][index +
+                                                                (rf ? 8 : 0)]
+                            + ((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;
@@ -234,29 +235,30 @@ static void rtl8723ae_get_txpwr_val_by_reg(struct ieee80211_hw *hw,
                                         else if (channel > 9)
                                                 chnlgroup = 2;
                                         if (rtlphy->current_chan_bw ==
-                                            HT_CHANNEL_WIDTH_20)
+                                                HT_CHANNEL_WIDTH_20)
                                                 chnlgroup++;
                                         else
                                                 chnlgroup += 4;
                                 }
 
-                                writeVal = rtlphy->mcs_offset[chnlgroup]
+                                writeval =
+                                    rtlphy->mcs_txpwrlevel_origoffset[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;
@@ -265,18 +267,21 @@ static void rtl8723ae_get_txpwr_val_by_reg(struct ieee80211_hw *hw,
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                         "customer's limit, 40MHz rf(%c) = 0x%x\n",
                                         ((rf == 0) ? 'A' : 'B'),
-                                        rtlefuse->pwrgroup_ht40[rf][channel-1]);
+                                        rtlefuse->pwrgroup_ht40[rf][channel -
+                                                                     1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                         "customer's limit, 20MHz rf(%c) = 0x%x\n",
                                         ((rf == 0) ? 'A' : 'B'),
-                                        rtlefuse->pwrgroup_ht20[rf][channel-1]);
+                                        rtlefuse->pwrgroup_ht20[rf][channel -
+                                                                     1]);
                         }
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
-                                        (u8) ((rtlphy->mcs_offset
-                                        [chnlgroup][index + (rf ? 8 : 0)] &
-                                        (0x7f << (i * 8))) >> (i * 8));
+                                    (u8)((rtlphy->mcs_txpwrlevel_origoffset
+                                          [chnlgroup][index +
+                                                (rf ? 8 : 0)] & (0x7f <<
+                                                (i * 8))) >> (i * 8));
 
                                 if (rtlphy->current_chan_bw ==
                                     HT_CHANNEL_WIDTH_20_40) {
@@ -302,41 +307,42 @@ static void rtl8723ae_get_txpwr_val_by_reg(struct ieee80211_hw *hw,
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                 "Customer's limit rf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), customer_limit);
+                                 ((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][index +
-                            (rf ? 8 : 0)] + ((index < 2) ? powerBase0[rf] :
-                            powerBase1[rf]);
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
+                            [index + (rf ? 8 : 0)]
+                            + ((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 _rtl8723ae_write_ofdm_power_reg(struct ieee80211_hw *hw,
-                                            u8 index, u32 *pValue)
+static void _rtl8723e_write_ofdm_power_reg(struct ieee80211_hw *hw,
+                                           u8 index, u32 *pvalue)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
         u16 regoffset_a[6] = {
                 RTXAGC_A_RATE18_06, RTXAGC_A_RATE54_24,
@@ -349,29 +355,29 @@ static void _rtl8723ae_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 = pvalue[rf];
                 for (i = 0; i < 4; i++) {
-                        pwr_val[i] = (u8) ((writeVal & (0x7f <<
-                                                        (i * 8))) >> (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 ||
@@ -380,7 +386,7 @@ static void _rtl8723ae_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;
@@ -389,37 +395,49 @@ static void _rtl8723ae_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);
                         }
                 }
         }
 }
 
-void rtl8723ae_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
-                                           u8 *ppowerlevel, u8 channel)
+void rtl8723e_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;
 
-        rtl8723ae_phy_get_power_base(hw, ppowerlevel,
-                                  channel, &powerBase0[0], &powerBase1[0]);
+        rtl8723e_phy_get_power_base(hw, ppowerlevel,
+                                    channel, &powerbase0[0], &powerbase1[0]);
 
         for (index = 0; index < 6; index++) {
-                rtl8723ae_get_txpwr_val_by_reg(hw, channel, index,
-                                              &powerBase0[0],
-                                              &powerBase1[0],
-                                              &writeVal[0]);
+                get_txpower_writeval_by_reg(hw, channel, index, &powerbase0[0],
+                                            &powerbase1[0],
+                                            &writeval[0]);
 
-                _rtl8723ae_write_ofdm_power_reg(hw, index, &writeVal[0]);
+                _rtl8723e_write_ofdm_power_reg(hw, index, &writeval[0]);
         }
 }
 
-static bool _rtl8723ae_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
+bool rtl8723e_phy_rf6052_config(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        if (rtlphy->rf_type == RF_1T1R)
+                rtlphy->num_total_rfpath = 1;
+        else
+                rtlphy->num_total_rfpath = 2;
+
+        return _rtl8723e_phy_rf6052_config_parafile(hw);
+}
+
+static bool _rtl8723e_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u32 u4_regvalue = 0;
         u8 rfpath;
         bool rtstatus = true;
@@ -457,11 +475,12 @@ static bool _rtl8723ae_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
 
                 switch (rfpath) {
                 case RF90_PATH_A:
-                        rtstatus = rtl8723ae_phy_config_rf_with_headerfile(hw,
+                        rtstatus = rtl8723e_phy_config_rf_with_headerfile(hw,
                                                 (enum radio_path)rfpath);
                         break;
                 case RF90_PATH_B:
-                        rtstatus = rtl8723ae_phy_config_rf_with_headerfile(hw,
+                        rtstatus =
+                          rtl8723e_phy_config_rf_with_headerfile(hw,
                                                 (enum radio_path)rfpath);
                         break;
                 case RF90_PATH_C:
@@ -469,6 +488,7 @@ static bool _rtl8723ae_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
                 case RF90_PATH_D:
                         break;
                 }
+
                 switch (rfpath) {
                 case RF90_PATH_A:
                 case RF90_PATH_C:
@@ -481,25 +501,14 @@ static bool _rtl8723ae_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
                                       BRFSI_RFENV << 16, u4_regvalue);
                         break;
                 }
+
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                                  "Radio[%d] Fail!!", rfpath);
                         return false;
                 }
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
-        return rtstatus;
-}
-
-bool rtl8723ae_phy_rf6052_config(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
-        if (rtlphy->rf_type == RF_1T1R)
-                rtlphy->num_total_rfpath = 1;
-        else
-                rtlphy->num_total_rfpath = 2;
-
-        return _rtl8723ae_phy_rf6052_config_parafile(hw);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "\n");
+        return rtstatus;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/rf.h b/drivers/net/wireless/rtlwifi/rtl8723ae/rf.h
index 57f1933ee663..f3f45b16361f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/rf.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -31,12 +27,14 @@
 #define __RTL8723E_RF_H__
 
 #define RF6052_MAX_TX_PWR               0x3F
+#define RF6052_MAX_REG                  0x3F
 
-void rtl8723ae_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth);
-void rtl8723ae_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
-                                          u8 *ppowerlevel);
-void rtl8723ae_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
-                                           u8 *ppowerlevel, u8 channel);
-bool rtl8723ae_phy_rf6052_config(struct ieee80211_hw *hw);
+void rtl8723e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
+                                       u8 bandwidth);
+void rtl8723e_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
+                                         u8 *ppowerlevel);
+void rtl8723e_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
+                                          u8 *ppowerlevel, u8 channel);
+bool rtl8723e_phy_rf6052_config(struct ieee80211_hw *hw);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
index 73cba1eec8cf..8280bab43df4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -28,34 +24,35 @@
  *****************************************************************************/
 
 #include "../wifi.h"
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-
 #include "../core.h"
 #include "../pci.h"
-#include "../base.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
-#include "../rtl8723com/phy_common.h"
 #include "dm.h"
-#include "hw.h"
 #include "fw.h"
 #include "../rtl8723com/fw_common.h"
+#include "hw.h"
 #include "sw.h"
 #include "trx.h"
 #include "led.h"
 #include "table.h"
 #include "hal_btc.h"
+#include "../btcoexist/rtl_btc.h"
+#include "../rtl8723com/phy_common.h"
 
-static void rtl8723ae_init_aspm_vars(struct ieee80211_hw *hw)
+#include <linux/vmalloc.h>
+#include <linux/module.h>
+
+static void rtl8723e_init_aspm_vars(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
         /*close ASPM for AMD defaultly */
         rtlpci->const_amdpci_aspm = 0;
 
-        /* ASPM PS mode.
+        /**
+         * ASPM PS mode.
          * 0 - Disable ASPM,
          * 1 - Enable ASPM without Clock Req,
          * 2 - Enable ASPM with Clock Req,
@@ -71,7 +68,8 @@ static void rtl8723ae_init_aspm_vars(struct ieee80211_hw *hw)
         /*Setting for PCI-E bridge */
         rtlpci->const_hostpci_aspm_setting = 0x02;
 
-        /* In Hw/Sw Radio Off situation.
+        /**
+         * In Hw/Sw Radio Off situation.
          * 0 - Default,
          * 1 - From ASPM setting without low Mac Pwr,
          * 2 - From ASPM setting with low Mac Pwr,
@@ -80,7 +78,8 @@ static void rtl8723ae_init_aspm_vars(struct ieee80211_hw *hw)
          */
         rtlpci->const_hwsw_rfoff_d3 = 0;
 
-        /* This setting works for those device with
+        /**
+         * This setting works for those device with
          * backdoor ASPM setting such as EPHY setting.
          * 0 - Not support ASPM,
          * 1 - Support ASPM,
@@ -89,14 +88,17 @@ static void rtl8723ae_init_aspm_vars(struct ieee80211_hw *hw)
         rtlpci->const_support_pciaspm = 1;
 }
 
-int rtl8723ae_init_sw_vars(struct ieee80211_hw *hw)
+int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        int err;
+        int err = 0;
+
+        rtl8723e_bt_reg_init(hw);
+
+        rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();
 
-        rtl8723ae_bt_reg_init(hw);
         rtlpriv->dm.dm_initialgain_enable = 1;
         rtlpriv->dm.dm_flag = 0;
         rtlpriv->dm.disable_framebursting = 0;
@@ -138,7 +140,9 @@ int rtl8723ae_init_sw_vars(struct ieee80211_hw *hw)
                    PHIMR_PSTIMEOUT |
                    0);
 
-        rtlpci->irq_mask[1] = (u32)(PHIMR_RXFOVW | 0);
+        rtlpci->irq_mask[1]     =
+                 (u32)(PHIMR_RXFOVW |
+                                0);
 
         /* for debug level */
         rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
@@ -146,12 +150,11 @@ int rtl8723ae_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
+        if (rtlpriv->cfg->mod_params->disable_watchdog)
+                pr_info("watchdog disabled\n");
         rtlpriv->psc.reg_fwctrl_lps = 3;
         rtlpriv->psc.reg_max_lps_awakeintvl = 5;
-        /* for ASPM, you can close aspm through
-         * set const_support_pciaspm = 0
-         */
-        rtl8723ae_init_aspm_vars(hw);
+        rtl8723e_init_aspm_vars(hw);
 
         if (rtlpriv->psc.reg_fwctrl_lps == 1)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_MIN_MODE;
@@ -161,7 +164,7 @@ int rtl8723ae_init_sw_vars(struct ieee80211_hw *hw)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
         /* for firmware buf */
-        rtlpriv->rtlhal.pfirmware = vmalloc(0x6000);
+        rtlpriv->rtlhal.pfirmware = vzalloc(0x6000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Can't alloc buffer for fw.\n");
@@ -186,7 +189,7 @@ int rtl8723ae_init_sw_vars(struct ieee80211_hw *hw)
         return 0;
 }
 
-void rtl8723ae_deinit_sw_vars(struct ieee80211_hw *hw)
+void rtl8723e_deinit_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
@@ -196,59 +199,69 @@ void rtl8723ae_deinit_sw_vars(struct ieee80211_hw *hw)
         }
 }
 
-static bool is_fw_header(struct rtl92c_firmware_header *hdr)
+/* get bt coexist status */
+bool rtl8723e_get_btc_status(void)
+{
+        return true;
+}
+
+static bool is_fw_header(struct rtl8723e_firmware_header *hdr)
 {
         return (hdr->signature & 0xfff0) == 0x2300;
 }
 
-static struct rtl_hal_ops rtl8723ae_hal_ops = {
-        .init_sw_vars = rtl8723ae_init_sw_vars,
-        .deinit_sw_vars = rtl8723ae_deinit_sw_vars,
-        .read_eeprom_info = rtl8723ae_read_eeprom_info,
-        .interrupt_recognized = rtl8723ae_interrupt_recognized,
-        .hw_init = rtl8723ae_hw_init,
-        .hw_disable = rtl8723ae_card_disable,
-        .hw_suspend = rtl8723ae_suspend,
-        .hw_resume = rtl8723ae_resume,
-        .enable_interrupt = rtl8723ae_enable_interrupt,
-        .disable_interrupt = rtl8723ae_disable_interrupt,
-        .set_network_type = rtl8723ae_set_network_type,
-        .set_chk_bssid = rtl8723ae_set_check_bssid,
-        .set_qos = rtl8723ae_set_qos,
-        .set_bcn_reg = rtl8723ae_set_beacon_related_registers,
-        .set_bcn_intv = rtl8723ae_set_beacon_interval,
-        .update_interrupt_mask = rtl8723ae_update_interrupt_mask,
-        .get_hw_reg = rtl8723ae_get_hw_reg,
-        .set_hw_reg = rtl8723ae_set_hw_reg,
-        .update_rate_tbl = rtl8723ae_update_hal_rate_tbl,
-        .fill_tx_desc = rtl8723ae_tx_fill_desc,
-        .fill_tx_cmddesc = rtl8723ae_tx_fill_cmddesc,
-        .query_rx_desc = rtl8723ae_rx_query_desc,
-        .set_channel_access = rtl8723ae_update_channel_access_setting,
-        .radio_onoff_checking = rtl8723ae_gpio_radio_on_off_checking,
-        .set_bw_mode = rtl8723ae_phy_set_bw_mode,
-        .switch_channel = rtl8723ae_phy_sw_chnl,
-        .dm_watchdog = rtl8723ae_dm_watchdog,
-        .scan_operation_backup = rtl_phy_scan_operation_backup,
-        .set_rf_power_state = rtl8723ae_phy_set_rf_power_state,
-        .led_control = rtl8723ae_led_control,
-        .set_desc = rtl8723ae_set_desc,
-        .get_desc = rtl8723ae_get_desc,
-        .tx_polling = rtl8723ae_tx_polling,
-        .enable_hw_sec = rtl8723ae_enable_hw_security_config,
-        .set_key = rtl8723ae_set_key,
-        .init_sw_leds = rtl8723ae_init_sw_leds,
+static struct rtl_hal_ops rtl8723e_hal_ops = {
+        .init_sw_vars = rtl8723e_init_sw_vars,
+        .deinit_sw_vars = rtl8723e_deinit_sw_vars,
+        .read_eeprom_info = rtl8723e_read_eeprom_info,
+        .interrupt_recognized = rtl8723e_interrupt_recognized,
+        .hw_init = rtl8723e_hw_init,
+        .hw_disable = rtl8723e_card_disable,
+        .hw_suspend = rtl8723e_suspend,
+        .hw_resume = rtl8723e_resume,
+        .enable_interrupt = rtl8723e_enable_interrupt,
+        .disable_interrupt = rtl8723e_disable_interrupt,
+        .set_network_type = rtl8723e_set_network_type,
+        .set_chk_bssid = rtl8723e_set_check_bssid,
+        .set_qos = rtl8723e_set_qos,
+        .set_bcn_reg = rtl8723e_set_beacon_related_registers,
+        .set_bcn_intv = rtl8723e_set_beacon_interval,
+        .update_interrupt_mask = rtl8723e_update_interrupt_mask,
+        .get_hw_reg = rtl8723e_get_hw_reg,
+        .set_hw_reg = rtl8723e_set_hw_reg,
+        .update_rate_tbl = rtl8723e_update_hal_rate_tbl,
+        .fill_tx_desc = rtl8723e_tx_fill_desc,
+        .fill_tx_cmddesc = rtl8723e_tx_fill_cmddesc,
+        .query_rx_desc = rtl8723e_rx_query_desc,
+        .set_channel_access = rtl8723e_update_channel_access_setting,
+        .radio_onoff_checking = rtl8723e_gpio_radio_on_off_checking,
+        .set_bw_mode = rtl8723e_phy_set_bw_mode,
+        .switch_channel = rtl8723e_phy_sw_chnl,
+        .dm_watchdog = rtl8723e_dm_watchdog,
+        .scan_operation_backup = rtl8723e_phy_scan_operation_backup,
+        .set_rf_power_state = rtl8723e_phy_set_rf_power_state,
+        .led_control = rtl8723e_led_control,
+        .set_desc = rtl8723e_set_desc,
+        .get_desc = rtl8723e_get_desc,
+        .is_tx_desc_closed = rtl8723e_is_tx_desc_closed,
+        .tx_polling = rtl8723e_tx_polling,
+        .enable_hw_sec = rtl8723e_enable_hw_security_config,
+        .set_key = rtl8723e_set_key,
+        .init_sw_leds = rtl8723e_init_sw_leds,
         .get_bbreg = rtl8723_phy_query_bb_reg,
         .set_bbreg = rtl8723_phy_set_bb_reg,
-        .get_rfreg = rtl8723ae_phy_query_rf_reg,
-        .set_rfreg = rtl8723ae_phy_set_rf_reg,
+        .get_rfreg = rtl8723e_phy_query_rf_reg,
+        .set_rfreg = rtl8723e_phy_set_rf_reg,
         .c2h_command_handle = rtl_8723e_c2h_command_handle,
         .bt_wifi_media_status_notify = rtl_8723e_bt_wifi_media_status_notify,
-        .bt_coex_off_before_lps = rtl8723ae_bt_coex_off_before_lps,
+        .bt_coex_off_before_lps =
+                rtl8723e_dm_bt_turn_off_bt_coexist_before_enter_lps,
+        .get_btc_status = rtl8723e_get_btc_status,
+        .rx_command_packet = rtl8723e_rx_command_packet,
         .is_fw_header = is_fw_header,
 };
 
-static struct rtl_mod_params rtl8723ae_mod_params = {
+static struct rtl_mod_params rtl8723e_mod_params = {
         .sw_crypto = false,
         .inactiveps = true,
         .swctrl_lps = false,
@@ -256,13 +269,13 @@ static struct rtl_mod_params rtl8723ae_mod_params = {
         .debug = DBG_EMERG,
 };
 
-static struct rtl_hal_cfg rtl8723ae_hal_cfg = {
+static struct rtl_hal_cfg rtl8723e_hal_cfg = {
         .bar_id = 2,
         .write_readback = true,
-        .name = "rtl8723ae_pci",
-        .fw_name = "rtlwifi/rtl8723fw.bin",
-        .ops = &rtl8723ae_hal_ops,
-        .mod_params = &rtl8723ae_mod_params,
+        .name = "rtl8723e_pci",
+        .fw_name = "rtlwifi/rtl8723efw.bin",
+        .ops = &rtl8723e_hal_ops,
+        .mod_params = &rtl8723e_mod_params,
         .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
         .maps[SYS_FUNC_EN] = REG_SYS_FUNC_EN,
         .maps[SYS_CLK] = REG_SYS_CLKR,
@@ -271,6 +284,8 @@ static struct rtl_hal_cfg rtl8723ae_hal_cfg = {
         .maps[MAC_RCR_ACRC32] = ACRC32,
         .maps[MAC_RCR_ACF] = ACF,
         .maps[MAC_RCR_AAP] = AAP,
+        .maps[MAC_HIMR] = REG_HIMR,
+        .maps[MAC_HIMRE] = REG_HIMRE,
         .maps[EFUSE_TEST] = REG_EFUSE_TEST,
         .maps[EFUSE_CTRL] = REG_EFUSE_CTRL,
         .maps[EFUSE_CLK] = 0,
@@ -328,62 +343,63 @@ static struct rtl_hal_cfg rtl8723ae_hal_cfg = {
         .maps[RTL_IMR_VIDOK] = PHIMR_VIDOK,
         .maps[RTL_IMR_VODOK] = PHIMR_VODOK,
         .maps[RTL_IMR_ROK] = PHIMR_ROK,
-        .maps[RTL_IBSS_INT_MASKS] = (PHIMR_BCNDMAINT0 |
-                                     PHIMR_TXBCNOK | PHIMR_TXBCNERR),
+        .maps[RTL_IBSS_INT_MASKS] =
+                (PHIMR_BCNDMAINT0 | PHIMR_TXBCNOK | PHIMR_TXBCNERR),
         .maps[RTL_IMR_C2HCMD] = PHIMR_C2HCMD,
 
 
-        .maps[RTL_RC_CCK_RATE1M] = DESC92_RATE1M,
-        .maps[RTL_RC_CCK_RATE2M] = DESC92_RATE2M,
-        .maps[RTL_RC_CCK_RATE5_5M] = DESC92_RATE5_5M,
-        .maps[RTL_RC_CCK_RATE11M] = DESC92_RATE11M,
-        .maps[RTL_RC_OFDM_RATE6M] = DESC92_RATE6M,
-        .maps[RTL_RC_OFDM_RATE9M] = DESC92_RATE9M,
-        .maps[RTL_RC_OFDM_RATE12M] = DESC92_RATE12M,
-        .maps[RTL_RC_OFDM_RATE18M] = DESC92_RATE18M,
-        .maps[RTL_RC_OFDM_RATE24M] = DESC92_RATE24M,
-        .maps[RTL_RC_OFDM_RATE36M] = DESC92_RATE36M,
-        .maps[RTL_RC_OFDM_RATE48M] = DESC92_RATE48M,
-        .maps[RTL_RC_OFDM_RATE54M] = DESC92_RATE54M,
-
-        .maps[RTL_RC_HT_RATEMCS7] = DESC92_RATEMCS7,
-        .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,
+        .maps[RTL_RC_CCK_RATE1M] = DESC92C_RATE1M,
+        .maps[RTL_RC_CCK_RATE2M] = DESC92C_RATE2M,
+        .maps[RTL_RC_CCK_RATE5_5M] = DESC92C_RATE5_5M,
+        .maps[RTL_RC_CCK_RATE11M] = DESC92C_RATE11M,
+        .maps[RTL_RC_OFDM_RATE6M] = DESC92C_RATE6M,
+        .maps[RTL_RC_OFDM_RATE9M] = DESC92C_RATE9M,
+        .maps[RTL_RC_OFDM_RATE12M] = DESC92C_RATE12M,
+        .maps[RTL_RC_OFDM_RATE18M] = DESC92C_RATE18M,
+        .maps[RTL_RC_OFDM_RATE24M] = DESC92C_RATE24M,
+        .maps[RTL_RC_OFDM_RATE36M] = DESC92C_RATE36M,
+        .maps[RTL_RC_OFDM_RATE48M] = DESC92C_RATE48M,
+        .maps[RTL_RC_OFDM_RATE54M] = DESC92C_RATE54M,
+
+        .maps[RTL_RC_HT_RATEMCS7] = DESC92C_RATEMCS7,
+        .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15,
 };
 
-static struct pci_device_id rtl8723ae_pci_ids[] = {
-        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8723, rtl8723ae_hal_cfg)},
+static struct pci_device_id rtl8723e_pci_ids[] = {
+        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8723, rtl8723e_hal_cfg)},
         {},
 };
 
-MODULE_DEVICE_TABLE(pci, rtl8723ae_pci_ids);
+MODULE_DEVICE_TABLE(pci, rtl8723e_pci_ids);
 
 MODULE_AUTHOR("lizhaoming       <chaoming_li@realsil.com.cn>");
 MODULE_AUTHOR("Realtek WlanFAE  <wlanfae@realtek.com>");
-MODULE_AUTHOR("Larry Finger     <Larry.Finger@lwfinger.net>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Realtek 8723E 802.11n PCI wireless");
-MODULE_FIRMWARE("rtlwifi/rtl8723fw.bin");
-MODULE_FIRMWARE("rtlwifi/rtl8723fw_B.bin");
-
-module_param_named(swenc, rtl8723ae_mod_params.sw_crypto, bool, 0444);
-module_param_named(debug, rtl8723ae_mod_params.debug, int, 0444);
-module_param_named(ips, rtl8723ae_mod_params.inactiveps, bool, 0444);
-module_param_named(swlps, rtl8723ae_mod_params.swctrl_lps, bool, 0444);
-module_param_named(fwlps, rtl8723ae_mod_params.fwctrl_lps, bool, 0444);
+MODULE_FIRMWARE("rtlwifi/rtl8723efw.bin");
+
+module_param_named(swenc, rtl8723e_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl8723e_mod_params.debug, int, 0444);
+module_param_named(ips, rtl8723e_mod_params.inactiveps, bool, 0444);
+module_param_named(swlps, rtl8723e_mod_params.swctrl_lps, bool, 0444);
+module_param_named(fwlps, rtl8723e_mod_params.fwctrl_lps, bool, 0444);
+module_param_named(disable_watchdog, rtl8723e_mod_params.disable_watchdog,
+                   bool, 0444);
 MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
 MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
 MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");
 
 static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
 
-static struct pci_driver rtl8723ae_driver = {
+static struct pci_driver rtl8723e_driver = {
         .name = KBUILD_MODNAME,
-        .id_table = rtl8723ae_pci_ids,
+        .id_table = rtl8723e_pci_ids,
         .probe = rtl_pci_probe,
         .remove = rtl_pci_disconnect,
         .driver.pm = &rtlwifi_pm_ops,
 };
 
-module_pci_driver(rtl8723ae_driver);
+module_pci_driver(rtl8723e_driver);
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.h b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.h
index fc4fde5e3eb5..46478780d262 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,8 +26,10 @@
 #ifndef __RTL8723E_SW_H__
 #define __RTL8723E_SW_H__
 
-int rtl8723ae_init_sw_vars(struct ieee80211_hw *hw);
-void rtl8723ae_deinit_sw_vars(struct ieee80211_hw *hw);
-void rtl8723ae_init_var_map(struct ieee80211_hw *hw);
+int rtl8723e_init_sw_vars(struct ieee80211_hw *hw);
+void rtl8723e_deinit_sw_vars(struct ieee80211_hw *hw);
+void rtl8723e_init_var_map(struct ieee80211_hw *hw);
+bool rtl8723e_get_btc_status(void);
+
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/table.c b/drivers/net/wireless/rtlwifi/rtl8723ae/table.c
index 9b0b50cc4ade..61e86045f15c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/table.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -335,7 +331,7 @@ u32 RTL8723EPHY_REG_ARRAY_PG[RTL8723E_PHY_REG_ARRAY_PGLENGTH] = {
         0x868, 0xffffffff, 0x00000000,
 };
 
-u32 RTL8723E_RADIOA_1TARRAY[Rtl8723ERADIOA_1TARRAYLENGTH] = {
+u32 RTL8723E_RADIOA_1TARRAY[RTL8723ERADIOA_1TARRAYLENGTH] = {
         0x000, 0x00030159,
         0x001, 0x00031284,
         0x002, 0x00098000,
@@ -479,12 +475,10 @@ u32 RTL8723E_RADIOA_1TARRAY[Rtl8723ERADIOA_1TARRAYLENGTH] = {
         0x000, 0x00030159,
 };
 
-
 u32 RTL8723E_RADIOB_1TARRAY[RTL8723E_RADIOB_1TARRAYLENGTH] = {
         0x0,
 };
 
-
 u32 RTL8723EMAC_ARRAY[RTL8723E_MACARRAYLENGTH] = {
         0x420, 0x00000080,
         0x423, 0x00000000,
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/table.h b/drivers/net/wireless/rtlwifi/rtl8723ae/table.h
index f5ce71375c20..57a548ceba7d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/table.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -38,8 +34,8 @@
 extern u32 RTL8723EPHY_REG_1TARRAY[RTL8723E_PHY_REG_1TARRAY_LENGTH];
 #define RTL8723E_PHY_REG_ARRAY_PGLENGTH         336
 extern u32 RTL8723EPHY_REG_ARRAY_PG[RTL8723E_PHY_REG_ARRAY_PGLENGTH];
-#define Rtl8723ERADIOA_1TARRAYLENGTH             282
-extern u32 RTL8723E_RADIOA_1TARRAY[Rtl8723ERADIOA_1TARRAYLENGTH];
+#define RTL8723ERADIOA_1TARRAYLENGTH            282
+extern u32 RTL8723E_RADIOA_1TARRAY[RTL8723ERADIOA_1TARRAYLENGTH];
 #define RTL8723E_RADIOB_1TARRAYLENGTH           1
 extern u32 RTL8723E_RADIOB_1TARRAY[RTL8723E_RADIOB_1TARRAYLENGTH];
 #define RTL8723E_MACARRAYLENGTH                 172
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
index 10b7577b6ae5..d372ccaf3465 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -37,7 +33,7 @@
 #include "trx.h"
 #include "led.h"
 
-static u8 _rtl8723ae_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
+static u8 _rtl8723e_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
 {
         __le16 fc = rtl_get_fc(skb);
 
@@ -49,16 +45,174 @@ static u8 _rtl8723ae_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
         return skb->priority;
 }
 
-static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
-                        struct rtl_stats *pstatus, u8 *pdesc,
-                        struct rx_fwinfo_8723e *p_drvinfo,
-                        bool bpacket_match_bssid,
-                        bool bpacket_toself, bool packet_beacon)
+/* mac80211's rate_idx is like this:
+ *
+ * 2.4G band:rx_status->band == IEEE80211_BAND_2GHZ
+ *
+ * B/G rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC92C_RATE1M-->DESC92C_RATE54M ==> idx is 0-->11,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC92C_RATEMCS0-->DESC92C_RATEMCS15 ==> idx is 0-->15
+ *
+ * 5G band:rx_status->band == IEEE80211_BAND_5GHZ
+ * A rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC92C_RATE6M-->DESC92C_RATE54M ==> idx is 0-->7,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC92C_RATEMCS0-->DESC92C_RATEMCS15 ==> idx is 0-->15
+ */
+static int _rtl8723e_rate_mapping(struct ieee80211_hw *hw,
+                                  bool isht, u8 desc_rate)
+{
+        int rate_idx;
+
+        if (!isht) {
+                if (IEEE80211_BAND_2GHZ == hw->conf.chandef.chan->band) {
+                        switch (desc_rate) {
+                        case DESC92C_RATE1M:
+                                rate_idx = 0;
+                                break;
+                        case DESC92C_RATE2M:
+                                rate_idx = 1;
+                                break;
+                        case DESC92C_RATE5_5M:
+                                rate_idx = 2;
+                                break;
+                        case DESC92C_RATE11M:
+                                rate_idx = 3;
+                                break;
+                        case DESC92C_RATE6M:
+                                rate_idx = 4;
+                                break;
+                        case DESC92C_RATE9M:
+                                rate_idx = 5;
+                                break;
+                        case DESC92C_RATE12M:
+                                rate_idx = 6;
+                                break;
+                        case DESC92C_RATE18M:
+                                rate_idx = 7;
+                                break;
+                        case DESC92C_RATE24M:
+                                rate_idx = 8;
+                                break;
+                        case DESC92C_RATE36M:
+                                rate_idx = 9;
+                                break;
+                        case DESC92C_RATE48M:
+                                rate_idx = 10;
+                                break;
+                        case DESC92C_RATE54M:
+                                rate_idx = 11;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                } else {
+                        switch (desc_rate) {
+                        case DESC92C_RATE6M:
+                                rate_idx = 0;
+                                break;
+                        case DESC92C_RATE9M:
+                                rate_idx = 1;
+                                break;
+                        case DESC92C_RATE12M:
+                                rate_idx = 2;
+                                break;
+                        case DESC92C_RATE18M:
+                                rate_idx = 3;
+                                break;
+                        case DESC92C_RATE24M:
+                                rate_idx = 4;
+                                break;
+                        case DESC92C_RATE36M:
+                                rate_idx = 5;
+                                break;
+                        case DESC92C_RATE48M:
+                                rate_idx = 6;
+                                break;
+                        case DESC92C_RATE54M:
+                                rate_idx = 7;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                }
+        } else {
+                switch (desc_rate) {
+                case DESC92C_RATEMCS0:
+                        rate_idx = 0;
+                        break;
+                case DESC92C_RATEMCS1:
+                        rate_idx = 1;
+                        break;
+                case DESC92C_RATEMCS2:
+                        rate_idx = 2;
+                        break;
+                case DESC92C_RATEMCS3:
+                        rate_idx = 3;
+                        break;
+                case DESC92C_RATEMCS4:
+                        rate_idx = 4;
+                        break;
+                case DESC92C_RATEMCS5:
+                        rate_idx = 5;
+                        break;
+                case DESC92C_RATEMCS6:
+                        rate_idx = 6;
+                        break;
+                case DESC92C_RATEMCS7:
+                        rate_idx = 7;
+                        break;
+                case DESC92C_RATEMCS8:
+                        rate_idx = 8;
+                        break;
+                case DESC92C_RATEMCS9:
+                        rate_idx = 9;
+                        break;
+                case DESC92C_RATEMCS10:
+                        rate_idx = 10;
+                        break;
+                case DESC92C_RATEMCS11:
+                        rate_idx = 11;
+                        break;
+                case DESC92C_RATEMCS12:
+                        rate_idx = 12;
+                        break;
+                case DESC92C_RATEMCS13:
+                        rate_idx = 13;
+                        break;
+                case DESC92C_RATEMCS14:
+                        rate_idx = 14;
+                        break;
+                case DESC92C_RATEMCS15:
+                        rate_idx = 15;
+                        break;
+                default:
+                        rate_idx = 0;
+                        break;
+                }
+        }
+        return rate_idx;
+}
+
+static void _rtl8723e_query_rxphystatus(struct ieee80211_hw *hw,
+                                        struct rtl_stats *pstatus, u8 *pdesc,
+                                        struct rx_fwinfo_8723e *p_drvinfo,
+                                        bool bpacket_match_bssid,
+                                        bool bpacket_toself, bool packet_beacon)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
         struct phy_sts_cck_8723e_t *cck_buf;
-        s8 rx_pwr_all, rx_pwr[4];
+        s8 rx_pwr_all = 0, rx_pwr[4];
         u8 rf_rx_num = 0, evm, pwdb_all;
         u8 i, max_spatial_stream;
         u32 rssi, total_rssi = 0;
@@ -68,8 +222,8 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
         pstatus->packet_matchbssid = bpacket_match_bssid;
         pstatus->packet_toself = bpacket_toself;
         pstatus->packet_beacon = packet_beacon;
-        pstatus->rx_mimo_sig_qual[0] = -1;
-        pstatus->rx_mimo_sig_qual[1] = -1;
+        pstatus->rx_mimo_signalquality[0] = -1;
+        pstatus->rx_mimo_signalquality[1] = -1;
 
         if (is_cck) {
                 u8 report, cck_highpwr;
@@ -77,14 +231,14 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
                 /* CCK Driver info Structure is not the same as OFDM packet. */
                 cck_buf = (struct phy_sts_cck_8723e_t *)p_drvinfo;
 
-                /* (1)Hardware does not provide RSSI for CCK
-                 * (2)PWDB, Average PWDB cacluated by
+                /* (1)Hardware does not provide RSSI for CCK */
+                /* (2)PWDB, Average PWDB cacluated by
                  * hardware (for rate adaptive)
                  */
                 if (ppsc->rfpwr_state == ERFON)
-                        cck_highpwr = (u8) rtl_get_bbreg(hw,
-                                                 RFPGA0_XA_HSSIPARAMETER2,
-                                                 BIT(9));
+                        cck_highpwr = (u8)rtl_get_bbreg(hw,
+                                        RFPGA0_XA_HSSIPARAMETER2,
+                                        BIT(9));
                 else
                         cck_highpwr = false;
 
@@ -127,8 +281,9 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
                 }
 
                 pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
-                /* CCK gain is smaller than OFDM/MCS gain,
-                 * so we add gain diff. From experience, the val is 6
+                /* CCK gain is smaller than OFDM/MCS gain,  */
+                /* so we add gain diff by experiences,
+                 * the val is 6
                  */
                 pwdb_all += 6;
                 if (pwdb_all > 100)
@@ -152,9 +307,9 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
                 if (bpacket_match_bssid) {
                         u8 sq;
 
-                        if (pstatus->rx_pwdb_all > 40) {
+                        if (pstatus->rx_pwdb_all > 40)
                                 sq = 100;
-                        } else {
+                        else {
                                 sq = cck_buf->sq_rpt;
                                 if (sq > 64)
                                         sq = 0;
@@ -165,8 +320,8 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
                         }
 
                         pstatus->signalquality = sq;
-                        pstatus->rx_mimo_sig_qual[0] = sq;
-                        pstatus->rx_mimo_sig_qual[1] = -1;
+                        pstatus->rx_mimo_signalquality[0] = sq;
+                        pstatus->rx_mimo_signalquality[1] = -1;
                 }
         } else {
                 rtlpriv->dm.rfpath_rxenable[0] =
@@ -179,18 +334,20 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
                         if (rtlpriv->dm.rfpath_rxenable[i])
                                 rf_rx_num++;
 
-                        rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f)*2) - 110;
+                        rx_pwr[i] = ((p_drvinfo->gain_trsw[i] &
+                                      0x3f) * 2) - 110;
 
                         /* Translate DBM to percentage. */
                         rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
                         total_rssi += rssi;
 
                         /* Get Rx snr value in DB */
-                        rtlpriv->stats.rx_snr_db[i] = (p_drvinfo->rxsnr[i] / 2);
+                        rtlpriv->stats.rx_snr_db[i] =
+                                (long)(p_drvinfo->rxsnr[i] / 2);
 
                         /* Record Signal Strength for next packet */
                         if (bpacket_match_bssid)
-                                pstatus->rx_mimo_signalstrength[i] = (u8) rssi;
+                                pstatus->rx_mimo_signalstrength[i] = (u8)rssi;
                 }
 
                 /* (2)PWDB, Average PWDB cacluated by
@@ -204,8 +361,8 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
                 pstatus->recvsignalpower = rx_pwr_all;
 
                 /* (3)EVM of HT rate */
-                if (pstatus->is_ht && pstatus->rate >= DESC92_RATEMCS8 &&
-                    pstatus->rate <= DESC92_RATEMCS15)
+                if (pstatus->is_ht && pstatus->rate >= DESC92C_RATEMCS8 &&
+                    pstatus->rate <= DESC92C_RATEMCS15)
                         max_spatial_stream = 2;
                 else
                         max_spatial_stream = 1;
@@ -218,8 +375,10 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
                                  * spatial stream only
                                  */
                                 if (i == 0)
-                                        pstatus->signalquality = (evm & 0xff);
-                                pstatus->rx_mimo_sig_qual[i] = (evm & 0xff);
+                                        pstatus->signalquality =
+                                                (u8)(evm & 0xff);
+                                pstatus->rx_mimo_signalquality[i] =
+                                        (u8)(evm & 0xff);
                         }
                 }
         }
@@ -235,78 +394,83 @@ static void _rtl8723ae_query_rxphystatus(struct ieee80211_hw *hw,
                         total_rssi /= rf_rx_num));
 }
 
-static void _rtl8723ae_translate_rx_signal_stuff(struct ieee80211_hw *hw,
-                struct sk_buff *skb, struct rtl_stats *pstatus,
-                u8 *pdesc, struct rx_fwinfo_8723e *p_drvinfo)
+static void translate_rx_signal_stuff(struct ieee80211_hw *hw,
+                                      struct sk_buff *skb,
+                                      struct rtl_stats *pstatus, u8 *pdesc,
+                                      struct rx_fwinfo_8723e *p_drvinfo)
 {
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         struct ieee80211_hdr *hdr;
         u8 *tmp_buf;
         u8 *praddr;
-        __le16 fc;
-        u16 type;
-        bool packet_matchbssid, packet_toself, packet_beacon = false;
+        /*u8 *psaddr;*/
+        u16 fc, type;
+        bool packet_matchbssid, packet_toself, packet_beacon;
 
         tmp_buf = skb->data + pstatus->rx_drvinfo_size + pstatus->rx_bufshift;
 
         hdr = (struct ieee80211_hdr *)tmp_buf;
-        fc = hdr->frame_control;
-        type = WLAN_FC_GET_TYPE(fc);
+        fc = le16_to_cpu(hdr->frame_control);
+        type = WLAN_FC_GET_TYPE(hdr->frame_control);
         praddr = hdr->addr1;
 
-        packet_matchbssid =
-                ((IEEE80211_FTYPE_CTL != type) &&
-                 ether_addr_equal(mac->bssid,
-                                  (le16_to_cpu(fc) & IEEE80211_FCTL_TODS) ? hdr->addr1 :
-                                  (le16_to_cpu(fc) & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
-                                  hdr->addr3) &&
-                 (!pstatus->hwerror) && (!pstatus->crc) && (!pstatus->icv));
+        packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
+                (ether_addr_equal(mac->bssid, (fc & IEEE80211_FCTL_TODS) ?
+                 hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ?
+                 hdr->addr2 : hdr->addr3)) &&
+                 (!pstatus->hwerror) &&
+                 (!pstatus->crc) && (!pstatus->icv));
 
-        packet_toself = (packet_matchbssid &&
-                         ether_addr_equal(praddr, rtlefuse->dev_addr));
+        packet_toself = packet_matchbssid &&
+            (ether_addr_equal(praddr, rtlefuse->dev_addr));
 
-        if (ieee80211_is_beacon(fc))
+        if (ieee80211_is_beacon(hdr->frame_control))
                 packet_beacon = true;
+        else
+                packet_beacon = false;
 
-        _rtl8723ae_query_rxphystatus(hw, pstatus, pdesc, p_drvinfo,
-                                   packet_matchbssid, packet_toself,
-                                   packet_beacon);
+        _rtl8723e_query_rxphystatus(hw, pstatus, pdesc, p_drvinfo,
+                                    packet_matchbssid, packet_toself,
+                                    packet_beacon);
 
         rtl_process_phyinfo(hw, tmp_buf, pstatus);
 }
 
-bool rtl8723ae_rx_query_desc(struct ieee80211_hw *hw,
-                             struct rtl_stats *status,
-                             struct ieee80211_rx_status *rx_status,
-                             u8 *pdesc, struct sk_buff *skb)
+bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
+                            struct rtl_stats *status,
+                            struct ieee80211_rx_status *rx_status,
+                            u8 *pdesc, struct sk_buff *skb)
 {
         struct rx_fwinfo_8723e *p_drvinfo;
         struct ieee80211_hdr *hdr;
         u32 phystatus = GET_RX_DESC_PHYST(pdesc);
 
-        status->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
-        status->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
-                                   RX_DRV_INFO_SIZE_UNIT;
-        status->rx_bufshift = (u8) (GET_RX_DESC_SHIFT(pdesc) & 0x03);
-        status->icv = (u16) GET_RX_DESC_ICV(pdesc);
-        status->crc = (u16) GET_RX_DESC_CRC32(pdesc);
+        status->length = (u16)GET_RX_DESC_PKT_LEN(pdesc);
+        status->rx_drvinfo_size = (u8)GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
+            RX_DRV_INFO_SIZE_UNIT;
+        status->rx_bufshift = (u8)(GET_RX_DESC_SHIFT(pdesc) & 0x03);
+        status->icv = (u16)GET_RX_DESC_ICV(pdesc);
+        status->crc = (u16)GET_RX_DESC_CRC32(pdesc);
         status->hwerror = (status->crc | status->icv);
         status->decrypted = !GET_RX_DESC_SWDEC(pdesc);
-        status->rate = (u8) GET_RX_DESC_RXMCS(pdesc);
-        status->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);
-        status->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);
-        status->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
-                                 && (GET_RX_DESC_FAGGR(pdesc) == 1));
+        status->rate = (u8)GET_RX_DESC_RXMCS(pdesc);
+        status->shortpreamble = (u16)GET_RX_DESC_SPLCP(pdesc);
+        status->isampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1);
+        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 = RTL8723E_RX_HAL_IS_CCK_RATE(status->rate);
+        status->is_cck = RX_HAL_IS_CCK_RATE(status->rate);
 
         rx_status->freq = hw->conf.chandef.chan->center_freq;
         rx_status->band = hw->conf.chandef.chan->band;
 
+        hdr = (struct ieee80211_hdr *)(skb->data + status->rx_drvinfo_size
+                        + status->rx_bufshift);
+
         if (status->crc)
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
@@ -320,69 +484,62 @@ bool rtl8723ae_rx_query_desc(struct ieee80211_hw *hw,
 
         /* hw will set status->decrypted true, if it finds the
          * frame is open data frame or mgmt frame.
-         * Thus hw will not decrypt a robust managment frame
+         * So hw will not decryption robust managment frame
          * for IEEE80211w but still set status->decrypted
          * true, so here we should set it back to undecrypted
          * for IEEE80211w frame, and mac80211 sw will help
          * to decrypt it
          */
         if (status->decrypted) {
-                hdr = (struct ieee80211_hdr *)(skb->data +
-                       status->rx_drvinfo_size + status->rx_bufshift);
-
-                if (!hdr) {
-                        /* during testing, hdr could be NULL here */
-                        return false;
-                }
-                if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
-                        (ieee80211_has_protected(hdr->frame_control)))
-                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
-                else
+                if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
+                    (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag |= RX_FLAG_DECRYPTED;
+                else
+                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
         }
 
         /* rate_idx: index of data rate into band's
          * supported rates or MCS index if HT rates
          * are use (RX_FLAG_HT)
+         * Notice: this is diff with windows define
          */
-        rx_status->rate_idx = rtlwifi_rate_mapping(hw, status->is_ht,
-                                                   status->rate, false);
+        rx_status->rate_idx = _rtl8723e_rate_mapping(hw,
+                                status->is_ht, status->rate);
 
         rx_status->mactime = status->timestamp_low;
         if (phystatus == true) {
                 p_drvinfo = (struct rx_fwinfo_8723e *)(skb->data +
-                             status->rx_bufshift);
+                                                     status->rx_bufshift);
 
-                _rtl8723ae_translate_rx_signal_stuff(hw,
-                           skb, status, pdesc, p_drvinfo);
+                translate_rx_signal_stuff(hw, skb, status, pdesc, p_drvinfo);
         }
-
-        /*rx_status->qual = status->signal; */
         rx_status->signal = status->recvsignalpower + 10;
-
         return true;
 }
 
-void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
-                            struct ieee80211_hdr *hdr, u8 *pdesc_tx,
-                            u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
-                            struct ieee80211_sta *sta,
-                            struct sk_buff *skb, u8 hw_queue,
-                            struct rtl_tcb_desc *ptcdesc)
+void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
+                           struct ieee80211_hdr *hdr, u8 *pdesc_tx,
+                           u8 *txbd, struct ieee80211_tx_info *info,
+                           struct ieee80211_sta *sta,
+                           struct sk_buff *skb,
+                           u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        bool defaultadapter = true;
-        u8 *pdesc = pdesc_tx;
+        bool b_defaultadapter = true;
+        /* bool b_trigger_ac = false; */
+        u8 *pdesc = (u8 *)pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
-        u8 fw_qsel = _rtl8723ae_map_hwqueue_to_fwqueue(skb, hw_queue);
+        u8 fw_qsel = _rtl8723e_map_hwqueue_to_fwqueue(skb, hw_queue);
         bool firstseg = ((hdr->seq_ctrl &
-                            cpu_to_le16(IEEE80211_SCTL_FRAG)) == 0);
+                          cpu_to_le16(IEEE80211_SCTL_FRAG)) == 0);
+
         bool lastseg = ((hdr->frame_control &
-                           cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
+                         cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
+
         dma_addr_t mapping = pci_map_single(rtlpci->pdev,
                                             skb->data, skb->len,
                                             PCI_DMA_TODEVICE);
@@ -398,12 +555,13 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
         } else if (mac->opmode == NL80211_IFTYPE_AP ||
                 mac->opmode == NL80211_IFTYPE_ADHOC) {
                 if (sta)
-                        bw_40 = sta->bandwidth >= IEEE80211_STA_RX_BW_40;
+                        bw_40 = sta->ht_cap.cap &
+                                IEEE80211_HT_CAP_SUP_WIDTH_20_40;
         }
 
         seq_number = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
 
-        rtl_get_tcb_desc(hw, info, sta, skb, ptcdesc);
+        rtl_get_tcb_desc(hw, info, sta, skb, ptcb_desc);
 
         CLEAR_PCI_TX_DESC_CONTENT(pdesc, sizeof(struct tx_desc_8723e));
 
@@ -415,9 +573,9 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
         if (firstseg) {
                 SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
 
-                SET_TX_DESC_TX_RATE(pdesc, ptcdesc->hw_rate);
+                SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
 
-                if (ptcdesc->use_shortgi || ptcdesc->use_shortpreamble)
+                if (ptcb_desc->use_shortgi || ptcb_desc->use_shortpreamble)
                         SET_TX_DESC_DATA_SHORTGI(pdesc, 1);
 
                 if (info->flags & IEEE80211_TX_CTL_AMPDU) {
@@ -426,31 +584,33 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
                 }
                 SET_TX_DESC_SEQ(pdesc, seq_number);
 
-                SET_TX_DESC_RTS_ENABLE(pdesc, ((ptcdesc->rts_enable &&
-                                                !ptcdesc->
-                                                cts_enable) ? 1 : 0));
+                SET_TX_DESC_RTS_ENABLE(pdesc,
+                                       ((ptcb_desc->rts_enable &&
+                                        !ptcb_desc->cts_enable) ? 1 : 0));
                 SET_TX_DESC_HW_RTS_ENABLE(pdesc,
-                                          ((ptcdesc->rts_enable
-                                            || ptcdesc->cts_enable) ? 1 : 0));
-                SET_TX_DESC_CTS2SELF(pdesc, ((ptcdesc->cts_enable) ? 1 : 0));
-                SET_TX_DESC_RTS_STBC(pdesc, ((ptcdesc->rts_stbc) ? 1 : 0));
-
-                SET_TX_DESC_RTS_RATE(pdesc, ptcdesc->rts_rate);
+                                          ((ptcb_desc->rts_enable ||
+                                          ptcb_desc->cts_enable) ? 1 : 0));
+                SET_TX_DESC_CTS2SELF(pdesc,
+                                     ((ptcb_desc->cts_enable) ? 1 : 0));
+                SET_TX_DESC_RTS_STBC(pdesc,
+                                     ((ptcb_desc->rts_stbc) ? 1 : 0));
+
+                SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
                 SET_TX_DESC_RTS_BW(pdesc, 0);
-                SET_TX_DESC_RTS_SC(pdesc, ptcdesc->rts_sc);
+                SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
                 SET_TX_DESC_RTS_SHORT(pdesc,
-                                      ((ptcdesc->rts_rate <= DESC92_RATE54M) ?
-                                       (ptcdesc->rts_use_shortpreamble ? 1 : 0)
-                                       : (ptcdesc->rts_use_shortgi ? 1 : 0)));
+                                ((ptcb_desc->rts_rate <= DESC92C_RATE54M) ?
+                                (ptcb_desc->rts_use_shortpreamble ? 1 : 0)
+                                : (ptcb_desc->rts_use_shortgi ? 1 : 0)));
 
                 if (bw_40) {
-                        if (ptcdesc->packet_bw) {
+                        if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) {
                                 SET_TX_DESC_DATA_BW(pdesc, 1);
                                 SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);
                         } else {
                                 SET_TX_DESC_DATA_BW(pdesc, 0);
                                 SET_TX_DESC_TX_SUB_CARRIER(pdesc,
-                                                         mac->cur_40_prime_sc);
+                                        mac->cur_40_prime_sc);
                         }
                 } else {
                         SET_TX_DESC_DATA_BW(pdesc, 0);
@@ -481,6 +641,7 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
                         default:
                                 SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
                                 break;
+
                         }
                 }
 
@@ -490,7 +651,7 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
                 SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);
                 SET_TX_DESC_DISABLE_FB(pdesc, 0);
-                SET_TX_DESC_USE_RATE(pdesc, ptcdesc->use_driver_rate ? 1 : 0);
+                SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
 
                 if (ieee80211_is_data_qos(fc)) {
                         if (mac->rdg_en) {
@@ -510,18 +671,21 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
         SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
 
         if (rtlpriv->dm.useramask) {
-                SET_TX_DESC_RATE_ID(pdesc, ptcdesc->ratr_index);
-                SET_TX_DESC_MACID(pdesc, ptcdesc->mac_id);
+                SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
         } else {
-                SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcdesc->ratr_index);
-                SET_TX_DESC_MACID(pdesc, ptcdesc->ratr_index);
+                SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->ratr_index);
         }
 
         if ((!ieee80211_is_data_qos(fc)) && ppsc->fwctrl_lps) {
                 SET_TX_DESC_HWSEQ_EN_8723(pdesc, 1);
+                /* SET_TX_DESC_HWSEQ_EN(pdesc, 1); */
+                /* SET_TX_DESC_PKT_ID(pdesc, 8); */
 
-                if (!defaultadapter)
+                if (!b_defaultadapter)
                         SET_TX_DESC_HWSEQ_SEL_8723(pdesc, 1);
+        /* SET_TX_DESC_QOS(pdesc, 1); */
         }
 
         SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
@@ -534,17 +698,19 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
-void rtl8723ae_tx_fill_cmddesc(struct ieee80211_hw *hw,
+void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw,
                               u8 *pdesc, bool firstseg,
                               bool lastseg, struct sk_buff *skb)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
         u8 fw_queue = QSLT_BEACON;
+
         dma_addr_t mapping = pci_map_single(rtlpci->pdev,
                                             skb->data, skb->len,
                                             PCI_DMA_TODEVICE);
+
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
         __le16 fc = hdr->frame_control;
 
         if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
@@ -557,7 +723,7 @@ void rtl8723ae_tx_fill_cmddesc(struct ieee80211_hw *hw,
         if (firstseg)
                 SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
 
-        SET_TX_DESC_TX_RATE(pdesc, DESC92_RATE1M);
+        SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
 
         SET_TX_DESC_SEQ(pdesc, 0);
 
@@ -577,7 +743,7 @@ void rtl8723ae_tx_fill_cmddesc(struct ieee80211_hw *hw,
 
         SET_TX_DESC_OWN(pdesc, 1);
 
-        SET_TX_DESC_PKT_SIZE(pdesc, (u16) (skb->len));
+        SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
 
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
@@ -597,8 +763,8 @@ void rtl8723ae_tx_fill_cmddesc(struct ieee80211_hw *hw,
                       pdesc, TX_DESC_SIZE);
 }
 
-void rtl8723ae_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
-                        u8 desc_name, u8 *val)
+void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
+                       bool istx, u8 desc_name, u8 *val)
 {
         if (istx == true) {
                 switch (desc_name) {
@@ -635,7 +801,7 @@ void rtl8723ae_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
         }
 }
 
-u32 rtl8723ae_get_desc(u8 *pdesc, bool istx, u8 desc_name)
+u32 rtl8723e_get_desc(u8 *pdesc, bool istx, u8 desc_name)
 {
         u32 ret = 0;
 
@@ -660,6 +826,9 @@ u32 rtl8723ae_get_desc(u8 *pdesc, bool istx, u8 desc_name)
                 case HW_DESC_RXPKT_LEN:
                         ret = GET_RX_DESC_PKT_LEN(pdesc);
                         break;
+                case HW_DESC_RXBUFF_ADDR:
+                        ret = GET_RX_DESC_BUFF_ADDR(pdesc);
+                        break;
                 default:
                         RT_ASSERT(false, "ERR rxdesc :%d not process\n",
                                   desc_name);
@@ -669,7 +838,25 @@ u32 rtl8723ae_get_desc(u8 *pdesc, bool istx, u8 desc_name)
         return ret;
 }
 
-void rtl8723ae_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
+bool rtl8723e_is_tx_desc_closed(struct ieee80211_hw *hw,
+                                u8 hw_queue, u16 index)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue];
+        u8 *entry = (u8 *)(&ring->desc[ring->idx]);
+        u8 own = (u8)rtl8723e_get_desc(entry, true, HW_DESC_OWN);
+
+        /**
+         *beacon packet will only use the first
+         *descriptor defautly,and the own may not
+         *be cleared by the hardware
+         */
+        if (own)
+                return false;
+        return true;
+}
+
+void rtl8723e_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         if (hw_queue == BEACON_QUEUE) {
@@ -679,3 +866,10 @@ void rtl8723ae_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
                                BIT(0) << (hw_queue));
         }
 }
+
+u32 rtl8723e_rx_command_packet(struct ieee80211_hw *hw,
+                               struct rtl_stats status,
+                               struct sk_buff *skb)
+{
+        return 0;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.h b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.h
index 4380b7d3a91a..017da7e194d8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -30,77 +26,77 @@
 #ifndef __RTL8723E_TRX_H__
 #define __RTL8723E_TRX_H__
 
-#define TX_DESC_SIZE                            64
+#define TX_DESC_SIZE                                    64
 #define TX_DESC_AGGR_SUBFRAME_SIZE              32
 
-#define RX_DESC_SIZE                            32
+#define RX_DESC_SIZE                                    32
 #define RX_DRV_INFO_SIZE_UNIT                   8
 
 #define TX_DESC_NEXT_DESC_OFFSET                40
 #define USB_HWDESC_HEADER_LEN                   32
-#define CRCLENGTH                               4
+#define CRCLENGTH                                               4
 
 #define SET_TX_DESC_PKT_SIZE(__pdesc, __val)            \
         SET_BITS_TO_LE_4BYTE(__pdesc, 0, 16, __val)
-#define SET_TX_DESC_OFFSET(__pdesc, __val)              \
+#define SET_TX_DESC_OFFSET(__pdesc, __val)                      \
         SET_BITS_TO_LE_4BYTE(__pdesc, 16, 8, __val)
-#define SET_TX_DESC_BMC(__pdesc, __val)         \
+#define SET_TX_DESC_BMC(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc, 24, 1, __val)
-#define SET_TX_DESC_HTC(__pdesc, __val)         \
+#define SET_TX_DESC_HTC(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc, 25, 1, __val)
 #define SET_TX_DESC_LAST_SEG(__pdesc, __val)            \
         SET_BITS_TO_LE_4BYTE(__pdesc, 26, 1, __val)
 #define SET_TX_DESC_FIRST_SEG(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val)
-#define SET_TX_DESC_LINIP(__pdesc, __val)               \
+#define SET_TX_DESC_LINIP(__pdesc, __val)                       \
         SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val)
-#define SET_TX_DESC_NO_ACM(__pdesc, __val)              \
+#define SET_TX_DESC_NO_ACM(__pdesc, __val)                      \
         SET_BITS_TO_LE_4BYTE(__pdesc, 29, 1, __val)
-#define SET_TX_DESC_GF(__pdesc, __val)                  \
+#define SET_TX_DESC_GF(__pdesc, __val)                          \
         SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
-#define SET_TX_DESC_OWN(__pdesc, __val)         \
+#define SET_TX_DESC_OWN(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
 
-#define GET_TX_DESC_PKT_SIZE(__pdesc)                   \
+#define GET_TX_DESC_PKT_SIZE(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc, 0, 16)
-#define GET_TX_DESC_OFFSET(__pdesc)                     \
+#define GET_TX_DESC_OFFSET(__pdesc)                             \
         LE_BITS_TO_4BYTE(__pdesc, 16, 8)
-#define GET_TX_DESC_BMC(__pdesc)                        \
+#define GET_TX_DESC_BMC(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc, 24, 1)
-#define GET_TX_DESC_HTC(__pdesc)                        \
+#define GET_TX_DESC_HTC(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc, 25, 1)
-#define GET_TX_DESC_LAST_SEG(__pdesc)                   \
+#define GET_TX_DESC_LAST_SEG(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc, 26, 1)
-#define GET_TX_DESC_FIRST_SEG(__pdesc)                  \
+#define GET_TX_DESC_FIRST_SEG(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc, 27, 1)
-#define GET_TX_DESC_LINIP(__pdesc)                      \
+#define GET_TX_DESC_LINIP(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc, 28, 1)
-#define GET_TX_DESC_NO_ACM(__pdesc)                     \
+#define GET_TX_DESC_NO_ACM(__pdesc)                             \
         LE_BITS_TO_4BYTE(__pdesc, 29, 1)
-#define GET_TX_DESC_GF(__pdesc)                         \
+#define GET_TX_DESC_GF(__pdesc)                                 \
         LE_BITS_TO_4BYTE(__pdesc, 30, 1)
-#define GET_TX_DESC_OWN(__pdesc)                        \
+#define GET_TX_DESC_OWN(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc, 31, 1)
 
-#define SET_TX_DESC_MACID(__pdesc, __val)               \
+#define SET_TX_DESC_MACID(__pdesc, __val)                       \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 5, __val)
 #define SET_TX_DESC_AGG_BREAK(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 5, 1, __val)
-#define SET_TX_DESC_BK(__pdesc, __val)                  \
+#define SET_TX_DESC_BK(__pdesc, __val)                          \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 6, 1, __val)
 #define SET_TX_DESC_RDG_ENABLE(__pdesc, __val)          \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 7, 1, __val)
 #define SET_TX_DESC_QUEUE_SEL(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val)
-#define SET_TX_DESC_RDG_NAV_EXT(__pdesc, __val) \
+#define SET_TX_DESC_RDG_NAV_EXT(__pdesc, __val)         \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 13, 1, __val)
 #define SET_TX_DESC_LSIG_TXOP_EN(__pdesc, __val)        \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 14, 1, __val)
-#define SET_TX_DESC_PIFS(__pdesc, __val)                \
+#define SET_TX_DESC_PIFS(__pdesc, __val)                        \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 15, 1, __val)
 #define SET_TX_DESC_RATE_ID(__pdesc, __val)             \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 4, __val)
-#define SET_TX_DESC_NAV_USE_HDR(__pdesc, __val) \
+#define SET_TX_DESC_NAV_USE_HDR(__pdesc, __val)         \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 20, 1, __val)
 #define SET_TX_DESC_EN_DESC_ID(__pdesc, __val)          \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 21, 1, __val)
@@ -109,34 +105,34 @@
 #define SET_TX_DESC_PKT_OFFSET(__pdesc, __val)          \
         SET_BITS_TO_LE_4BYTE(__pdesc+4, 24, 8, __val)
 
-#define GET_TX_DESC_MACID(__pdesc)                      \
+#define GET_TX_DESC_MACID(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc+4, 0, 5)
-#define GET_TX_DESC_AGG_ENABLE(__pdesc)         \
+#define GET_TX_DESC_AGG_ENABLE(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+4, 5, 1)
-#define GET_TX_DESC_AGG_BREAK(__pdesc)                  \
+#define GET_TX_DESC_AGG_BREAK(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc+4, 6, 1)
-#define GET_TX_DESC_RDG_ENABLE(__pdesc)         \
+#define GET_TX_DESC_RDG_ENABLE(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+4, 7, 1)
-#define GET_TX_DESC_QUEUE_SEL(__pdesc)                  \
+#define GET_TX_DESC_QUEUE_SEL(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc+4, 8, 5)
-#define GET_TX_DESC_RDG_NAV_EXT(__pdesc)                \
+#define GET_TX_DESC_RDG_NAV_EXT(__pdesc)                        \
         LE_BITS_TO_4BYTE(__pdesc+4, 13, 1)
-#define GET_TX_DESC_LSIG_TXOP_EN(__pdesc)               \
+#define GET_TX_DESC_LSIG_TXOP_EN(__pdesc)                       \
         LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
-#define GET_TX_DESC_PIFS(__pdesc)                       \
+#define GET_TX_DESC_PIFS(__pdesc)                               \
         LE_BITS_TO_4BYTE(__pdesc+4, 15, 1)
-#define GET_TX_DESC_RATE_ID(__pdesc)                    \
+#define GET_TX_DESC_RATE_ID(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+4, 16, 4)
-#define GET_TX_DESC_NAV_USE_HDR(__pdesc)                \
+#define GET_TX_DESC_NAV_USE_HDR(__pdesc)                        \
         LE_BITS_TO_4BYTE(__pdesc+4, 20, 1)
-#define GET_TX_DESC_EN_DESC_ID(__pdesc)         \
+#define GET_TX_DESC_EN_DESC_ID(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+4, 21, 1)
-#define GET_TX_DESC_SEC_TYPE(__pdesc)                   \
+#define GET_TX_DESC_SEC_TYPE(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc+4, 22, 2)
-#define GET_TX_DESC_PKT_OFFSET(__pdesc)         \
+#define GET_TX_DESC_PKT_OFFSET(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+4, 24, 8)
 
-#define SET_TX_DESC_RTS_RC(__pdesc, __val)              \
+#define SET_TX_DESC_RTS_RC(__pdesc, __val)                      \
         SET_BITS_TO_LE_4BYTE(__pdesc+8, 0, 6, __val)
 #define SET_TX_DESC_DATA_RC(__pdesc, __val)             \
         SET_BITS_TO_LE_4BYTE(__pdesc+8, 6, 6, __val)
@@ -144,9 +140,9 @@
         SET_BITS_TO_LE_4BYTE(__pdesc+8, 14, 2, __val)
 #define SET_TX_DESC_MORE_FRAG(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc+8, 17, 1, __val)
-#define SET_TX_DESC_RAW(__pdesc, __val)         \
+#define SET_TX_DESC_RAW(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc+8, 18, 1, __val)
-#define SET_TX_DESC_CCX(__pdesc, __val)         \
+#define SET_TX_DESC_CCX(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc+8, 19, 1, __val)
 #define SET_TX_DESC_AMPDU_DENSITY(__pdesc, __val)       \
         SET_BITS_TO_LE_4BYTE(__pdesc+8, 20, 3, __val)
@@ -161,62 +157,62 @@
 #define SET_TX_DESC_TX_ANT_HT(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc+8, 30, 2, __val)
 
-#define GET_TX_DESC_RTS_RC(__pdesc)                     \
+#define GET_TX_DESC_RTS_RC(__pdesc)                             \
         LE_BITS_TO_4BYTE(__pdesc+8, 0, 6)
-#define GET_TX_DESC_DATA_RC(__pdesc)                    \
+#define GET_TX_DESC_DATA_RC(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+8, 6, 6)
-#define GET_TX_DESC_BAR_RTY_TH(__pdesc)         \
+#define GET_TX_DESC_BAR_RTY_TH(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+8, 14, 2)
-#define GET_TX_DESC_MORE_FRAG(__pdesc)                  \
+#define GET_TX_DESC_MORE_FRAG(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc+8, 17, 1)
-#define GET_TX_DESC_RAW(__pdesc)                        \
+#define GET_TX_DESC_RAW(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+8, 18, 1)
-#define GET_TX_DESC_CCX(__pdesc)                        \
+#define GET_TX_DESC_CCX(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+8, 19, 1)
-#define GET_TX_DESC_AMPDU_DENSITY(__pdesc)              \
+#define GET_TX_DESC_AMPDU_DENSITY(__pdesc)                      \
         LE_BITS_TO_4BYTE(__pdesc+8, 20, 3)
-#define GET_TX_DESC_ANTSEL_A(__pdesc)                   \
+#define GET_TX_DESC_ANTSEL_A(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc+8, 24, 1)
-#define GET_TX_DESC_ANTSEL_B(__pdesc)                   \
+#define GET_TX_DESC_ANTSEL_B(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc+8, 25, 1)
-#define GET_TX_DESC_TX_ANT_CCK(__pdesc)         \
+#define GET_TX_DESC_TX_ANT_CCK(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+8, 26, 2)
-#define GET_TX_DESC_TX_ANTL(__pdesc)                    \
+#define GET_TX_DESC_TX_ANTL(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+8, 28, 2)
-#define GET_TX_DESC_TX_ANT_HT(__pdesc)                  \
+#define GET_TX_DESC_TX_ANT_HT(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc+8, 30, 2)
 
 #define SET_TX_DESC_NEXT_HEAP_PAGE(__pdesc, __val)      \
         SET_BITS_TO_LE_4BYTE(__pdesc+12, 0, 8, __val)
 #define SET_TX_DESC_TAIL_PAGE(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc+12, 8, 8, __val)
-#define SET_TX_DESC_SEQ(__pdesc, __val)         \
+#define SET_TX_DESC_SEQ(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc+12, 16, 12, __val)
-#define SET_TX_DESC_PKT_ID(__pdesc, __val)              \
+#define SET_TX_DESC_PKT_ID(__pdesc, __val)                      \
         SET_BITS_TO_LE_4BYTE(__pdesc+12, 28, 4, __val)
 
 #define GET_TX_DESC_NEXT_HEAP_PAGE(__pdesc)             \
         LE_BITS_TO_4BYTE(__pdesc+12, 0, 8)
-#define GET_TX_DESC_TAIL_PAGE(__pdesc)                  \
+#define GET_TX_DESC_TAIL_PAGE(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc+12, 8, 8)
-#define GET_TX_DESC_SEQ(__pdesc)                        \
+#define GET_TX_DESC_SEQ(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+12, 16, 12)
-#define GET_TX_DESC_PKT_ID(__pdesc)                     \
+#define GET_TX_DESC_PKT_ID(__pdesc)                             \
         LE_BITS_TO_4BYTE(__pdesc+12, 28, 4)
 
 /* For RTL8723 */
 #define SET_TX_DESC_TRIGGER_INT(__pdesc, __val)         \
         SET_BITS_TO_LE_4BYTE(__pdesc+12, 30, 1, __val)
-#define SET_TX_DESC_HWSEQ_EN_8723(__pdesc, __val)       \
+#define SET_TX_DESC_HWSEQ_EN_8723(__pdesc, __val)   \
         SET_BITS_TO_LE_4BYTE(__pdesc+12, 31, 1, __val)
-#define SET_TX_DESC_HWSEQ_SEL_8723(__pTxDesc, __Value)  \
-        SET_BITS_TO_LE_4BYTE(__pTxDesc+16, 6, 2, __Value)
+#define SET_TX_DESC_HWSEQ_SEL_8723(__txdesc, __value) \
+        SET_BITS_TO_LE_4BYTE(__txdesc+16, 6, 2, __value)
 
 #define SET_TX_DESC_RTS_RATE(__pdesc, __val)            \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 5, __val)
 #define SET_TX_DESC_AP_DCFE(__pdesc, __val)             \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 5, 1, __val)
-#define SET_TX_DESC_QOS(__pdesc, __val)         \
+#define SET_TX_DESC_QOS(__pdesc, __val)                         \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 6, 1, __val)
 #define SET_TX_DESC_HWSEQ_EN(__pdesc, __val)            \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 7, 1, __val)
@@ -248,54 +244,54 @@
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 25, 1, __val)
 #define SET_TX_DESC_RTS_SHORT(__pdesc, __val)           \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 26, 1, __val)
-#define SET_TX_DESC_RTS_BW(__pdesc, __val)              \
+#define SET_TX_DESC_RTS_BW(__pdesc, __val)                      \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 27, 1, __val)
-#define SET_TX_DESC_RTS_SC(__pdesc, __val)              \
+#define SET_TX_DESC_RTS_SC(__pdesc, __val)                      \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 28, 2, __val)
 #define SET_TX_DESC_RTS_STBC(__pdesc, __val)            \
         SET_BITS_TO_LE_4BYTE(__pdesc+16, 30, 2, __val)
 
-#define GET_TX_DESC_RTS_RATE(__pdesc)                   \
+#define GET_TX_DESC_RTS_RATE(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc+16, 0, 5)
-#define GET_TX_DESC_AP_DCFE(__pdesc)                    \
+#define GET_TX_DESC_AP_DCFE(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+16, 5, 1)
-#define GET_TX_DESC_QOS(__pdesc)                        \
+#define GET_TX_DESC_QOS(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+16, 6, 1)
-#define GET_TX_DESC_HWSEQ_EN(__pdesc)                   \
+#define GET_TX_DESC_HWSEQ_EN(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc+16, 7, 1)
-#define GET_TX_DESC_USE_RATE(__pdesc)                   \
+#define GET_TX_DESC_USE_RATE(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc+16, 8, 1)
 #define GET_TX_DESC_DISABLE_RTS_FB(__pdesc)             \
         LE_BITS_TO_4BYTE(__pdesc+16, 9, 1)
-#define GET_TX_DESC_DISABLE_FB(__pdesc)         \
+#define GET_TX_DESC_DISABLE_FB(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+16, 10, 1)
-#define GET_TX_DESC_CTS2SELF(__pdesc)                   \
+#define GET_TX_DESC_CTS2SELF(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc+16, 11, 1)
-#define GET_TX_DESC_RTS_ENABLE(__pdesc)         \
+#define GET_TX_DESC_RTS_ENABLE(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+16, 12, 1)
-#define GET_TX_DESC_HW_RTS_ENABLE(__pdesc)              \
+#define GET_TX_DESC_HW_RTS_ENABLE(__pdesc)                      \
         LE_BITS_TO_4BYTE(__pdesc+16, 13, 1)
-#define GET_TX_DESC_PORT_ID(__pdesc)                    \
+#define GET_TX_DESC_PORT_ID(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+16, 14, 1)
-#define GET_TX_DESC_WAIT_DCTS(__pdesc)                  \
+#define GET_TX_DESC_WAIT_DCTS(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc+16, 18, 1)
-#define GET_TX_DESC_CTS2AP_EN(__pdesc)                  \
+#define GET_TX_DESC_CTS2AP_EN(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc+16, 19, 1)
 #define GET_TX_DESC_TX_SUB_CARRIER(__pdesc)             \
         LE_BITS_TO_4BYTE(__pdesc+16, 20, 2)
-#define GET_TX_DESC_TX_STBC(__pdesc)                    \
+#define GET_TX_DESC_TX_STBC(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+16, 22, 2)
-#define GET_TX_DESC_DATA_SHORT(__pdesc)         \
+#define GET_TX_DESC_DATA_SHORT(__pdesc)                         \
         LE_BITS_TO_4BYTE(__pdesc+16, 24, 1)
-#define GET_TX_DESC_DATA_BW(__pdesc)                    \
+#define GET_TX_DESC_DATA_BW(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+16, 25, 1)
-#define GET_TX_DESC_RTS_SHORT(__pdesc)                  \
+#define GET_TX_DESC_RTS_SHORT(__pdesc)                          \
         LE_BITS_TO_4BYTE(__pdesc+16, 26, 1)
-#define GET_TX_DESC_RTS_BW(__pdesc)                     \
+#define GET_TX_DESC_RTS_BW(__pdesc)                             \
         LE_BITS_TO_4BYTE(__pdesc+16, 27, 1)
-#define GET_TX_DESC_RTS_SC(__pdesc)                     \
+#define GET_TX_DESC_RTS_SC(__pdesc)                             \
         LE_BITS_TO_4BYTE(__pdesc+16, 28, 2)
-#define GET_TX_DESC_RTS_STBC(__pdesc)                   \
+#define GET_TX_DESC_RTS_STBC(__pdesc)                           \
         LE_BITS_TO_4BYTE(__pdesc+16, 30, 2)
 
 #define SET_TX_DESC_TX_RATE(__pdesc, __val)             \
@@ -315,17 +311,17 @@
 #define SET_TX_DESC_USB_TXAGG_NUM(__pdesc, __val)       \
         SET_BITS_TO_LE_4BYTE(__pdesc+20, 24, 8, __val)
 
-#define GET_TX_DESC_TX_RATE(__pdesc)                    \
+#define GET_TX_DESC_TX_RATE(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+20, 0, 6)
-#define GET_TX_DESC_DATA_SHORTGI(__pdesc)               \
+#define GET_TX_DESC_DATA_SHORTGI(__pdesc)                       \
         LE_BITS_TO_4BYTE(__pdesc+20, 6, 1)
-#define GET_TX_DESC_CCX_TAG(__pdesc)                    \
+#define GET_TX_DESC_CCX_TAG(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+20, 7, 1)
-#define GET_TX_DESC_DATA_RATE_FB_LIMIT(__pdesc) \
+#define GET_TX_DESC_DATA_RATE_FB_LIMIT(__pdesc)         \
         LE_BITS_TO_4BYTE(__pdesc+20, 8, 5)
 #define GET_TX_DESC_RTS_RATE_FB_LIMIT(__pdesc)          \
         LE_BITS_TO_4BYTE(__pdesc+20, 13, 4)
-#define GET_TX_DESC_RETRY_LIMIT_ENABLE(__pdesc) \
+#define GET_TX_DESC_RETRY_LIMIT_ENABLE(__pdesc)         \
         LE_BITS_TO_4BYTE(__pdesc+20, 17, 1)
 #define GET_TX_DESC_DATA_RETRY_LIMIT(__pdesc)           \
         LE_BITS_TO_4BYTE(__pdesc+20, 18, 6)
@@ -336,9 +332,9 @@
         SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 5, __val)
 #define SET_TX_DESC_TXAGC_B(__pdesc, __val)             \
         SET_BITS_TO_LE_4BYTE(__pdesc+24, 5, 5, __val)
-#define SET_TX_DESC_USE_MAX_LEN(__pdesc, __val) \
+#define SET_TX_DESC_USE_MAX_LEN(__pdesc, __val)         \
         SET_BITS_TO_LE_4BYTE(__pdesc+24, 10, 1, __val)
-#define SET_TX_DESC_MAX_AGG_NUM(__pdesc, __val) \
+#define SET_TX_DESC_MAX_AGG_NUM(__pdesc, __val)         \
         SET_BITS_TO_LE_4BYTE(__pdesc+24, 11, 5, __val)
 #define SET_TX_DESC_MCSG1_MAX_LEN(__pdesc, __val)       \
         SET_BITS_TO_LE_4BYTE(__pdesc+24, 16, 4, __val)
@@ -349,19 +345,19 @@
 #define SET_TX_DESC_MCS7_SGI_MAX_LEN(__pdesc, __val)\
         SET_BITS_TO_LE_4BYTE(__pdesc+24, 28, 4, __val)
 
-#define GET_TX_DESC_TXAGC_A(__pdesc)                    \
+#define GET_TX_DESC_TXAGC_A(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+24, 0, 5)
-#define GET_TX_DESC_TXAGC_B(__pdesc)                    \
+#define GET_TX_DESC_TXAGC_B(__pdesc)                            \
         LE_BITS_TO_4BYTE(__pdesc+24, 5, 5)
-#define GET_TX_DESC_USE_MAX_LEN(__pdesc)                \
+#define GET_TX_DESC_USE_MAX_LEN(__pdesc)                        \
         LE_BITS_TO_4BYTE(__pdesc+24, 10, 1)
-#define GET_TX_DESC_MAX_AGG_NUM(__pdesc)                \
+#define GET_TX_DESC_MAX_AGG_NUM(__pdesc)                        \
         LE_BITS_TO_4BYTE(__pdesc+24, 11, 5)
-#define GET_TX_DESC_MCSG1_MAX_LEN(__pdesc)              \
+#define GET_TX_DESC_MCSG1_MAX_LEN(__pdesc)                      \
         LE_BITS_TO_4BYTE(__pdesc+24, 16, 4)
-#define GET_TX_DESC_MCSG2_MAX_LEN(__pdesc)              \
+#define GET_TX_DESC_MCSG2_MAX_LEN(__pdesc)                      \
         LE_BITS_TO_4BYTE(__pdesc+24, 20, 4)
-#define GET_TX_DESC_MCSG3_MAX_LEN(__pdesc)              \
+#define GET_TX_DESC_MCSG3_MAX_LEN(__pdesc)                      \
         LE_BITS_TO_4BYTE(__pdesc+24, 24, 4)
 #define GET_TX_DESC_MCS7_SGI_MAX_LEN(__pdesc)           \
         LE_BITS_TO_4BYTE(__pdesc+24, 28, 4)
@@ -379,11 +375,11 @@
 
 #define GET_TX_DESC_TX_BUFFER_SIZE(__pdesc)             \
         LE_BITS_TO_4BYTE(__pdesc+28, 0, 16)
-#define GET_TX_DESC_MCSG4_MAX_LEN(__pdesc)              \
+#define GET_TX_DESC_MCSG4_MAX_LEN(__pdesc)                      \
         LE_BITS_TO_4BYTE(__pdesc+28, 16, 4)
-#define GET_TX_DESC_MCSG5_MAX_LEN(__pdesc)              \
+#define GET_TX_DESC_MCSG5_MAX_LEN(__pdesc)                      \
         LE_BITS_TO_4BYTE(__pdesc+28, 20, 4)
-#define GET_TX_DESC_MCSG6_MAX_LEN(__pdesc)              \
+#define GET_TX_DESC_MCSG6_MAX_LEN(__pdesc)                      \
         LE_BITS_TO_4BYTE(__pdesc+28, 24, 4)
 #define GET_TX_DESC_MCS15_SGI_MAX_LEN(__pdesc)          \
         LE_BITS_TO_4BYTE(__pdesc+28, 28, 4)
@@ -395,7 +391,7 @@
 
 #define GET_TX_DESC_TX_BUFFER_ADDRESS(__pdesc)          \
         LE_BITS_TO_4BYTE(__pdesc+32, 0, 32)
-#define GET_TX_DESC_TX_BUFFER_ADDRESS64(__pdesc)        \
+#define GET_TX_DESC_TX_BUFFER_ADDRESS64(__pdesc)                \
         LE_BITS_TO_4BYTE(__pdesc+36, 0, 32)
 
 #define SET_TX_DESC_NEXT_DESC_ADDRESS(__pdesc, __val)   \
@@ -410,97 +406,97 @@
 
 #define GET_RX_DESC_PKT_LEN(__pdesc)                    \
         LE_BITS_TO_4BYTE(__pdesc, 0, 14)
-#define GET_RX_DESC_CRC32(__pdesc)                      \
+#define GET_RX_DESC_CRC32(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc, 14, 1)
-#define GET_RX_DESC_ICV(__pdesc)                        \
+#define GET_RX_DESC_ICV(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc, 15, 1)
 #define GET_RX_DESC_DRV_INFO_SIZE(__pdesc)              \
         LE_BITS_TO_4BYTE(__pdesc, 16, 4)
 #define GET_RX_DESC_SECURITY(__pdesc)                   \
         LE_BITS_TO_4BYTE(__pdesc, 20, 3)
-#define GET_RX_DESC_QOS(__pdesc)                        \
+#define GET_RX_DESC_QOS(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc, 23, 1)
-#define GET_RX_DESC_SHIFT(__pdesc)                      \
+#define GET_RX_DESC_SHIFT(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc, 24, 2)
-#define GET_RX_DESC_PHYST(__pdesc)                      \
+#define GET_RX_DESC_PHYST(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc, 26, 1)
-#define GET_RX_DESC_SWDEC(__pdesc)                      \
+#define GET_RX_DESC_SWDEC(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc, 27, 1)
-#define GET_RX_DESC_LS(__pdesc)                         \
+#define GET_RX_DESC_LS(__pdesc)                                 \
         LE_BITS_TO_4BYTE(__pdesc, 28, 1)
-#define GET_RX_DESC_FS(__pdesc)                         \
+#define GET_RX_DESC_FS(__pdesc)                                 \
         LE_BITS_TO_4BYTE(__pdesc, 29, 1)
-#define GET_RX_DESC_EOR(__pdesc)                        \
+#define GET_RX_DESC_EOR(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc, 30, 1)
-#define GET_RX_DESC_OWN(__pdesc)                        \
+#define GET_RX_DESC_OWN(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc, 31, 1)
 
-#define SET_RX_DESC_PKT_LEN(__pdesc, __val)             \
+#define SET_RX_DESC_PKT_LEN(__pdesc, __val)     \
         SET_BITS_TO_LE_4BYTE(__pdesc, 0, 14, __val)
 #define SET_RX_DESC_EOR(__pdesc, __val)                 \
         SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
 #define SET_RX_DESC_OWN(__pdesc, __val)                 \
         SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
 
-#define GET_RX_DESC_MACID(__pdesc)                      \
+#define GET_RX_DESC_MACID(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc+4, 0, 5)
-#define GET_RX_DESC_TID(__pdesc)                        \
+#define GET_RX_DESC_TID(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+4, 5, 4)
 #define GET_RX_DESC_HWRSVD(__pdesc)                     \
         LE_BITS_TO_4BYTE(__pdesc+4, 9, 5)
-#define GET_RX_DESC_PAGGR(__pdesc)                      \
+#define GET_RX_DESC_PAGGR(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
-#define GET_RX_DESC_FAGGR(__pdesc)                      \
+#define GET_RX_DESC_FAGGR(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc+4, 15, 1)
 #define GET_RX_DESC_A1_FIT(__pdesc)                     \
         LE_BITS_TO_4BYTE(__pdesc+4, 16, 4)
 #define GET_RX_DESC_A2_FIT(__pdesc)                     \
         LE_BITS_TO_4BYTE(__pdesc+4, 20, 4)
-#define GET_RX_DESC_PAM(__pdesc)                        \
+#define GET_RX_DESC_PAM(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+4, 24, 1)
-#define GET_RX_DESC_PWR(__pdesc)                        \
+#define GET_RX_DESC_PWR(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+4, 25, 1)
-#define GET_RX_DESC_MD(__pdesc)                         \
+#define GET_RX_DESC_MD(__pdesc)                                 \
         LE_BITS_TO_4BYTE(__pdesc+4, 26, 1)
-#define GET_RX_DESC_MF(__pdesc)                         \
+#define GET_RX_DESC_MF(__pdesc)                                 \
         LE_BITS_TO_4BYTE(__pdesc+4, 27, 1)
-#define GET_RX_DESC_TYPE(__pdesc)                       \
+#define GET_RX_DESC_TYPE(__pdesc)                               \
         LE_BITS_TO_4BYTE(__pdesc+4, 28, 2)
-#define GET_RX_DESC_MC(__pdesc)                         \
+#define GET_RX_DESC_MC(__pdesc)                                 \
         LE_BITS_TO_4BYTE(__pdesc+4, 30, 1)
-#define GET_RX_DESC_BC(__pdesc)                         \
+#define GET_RX_DESC_BC(__pdesc)                                 \
         LE_BITS_TO_4BYTE(__pdesc+4, 31, 1)
-#define GET_RX_DESC_SEQ(__pdesc)                        \
+#define GET_RX_DESC_SEQ(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+8, 0, 12)
-#define GET_RX_DESC_FRAG(__pdesc)                       \
+#define GET_RX_DESC_FRAG(__pdesc)                               \
         LE_BITS_TO_4BYTE(__pdesc+8, 12, 4)
 #define GET_RX_DESC_NEXT_PKT_LEN(__pdesc)               \
         LE_BITS_TO_4BYTE(__pdesc+8, 16, 14)
 #define GET_RX_DESC_NEXT_IND(__pdesc)                   \
         LE_BITS_TO_4BYTE(__pdesc+8, 30, 1)
-#define GET_RX_DESC_RSVD(__pdesc)                       \
+#define GET_RX_DESC_RSVD(__pdesc)                               \
         LE_BITS_TO_4BYTE(__pdesc+8, 31, 1)
 
-#define GET_RX_DESC_RXMCS(__pdesc)                      \
+#define GET_RX_DESC_RXMCS(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc+12, 0, 6)
-#define GET_RX_DESC_RXHT(__pdesc)                       \
+#define GET_RX_DESC_RXHT(__pdesc)                               \
         LE_BITS_TO_4BYTE(__pdesc+12, 6, 1)
-#define GET_RX_DESC_SPLCP(__pdesc)                      \
+#define GET_RX_DESC_SPLCP(__pdesc)                              \
         LE_BITS_TO_4BYTE(__pdesc+12, 8, 1)
-#define GET_RX_DESC_BW(__pdesc)                         \
+#define GET_RX_DESC_BW(__pdesc)                                 \
         LE_BITS_TO_4BYTE(__pdesc+12, 9, 1)
-#define GET_RX_DESC_HTC(__pdesc)                        \
+#define GET_RX_DESC_HTC(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+12, 10, 1)
 #define GET_RX_DESC_HWPC_ERR(__pdesc)                   \
         LE_BITS_TO_4BYTE(__pdesc+12, 14, 1)
 #define GET_RX_DESC_HWPC_IND(__pdesc)                   \
         LE_BITS_TO_4BYTE(__pdesc+12, 15, 1)
-#define GET_RX_DESC_IV0(__pdesc)                        \
+#define GET_RX_DESC_IV0(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+12, 16, 16)
 
-#define GET_RX_DESC_IV1(__pdesc)                        \
+#define GET_RX_DESC_IV1(__pdesc)                                \
         LE_BITS_TO_4BYTE(__pdesc+16, 0, 32)
-#define GET_RX_DESC_TSFL(__pdesc)                       \
+#define GET_RX_DESC_TSFL(__pdesc)                               \
         LE_BITS_TO_4BYTE(__pdesc+20, 0, 32)
 
 #define GET_RX_DESC_BUFF_ADDR(__pdesc)                  \
@@ -508,17 +504,17 @@
 #define GET_RX_DESC_BUFF_ADDR64(__pdesc)                \
         LE_BITS_TO_4BYTE(__pdesc+28, 0, 32)
 
-#define SET_RX_DESC_BUFF_ADDR(__pdesc, __val)           \
+#define SET_RX_DESC_BUFF_ADDR(__pdesc, __val)   \
         SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val)
-#define SET_RX_DESC_BUFF_ADDR64(__pdesc, __val)         \
+#define SET_RX_DESC_BUFF_ADDR64(__pdesc, __val) \
         SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 32, __val)
 
-#define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)       \
-do {                                                    \
-        if (_size > TX_DESC_NEXT_DESC_OFFSET)           \
+#define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)               \
+do {                                                            \
+        if (_size > TX_DESC_NEXT_DESC_OFFSET)                   \
                 memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
-        else                                            \
-                memset(__pdesc, 0, _size);              \
+        else                                                    \
+                memset(__pdesc, 0, _size);                      \
 } while (0)
 
 struct rx_fwinfo_8723e {
@@ -699,22 +695,27 @@ struct rx_desc_8723e {
 
 } __packed;
 
-void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw,
-                            struct ieee80211_hdr *hdr, u8 *pdesc,
-                            u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
-                            struct ieee80211_sta *sta,
-                            struct sk_buff *skb, u8 hw_queue,
-                            struct rtl_tcb_desc *ptcb_desc);
-bool rtl8723ae_rx_query_desc(struct ieee80211_hw *hw,
-                             struct rtl_stats *status,
-                             struct ieee80211_rx_status *rx_status,
-                             u8 *pdesc, struct sk_buff *skb);
-void rtl8723ae_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
-                        u8 desc_name, u8 *val);
-u32 rtl8723ae_get_desc(u8 *pdesc, bool istx, u8 desc_name);
-void rtl8723ae_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
-void rtl8723ae_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
-                               bool b_firstseg, bool b_lastseg,
+void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
+                           struct ieee80211_hdr *hdr,
+                           u8 *pdesc, u8 *txbd,
+                           struct ieee80211_tx_info *info,
+                           struct ieee80211_sta *sta,
+                           struct sk_buff *skb, u8 hw_queue,
+                           struct rtl_tcb_desc *ptcb_desc);
+bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
+                            struct rtl_stats *status,
+                            struct ieee80211_rx_status *rx_status,
+                            u8 *pdesc, struct sk_buff *skb);
+void rtl8723e_set_desc(struct ieee80211_hw *hw,
+                       u8 *pdesc, bool istx, u8 desc_name, u8 *val);
+u32 rtl8723e_get_desc(u8 *pdesc, bool istx, u8 desc_name);
+bool rtl8723e_is_tx_desc_closed(struct ieee80211_hw *hw,
+                                u8 hw_queue, u16 index);
+void rtl8723e_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
+void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
+                              bool firstseg, bool lastseg,
+                              struct sk_buff *skb);
+u32 rtl8723e_rx_command_packet(struct ieee80211_hw *hw,
+                               struct rtl_stats status,
                                struct sk_buff *skb);
-
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/def.h b/drivers/net/wireless/rtlwifi/rtl8723be/def.h
index 3c30b74e983d..025ea5c0f3f6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/def.h
@@ -26,158 +26,24 @@
 #ifndef __RTL8723BE_DEF_H__
 #define __RTL8723BE_DEF_H__
 
-#define HAL_RETRY_LIMIT_INFRA                           48
-#define HAL_RETRY_LIMIT_AP_ADHOC                        7
-
-#define RESET_DELAY_8185                                20
-
-#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
-#define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
-
-#define NUM_OF_FIRMWARE_QUEUE                   10
-#define NUM_OF_PAGES_IN_FW                      0x100
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK              0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE              0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI              0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO              0x07
-#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA            0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_CMD             0x0
-#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT            0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH            0x02
-#define NUM_OF_PAGE_IN_FW_QUEUE_BCN             0x2
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB             0xA1
-
-#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM          0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM          0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM          0x048
-#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM          0x026
-#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM         0x00
-
-#define MAX_LINES_HWCONFIG_TXT                  1000
-#define MAX_BYTES_LINE_HWCONFIG_TXT             256
-
-#define SW_THREE_WIRE                           0
-#define HW_THREE_WIRE                           2
-
-#define BT_DEMO_BOARD                           0
-#define BT_QA_BOARD                             1
-#define BT_FPGA                                 2
-
 #define HAL_PRIME_CHNL_OFFSET_DONT_CARE         0
 #define HAL_PRIME_CHNL_OFFSET_LOWER             1
 #define HAL_PRIME_CHNL_OFFSET_UPPER             2
 
-#define MAX_H2C_QUEUE_NUM                       10
 
 #define RX_MPDU_QUEUE                           0
-#define RX_CMD_QUEUE                            1
-#define RX_MAX_QUEUE                            2
-#define AC2QUEUEID(_AC)                         (_AC)
-
-#define C2H_RX_CMD_HDR_LEN                      8
-#define GET_C2H_CMD_CMD_LEN(__prxhdr)           \
-        LE_BITS_TO_4BYTE((__prxhdr), 0, 16)
-#define GET_C2H_CMD_ELEMENT_ID(__prxhdr)        \
-        LE_BITS_TO_4BYTE((__prxhdr), 16, 8)
-#define GET_C2H_CMD_CMD_SEQ(__prxhdr)           \
-        LE_BITS_TO_4BYTE((__prxhdr), 24, 7)
-#define GET_C2H_CMD_CONTINUE(__prxhdr)          \
-        LE_BITS_TO_4BYTE((__prxhdr), 31, 1)
-#define GET_C2H_CMD_CONTENT(__prxhdr)           \
-        ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN)
-
-#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID(__pcmdfbhdr)    \
-        LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8)
-#define GET_C2H_CMD_FEEDBACK_CCX_LEN(__pcmdfbhdr)       \
-        LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8)
-#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT(__pcmdfbhdr)   \
-        LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16)
-#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID(__pcmdfbhdr)    \
-        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5)
-#define GET_C2H_CMD_FEEDBACK_CCX_VALID(__pcmdfbhdr)     \
-        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1)
-#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT(__pcmdfbhdr) \
-        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5)
-#define GET_C2H_CMD_FEEDBACK_CCX_TOK(__pcmdfbhdr)       \
-        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1)
-#define GET_C2H_CMD_FEEDBACK_CCX_QSEL(__pcmdfbhdr)      \
-        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)
-#define GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)       \
-        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)
-
-#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
-#define CHIP_BONDING_92C_1T2R           0x1
-
-#define CHIP_8723                       BIT(0)
-#define CHIP_8723B                      (BIT(1) | BIT(2))
-#define NORMAL_CHIP                     BIT(3)
-#define RF_TYPE_1T1R                    (~(BIT(4) | BIT(5) | BIT(6)))
-#define RF_TYPE_1T2R                    BIT(4)
-#define RF_TYPE_2T2R                    BIT(5)
-#define CHIP_VENDOR_UMC                 BIT(7)
-#define B_CUT_VERSION                   BIT(12)
-#define C_CUT_VERSION                   BIT(13)
-#define D_CUT_VERSION                   ((BIT(12) | BIT(13)))
-#define E_CUT_VERSION                   BIT(14)
-#define RF_RL_ID                        (BIT(31) | BIT(30) | BIT(29) | BIT(28))
-
-/* MASK */
-#define IC_TYPE_MASK                    (BIT(0) | BIT(1) | BIT(2))
-#define CHIP_TYPE_MASK                  BIT(3)
-#define RF_TYPE_MASK                    (BIT(4) | BIT(5) | BIT(6))
-#define MANUFACTUER_MASK                BIT(7)
-#define ROM_VERSION_MASK                (BIT(11) | BIT(10) | BIT(9) | BIT(8))
-#define CUT_VERSION_MASK                (BIT(15) | BIT(14) | BIT(13) | BIT(12))
-
-/* Get element */
-#define GET_CVID_IC_TYPE(version)       ((version) & IC_TYPE_MASK)
-#define GET_CVID_CHIP_TYPE(version)     ((version) & CHIP_TYPE_MASK)
-#define GET_CVID_RF_TYPE(version)       ((version) & RF_TYPE_MASK)
-#define GET_CVID_MANUFACTUER(version)   ((version) & MANUFACTUER_MASK)
-#define GET_CVID_ROM_VERSION(version)   ((version) & ROM_VERSION_MASK)
-#define GET_CVID_CUT_VERSION(version)   ((version) & CUT_VERSION_MASK)
-
-#define IS_92C_SERIAL(version)   ((IS_81XXC(version) && IS_2T2R(version)) ?\
-                                                                true : false)
-#define IS_81XXC(version)       ((GET_CVID_IC_TYPE(version) == 0) ?\
-                                                        true : false)
-#define IS_8723_SERIES(version) ((GET_CVID_IC_TYPE(version) == CHIP_8723) ?\
-                                                        true : false)
-#define IS_1T1R(version)        ((GET_CVID_RF_TYPE(version)) ? false : true)
-#define IS_1T2R(version)        ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R)\
-                                                        ? true : false)
-#define IS_2T2R(version)        ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R)\
-                                                        ? true : false)
-enum rf_optype {
-        RF_OP_BY_SW_3WIRE = 0,
-        RF_OP_BY_FW,
-        RF_OP_MAX
-};
-
-enum rf_power_state {
-        RF_ON,
-        RF_OFF,
-        RF_SLEEP,
-        RF_SHUT_DOWN,
-};
-
-enum power_save_mode {
-        POWER_SAVE_MODE_ACTIVE,
-        POWER_SAVE_MODE_SAVE,
-};
+#define CHIP_8723B                              (BIT(1) | BIT(2))
+#define NORMAL_CHIP                             BIT(3)
+#define CHIP_VENDOR_SMIC                        BIT(8)
+/* Currently only for RTL8723B */
+#define EXT_VENDOR_ID                           (BIT(18) | BIT(19))
 
-enum power_polocy_config {
-        POWERCFG_MAX_POWER_SAVINGS,
-        POWERCFG_GLOBAL_POWER_SAVINGS,
-        POWERCFG_LOCAL_POWER_SAVINGS,
-        POWERCFG_LENOVO,
-};
-
-enum interface_select_pci {
-        INTF_SEL1_MINICARD = 0,
-        INTF_SEL0_PCIE = 1,
-        INTF_SEL2_RSV = 2,
-        INTF_SEL3_RSV = 3,
+enum rx_packet_type {
+        NORMAL_RX,
+        TX_REPORT1,
+        TX_REPORT2,
+        HIS_REPORT,
+        C2H_PACKET,
 };
 
 enum rtl_desc_qsel {
@@ -222,27 +88,5 @@ enum rtl_desc8723e_rate {
         DESC92C_RATEMCS13 = 0x19,
         DESC92C_RATEMCS14 = 0x1a,
         DESC92C_RATEMCS15 = 0x1b,
-        DESC92C_RATEMCS15_SG = 0x1c,
-        DESC92C_RATEMCS32 = 0x20,
 };
-
-enum rx_packet_type {
-        NORMAL_RX,
-        TX_REPORT1,
-        TX_REPORT2,
-        HIS_REPORT,
-};
-
-struct phy_sts_cck_8723e_t {
-        u8 adc_pwdb_X[4];
-        u8 sq_rpt;
-        u8 cck_agc_rpt;
-};
-
-struct h2c_cmd_8723e {
-        u8 element_id;
-        u32 cmd_len;
-        u8 *p_cmdbuffer;
-};
-
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
index 13d53a1df789..dd7eb4371f49 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
@@ -32,7 +32,6 @@
 #include "dm.h"
 #include "../rtl8723com/dm_common.h"
 #include "fw.h"
-#include "../rtl8723com/fw_common.h"
 #include "trx.h"
 #include "../btcoexist/rtl_btc.h"
 
@@ -209,7 +208,7 @@ void rtl8723be_dm_txpower_track_adjust(struct ieee80211_hw *hw, u8 type,
                 pwr_val = TXPWRTRACK_MAX_IDX;
 
         *poutwrite_val = pwr_val | (pwr_val << 8) |
-                        (pwr_val << 16) | (pwr_val << 24);
+                (pwr_val << 16) | (pwr_val << 24);
 }
 
 static void rtl8723be_dm_diginit(struct ieee80211_hw *hw)
@@ -218,8 +217,7 @@ static void rtl8723be_dm_diginit(struct ieee80211_hw *hw)
         struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         dm_digtable->dig_enable_flag = true;
-        dm_digtable->cur_igvalue = rtl_get_bbreg(hw,
-                ROFDM0_XAAGCCORE1, 0x7f);
+        dm_digtable->cur_igvalue = rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f);
         dm_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW;
         dm_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
         dm_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
@@ -234,8 +232,8 @@ static void rtl8723be_dm_diginit(struct ieee80211_hw *hw)
         dm_digtable->forbidden_igi = DM_DIG_MIN;
         dm_digtable->large_fa_hit = 0;
         dm_digtable->recover_cnt = 0;
-        dm_digtable->dig_min_0 = DM_DIG_MIN;
-        dm_digtable->dig_min_1 = DM_DIG_MIN;
+        dm_digtable->dig_dynamic_min = DM_DIG_MIN;
+        dm_digtable->dig_dynamic_min_1 = DM_DIG_MIN;
         dm_digtable->media_connect_0 = false;
         dm_digtable->media_connect_1 = false;
         rtlpriv->dm.dm_initialgain_enable = true;
@@ -245,18 +243,18 @@ static void rtl8723be_dm_diginit(struct ieee80211_hw *hw)
 void rtl8723be_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rate_adaptive *ra = &(rtlpriv->ra);
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
 
-        ra->ratr_state = DM_RATR_STA_INIT;
-        ra->pre_ratr_state = DM_RATR_STA_INIT;
+        p_ra->ratr_state = DM_RATR_STA_INIT;
+        p_ra->pre_ratr_state = DM_RATR_STA_INIT;
 
         if (rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER)
                 rtlpriv->dm.useramask = true;
         else
                 rtlpriv->dm.useramask = false;
 
-        ra->high_rssi_thresh_for_ra = 50;
-        ra->low_rssi_thresh_for_ra40m = 20;
+        p_ra->high_rssi_thresh_for_ra = 50;
+        p_ra->low_rssi_thresh_for_ra40m = 20;
 }
 
 static void rtl8723be_dm_init_txpower_tracking(struct ieee80211_hw *hw)
@@ -279,7 +277,7 @@ static void rtl8723be_dm_init_txpower_tracking(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                  "  rtlpriv->dm.txpower_tracking = %d\n",
-                 rtlpriv->dm.txpower_tracking);
+                  rtlpriv->dm.txpower_tracking);
 }
 
 static void rtl8723be_dm_init_dynamic_atc_switch(struct ieee80211_hw *hw)
@@ -287,6 +285,7 @@ static void rtl8723be_dm_init_dynamic_atc_switch(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         rtlpriv->dm.crystal_cap = rtlpriv->efuse.crystalcap;
+
         rtlpriv->dm.atc_status = rtl_get_bbreg(hw, ROFDM1_CFOTRACKING, 0x800);
         rtlpriv->dm.cfo_threshold = CFO_THRESHOLD_XTAL;
 }
@@ -308,7 +307,7 @@ void rtl8723be_dm_init(struct ieee80211_hw *hw)
 static void rtl8723be_dm_find_minimum_rssi(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct dig_t *rtl_dm_dig = &(rtlpriv->dm_digtable);
+        struct dig_t *rtl_dm_dig = &rtlpriv->dm_digtable;
         struct rtl_mac *mac = rtl_mac(rtlpriv);
 
         /* Determine the minimum RSSI  */
@@ -325,20 +324,20 @@ static void rtl8723be_dm_find_minimum_rssi(struct ieee80211_hw *hw)
                             rtlpriv->dm.entry_min_undec_sm_pwdb;
                         RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                                  "AP Client PWDB = 0x%lx\n",
-                                 rtlpriv->dm.entry_min_undec_sm_pwdb);
+                               rtlpriv->dm.entry_min_undec_sm_pwdb);
                 } else {
                         rtl_dm_dig->min_undec_pwdb_for_dm =
                             rtlpriv->dm.undec_sm_pwdb;
                         RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                                  "STA Default Port PWDB = 0x%x\n",
-                                 rtl_dm_dig->min_undec_pwdb_for_dm);
+                                  rtl_dm_dig->min_undec_pwdb_for_dm);
                 }
         } else {
                 rtl_dm_dig->min_undec_pwdb_for_dm =
                                 rtlpriv->dm.entry_min_undec_sm_pwdb;
                 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                          "AP Ext Port or disconnet PWDB = 0x%x\n",
-                         rtl_dm_dig->min_undec_pwdb_for_dm);
+                          rtl_dm_dig->min_undec_pwdb_for_dm);
         }
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n",
                  rtl_dm_dig->min_undec_pwdb_for_dm);
@@ -347,6 +346,7 @@ static void rtl8723be_dm_find_minimum_rssi(struct ieee80211_hw *hw)
 static void rtl8723be_dm_check_rssi_monitor(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
         struct rtl_sta_info *drv_priv;
         u8 h2c_parameter[3] = { 0 };
         long tmp_entry_max_pwdb = 0, tmp_entry_min_pwdb = 0xff;
@@ -367,69 +367,78 @@ static void rtl8723be_dm_check_rssi_monitor(struct ieee80211_hw *hw)
 
         /* If associated entry is found */
         if (tmp_entry_max_pwdb != 0) {
-                rtlpriv->dm.entry_max_undec_sm_pwdb = tmp_entry_max_pwdb;
-                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         "EntryMaxPWDB = 0x%lx(%ld)\n",
+                rtlpriv->dm.entry_max_undec_sm_pwdb =
+                                                        tmp_entry_max_pwdb;
+                RTPRINT(rtlpriv, FDM, DM_PWDB,
+                        "EntryMaxPWDB = 0x%lx(%ld)\n",
                          tmp_entry_max_pwdb, tmp_entry_max_pwdb);
         } else {
                 rtlpriv->dm.entry_max_undec_sm_pwdb = 0;
         }
         /* If associated entry is found */
         if (tmp_entry_min_pwdb != 0xff) {
-                rtlpriv->dm.entry_min_undec_sm_pwdb = tmp_entry_min_pwdb;
-                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         "EntryMinPWDB = 0x%lx(%ld)\n",
+                rtlpriv->dm.entry_min_undec_sm_pwdb =
+                                                        tmp_entry_min_pwdb;
+                RTPRINT(rtlpriv, FDM, DM_PWDB,
+                        "EntryMinPWDB = 0x%lx(%ld)\n",
                          tmp_entry_min_pwdb, tmp_entry_min_pwdb);
         } else {
                 rtlpriv->dm.entry_min_undec_sm_pwdb = 0;
         }
         /* Indicate Rx signal strength to FW. */
         if (rtlpriv->dm.useramask) {
-                h2c_parameter[2] = (u8) (rtlpriv->dm.undec_sm_pwdb & 0xFF);
+                h2c_parameter[2] =
+                        (u8)(rtlpriv->dm.undec_sm_pwdb & 0xFF);
                 h2c_parameter[1] = 0x20;
                 h2c_parameter[0] = 0;
-                rtl8723be_fill_h2c_cmd(hw, H2C_RSSI_REPORT, 3, h2c_parameter);
+                rtl8723be_fill_h2c_cmd(hw, H2C_RSSIBE_REPORT, 3, h2c_parameter);
         } else {
-                rtl_write_byte(rtlpriv, 0x4fe, rtlpriv->dm.undec_sm_pwdb);
+                rtl_write_byte(rtlpriv, 0x4fe,
+                               rtlpriv->dm.undec_sm_pwdb);
         }
         rtl8723be_dm_find_minimum_rssi(hw);
-        rtlpriv->dm_digtable.rssi_val_min =
-                rtlpriv->dm_digtable.min_undec_pwdb_for_dm;
+        dm_digtable->rssi_val_min =
+                        rtlpriv->dm_digtable.min_undec_pwdb_for_dm;
 }
 
 void rtl8723be_dm_write_dig(struct ieee80211_hw *hw, u8 current_igi)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
-        if (rtlpriv->dm_digtable.cur_igvalue != current_igi) {
+        if (dm_digtable->stop_dig)
+                return;
+
+        if (dm_digtable->cur_igvalue != current_igi) {
                 rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f, current_igi);
                 if (rtlpriv->phy.rf_type != RF_1T1R)
-                        rtl_set_bbreg(hw, ROFDM0_XBAGCCORE1, 0x7f, current_igi);
+                        rtl_set_bbreg(hw, ROFDM0_XBAGCCORE1,
+                                      0x7f, current_igi);
         }
-        rtlpriv->dm_digtable.pre_igvalue = rtlpriv->dm_digtable.cur_igvalue;
-        rtlpriv->dm_digtable.cur_igvalue = current_igi;
+        dm_digtable->pre_igvalue = dm_digtable->cur_igvalue;
+        dm_digtable->cur_igvalue = current_igi;
 }
 
 static void rtl8723be_dm_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct dig_t *dm_digtable = &(rtlpriv->dm_digtable);
         u8 dig_dynamic_min, dig_maxofmin;
-        bool firstconnect, firstdisconnect;
+        bool bfirstconnect, bfirstdisconnect;
         u8 dm_dig_max, dm_dig_min;
         u8 current_igi = dm_digtable->cur_igvalue;
         u8 offset;
 
-        /* AP, BT */
+        /* AP,BT */
         if (mac->act_scanning)
                 return;
 
-        dig_dynamic_min = dm_digtable->dig_min_0;
-        firstconnect = (mac->link_state >= MAC80211_LINKED) &&
+        dig_dynamic_min = dm_digtable->dig_dynamic_min;
+        bfirstconnect = (mac->link_state >= MAC80211_LINKED) &&
                         !dm_digtable->media_connect_0;
-        firstdisconnect = (mac->link_state < MAC80211_LINKED) &&
-                           dm_digtable->media_connect_0;
+        bfirstdisconnect = (mac->link_state < MAC80211_LINKED) &&
+                        (dm_digtable->media_connect_0);
 
         dm_dig_max = 0x5a;
         dm_dig_min = DM_DIG_MIN;
@@ -457,6 +466,7 @@ static void rtl8723be_dm_dig(struct ieee80211_hw *hw)
                 } else {
                         dig_dynamic_min = dm_dig_min;
                 }
+
         } else {
                 dm_digtable->rx_gain_max = dm_dig_max;
                 dig_dynamic_min = dm_dig_min;
@@ -506,7 +516,7 @@ static void rtl8723be_dm_dig(struct ieee80211_hw *hw)
                 dm_digtable->rx_gain_min = dm_digtable->rx_gain_max;
 
         if (mac->link_state >= MAC80211_LINKED) {
-                if (firstconnect) {
+                if (bfirstconnect) {
                         if (dm_digtable->rssi_val_min <= dig_maxofmin)
                                 current_igi = dm_digtable->rssi_val_min;
                         else
@@ -522,7 +532,7 @@ static void rtl8723be_dm_dig(struct ieee80211_hw *hw)
                                 current_igi -= 2;
                 }
         } else {
-                if (firstdisconnect) {
+                if (bfirstdisconnect) {
                         current_igi = dm_digtable->rx_gain_min;
                 } else {
                         if (rtlpriv->falsealm_cnt.cnt_all > 10000)
@@ -542,14 +552,15 @@ static void rtl8723be_dm_dig(struct ieee80211_hw *hw)
         rtl8723be_dm_write_dig(hw, current_igi);
         dm_digtable->media_connect_0 =
                 ((mac->link_state >= MAC80211_LINKED) ? true : false);
-        dm_digtable->dig_min_0 = dig_dynamic_min;
+        dm_digtable->dig_dynamic_min = dig_dynamic_min;
 }
 
-static void rtl8723be_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
+static void rtl8723be_dm_false_alarm_counter_statistics(
+                                        struct ieee80211_hw *hw)
 {
         u32 ret_value;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct false_alarm_statistics *falsealm_cnt = &(rtlpriv->falsealm_cnt);
+        struct false_alarm_statistics *falsealm_cnt = &rtlpriv->falsealm_cnt;
 
         rtl_set_bbreg(hw, DM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1);
         rtl_set_bbreg(hw, DM_REG_OFDM_FA_RSTD_11N, BIT(31), 1);
@@ -615,16 +626,14 @@ static void rtl8723be_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, DM_REG_CCK_FA_RST_11N, BIT(15) | BIT(14), 2);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, "
-                 "cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
+                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
                  falsealm_cnt->cnt_parity_fail,
                  falsealm_cnt->cnt_rate_illegal,
                  falsealm_cnt->cnt_crc8_fail,
                  falsealm_cnt->cnt_mcs_fail);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 "cnt_ofdm_fail = %x, cnt_cck_fail = %x,"
-                 " cnt_all = %x\n",
+                 "cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",
                  falsealm_cnt->cnt_ofdm_fail,
                  falsealm_cnt->cnt_cck_fail,
                  falsealm_cnt->cnt_all);
@@ -690,7 +699,7 @@ static void rtl8723be_dm_tx_power_track_set_power(struct ieee80211_hw *hw,
                                         u8 rfpath, u8 idx)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
         u8 swing_idx_ofdm_limit = 36;
 
@@ -762,7 +771,8 @@ static void rtl8723be_dm_tx_power_track_set_power(struct ieee80211_hw *hw,
         }
 }
 
-static void txpwr_track_cb_therm(struct ieee80211_hw *hw)
+static void rtl8723be_dm_txpower_tracking_callback_thermalmeter(
+                                                        struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
@@ -773,30 +783,29 @@ static void txpwr_track_cb_therm(struct ieee80211_hw *hw)
         int i = 0;
 
         u8 ofdm_min_index = 6;
-        u8 index = 0;
+        u8 index_for_channel = 0;
 
-        char delta_swing_table_idx_tup_a[] = {
+        char delta_swing_table_idx_tup_a[TXSCALE_TABLE_SIZE] = {
                 0, 0, 1, 2, 2, 2, 3, 3, 3, 4,  5,
                 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 10,
                 10, 11, 11, 12, 12, 13, 14, 15};
-        char delta_swing_table_idx_tdown_a[] = {
+        char delta_swing_table_idx_tdown_a[TXSCALE_TABLE_SIZE] = {
                 0, 0, 1, 2, 2, 2, 3, 3, 3, 4,  5,
                 5, 6, 6, 6, 6, 7, 7, 7, 8, 8,  9,
                 9, 10, 10, 11, 12, 13, 14, 15};
 
-        /*Initilization ( 7 steps in total)*/
+        /*Initilization ( 7 steps in total )*/
         rtlpriv->dm.txpower_trackinginit = true;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 "rtl8723be_dm_txpower_tracking"
-                 "_callback_thermalmeter\n");
+                 "rtl8723be_dm_txpower_tracking_callback_thermalmeter\n");
 
-        thermalvalue = (u8)rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0xfc00);
+        thermalvalue = (u8)rtl_get_rfreg(hw,
+                RF90_PATH_A, RF_T_METER, 0xfc00);
         if (!rtlpriv->dm.txpower_track_control || thermalvalue == 0 ||
             rtlefuse->eeprom_thermalmeter == 0xFF)
                 return;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                 "eeprom_thermalmeter 0x%x\n",
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x\n",
                  thermalvalue, rtldm->thermalvalue,
                  rtlefuse->eeprom_thermalmeter);
         /*3 Initialize ThermalValues of RFCalibrateInfo*/
@@ -833,9 +842,7 @@ static void txpwr_track_cb_therm(struct ieee80211_hw *hw)
                     (rtlpriv->dm.thermalvalue_iqk - thermalvalue);
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                 "eeprom_thermalmeter 0x%x delta 0x%x "
-                 "delta_lck 0x%x delta_iqk 0x%x\n",
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x delta 0x%x delta_lck 0x%x delta_iqk 0x%x\n",
                  thermalvalue, rtlpriv->dm.thermalvalue,
                  rtlefuse->eeprom_thermalmeter, delta, delta_lck, delta_iqk);
         /* 6 If necessary, do LCK.*/
@@ -905,10 +912,10 @@ static void txpwr_track_cb_therm(struct ieee80211_hw *hw)
                 rtldm->done_txpower = true;
                 if (thermalvalue > rtlefuse->eeprom_thermalmeter)
                         rtl8723be_dm_tx_power_track_set_power(hw, BBSWING, 0,
-                                                              index);
+                                                             index_for_channel);
                 else
                         rtl8723be_dm_tx_power_track_set_power(hw, BBSWING, 0,
-                                                              index);
+                                                             index_for_channel);
 
                 rtldm->swing_idx_cck_base = rtldm->swing_idx_cck;
                 rtldm->swing_idx_ofdm_base[RF90_PATH_A] =
@@ -923,6 +930,7 @@ static void txpwr_track_cb_therm(struct ieee80211_hw *hw)
 
         rtldm->txpowercount = 0;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "end\n");
+
 }
 
 void rtl8723be_dm_check_txpower_tracking(struct ieee80211_hw *hw)
@@ -943,7 +951,7 @@ void rtl8723be_dm_check_txpower_tracking(struct ieee80211_hw *hw)
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Schedule TxPowerTracking !!\n");
-                txpwr_track_cb_therm(hw);
+                rtl8723be_dm_txpower_tracking_callback_thermalmeter(hw);
                 tm_trigger = 0;
         }
 }
@@ -953,11 +961,11 @@ static void rtl8723be_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct rate_adaptive *ra = &(rtlpriv->ra);
-        struct ieee80211_sta *sta = NULL;
-        u32 low_rssithresh_for_ra = ra->low2high_rssi_thresh_for_ra40m;
-        u32 high_rssithresh_for_ra = ra->high_rssi_thresh_for_ra;
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
+        u32 low_rssithresh_for_ra = p_ra->low2high_rssi_thresh_for_ra40m;
+        u32 high_rssithresh_for_ra = p_ra->high_rssi_thresh_for_ra;
         u8 go_up_gap = 5;
+        struct ieee80211_sta *sta = NULL;
 
         if (is_hal_stop(rtlhal)) {
                 RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
@@ -972,8 +980,8 @@ static void rtl8723be_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
         }
 
         if (mac->link_state == MAC80211_LINKED &&
-            mac->opmode == NL80211_IFTYPE_STATION) {
-                switch (ra->pre_ratr_state) {
+                mac->opmode == NL80211_IFTYPE_STATION) {
+                switch (p_ra->pre_ratr_state) {
                 case DM_RATR_STA_MIDDLE:
                         high_rssithresh_for_ra += go_up_gap;
                         break;
@@ -987,31 +995,31 @@ static void rtl8723be_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
 
                 if (rtlpriv->dm.undec_sm_pwdb >
                     (long)high_rssithresh_for_ra)
-                        ra->ratr_state = DM_RATR_STA_HIGH;
+                        p_ra->ratr_state = DM_RATR_STA_HIGH;
                 else if (rtlpriv->dm.undec_sm_pwdb >
                          (long)low_rssithresh_for_ra)
-                        ra->ratr_state = DM_RATR_STA_MIDDLE;
+                        p_ra->ratr_state = DM_RATR_STA_MIDDLE;
                 else
-                        ra->ratr_state = DM_RATR_STA_LOW;
+                        p_ra->ratr_state = DM_RATR_STA_LOW;
 
-                if (ra->pre_ratr_state != ra->ratr_state) {
+                if (p_ra->pre_ratr_state != p_ra->ratr_state) {
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
                                  "RSSI = %ld\n",
                                  rtlpriv->dm.undec_sm_pwdb);
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 "RSSI_LEVEL = %d\n", ra->ratr_state);
+                                 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
                                  "PreState = %d, CurState = %d\n",
-                                 ra->pre_ratr_state, ra->ratr_state);
+                                  p_ra->pre_ratr_state, p_ra->ratr_state);
 
                         rcu_read_lock();
                         sta = rtl_find_sta(hw, mac->bssid);
                         if (sta)
                                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
-                                                           ra->ratr_state);
+                                                           p_ra->ratr_state);
                         rcu_read_unlock();
 
-                        ra->pre_ratr_state = ra->ratr_state;
+                        p_ra->pre_ratr_state = p_ra->ratr_state;
                 }
         }
 }
@@ -1020,10 +1028,6 @@ static bool rtl8723be_dm_is_edca_turbo_disable(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        if (rtlpriv->cfg->ops->get_btc_status()) {
-                if (rtlpriv->btcoexist.btc_ops->btc_is_disable_edca_turbo(rtlpriv))
-                        return true;
-        }
         if (rtlpriv->mac80211.mode == WIRELESS_MODE_B)
                 return true;
 
@@ -1034,6 +1038,7 @@ static void rtl8723be_dm_check_edca_turbo(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+
         static u64 last_txok_cnt;
         static u64 last_rxok_cnt;
         u64 cur_txok_cnt = 0;
@@ -1042,22 +1047,22 @@ static void rtl8723be_dm_check_edca_turbo(struct ieee80211_hw *hw)
         u32 edca_be_dl = 0x6ea42b;/*not sure*/
         u32 edca_be = 0x5ea42b;
         u32 iot_peer = 0;
-        bool is_cur_rdlstate;
-        bool last_is_cur_rdlstate = false;
-        bool bias_on_rx = false;
-        bool edca_turbo_on = false;
+        bool b_is_cur_rdlstate;
+        bool b_last_is_cur_rdlstate = false;
+        bool b_bias_on_rx = false;
+        bool b_edca_turbo_on = false;
 
-        last_is_cur_rdlstate = rtlpriv->dm.is_cur_rdlstate;
+        b_last_is_cur_rdlstate = rtlpriv->dm.is_cur_rdlstate;
 
         cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok_cnt;
         cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rxok_cnt;
 
         iot_peer = rtlpriv->mac80211.vendor;
-        bias_on_rx = (iot_peer == PEER_RAL || iot_peer == PEER_ATH) ?
-                     true : false;
-        edca_turbo_on = ((!rtlpriv->dm.is_any_nonbepkts) &&
-                         (!rtlpriv->dm.disable_framebursting)) ?
-                         true : false;
+        b_bias_on_rx = (iot_peer == PEER_RAL || iot_peer == PEER_ATH) ?
+                       true : false;
+        b_edca_turbo_on = ((!rtlpriv->dm.is_any_nonbepkts) &&
+                           (!rtlpriv->dm.disable_framebursting)) ?
+                           true : false;
 
         if ((iot_peer == PEER_CISCO) &&
             (mac->mode == WIRELESS_MODE_N_24G)) {
@@ -1067,23 +1072,23 @@ static void rtl8723be_dm_check_edca_turbo(struct ieee80211_hw *hw)
         if (rtl8723be_dm_is_edca_turbo_disable(hw))
                 goto exit;
 
-        if (edca_turbo_on) {
-                if (bias_on_rx)
-                        is_cur_rdlstate = (cur_txok_cnt > cur_rxok_cnt * 4) ?
-                                          false : true;
+        if (b_edca_turbo_on) {
+                if (b_bias_on_rx)
+                        b_is_cur_rdlstate = (cur_txok_cnt > cur_rxok_cnt * 4) ?
+                                            false : true;
                 else
-                        is_cur_rdlstate = (cur_rxok_cnt > cur_txok_cnt * 4) ?
-                                          true : false;
+                        b_is_cur_rdlstate = (cur_rxok_cnt > cur_txok_cnt * 4) ?
+                                            true : false;
 
-                edca_be = (is_cur_rdlstate) ? edca_be_dl : edca_be_ul;
+                edca_be = (b_is_cur_rdlstate) ? edca_be_dl : edca_be_ul;
                 rtl_write_dword(rtlpriv, REG_EDCA_BE_PARAM, edca_be);
-                rtlpriv->dm.is_cur_rdlstate = is_cur_rdlstate;
+                rtlpriv->dm.is_cur_rdlstate = b_is_cur_rdlstate;
                 rtlpriv->dm.current_turbo_edca = true;
         } else {
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
-                                                      &tmp);
+                                                      (u8 *)(&tmp));
                 }
                 rtlpriv->dm.current_turbo_edca = false;
         }
@@ -1097,13 +1102,14 @@ exit:
 static void rtl8723be_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
         u8 cur_cck_cca_thresh;
 
         if (rtlpriv->mac80211.link_state >= MAC80211_LINKED) {
-                if (rtlpriv->dm_digtable.rssi_val_min > 25) {
+                if (dm_digtable->rssi_val_min > 25) {
                         cur_cck_cca_thresh = 0xcd;
-                } else if ((rtlpriv->dm_digtable.rssi_val_min <= 25) &&
-                           (rtlpriv->dm_digtable.rssi_val_min > 10)) {
+                } else if ((dm_digtable->rssi_val_min <= 25) &&
+                           (dm_digtable->rssi_val_min > 10)) {
                         cur_cck_cca_thresh = 0x83;
                 } else {
                         if (rtlpriv->falsealm_cnt.cnt_cck_fail > 1000)
@@ -1118,14 +1124,13 @@ static void rtl8723be_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                         cur_cck_cca_thresh = 0x40;
         }
 
-        if (rtlpriv->dm_digtable.cur_cck_cca_thres != cur_cck_cca_thresh)
+        if (dm_digtable->cur_cck_cca_thres != cur_cck_cca_thresh)
                 rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2, cur_cck_cca_thresh);
 
-        rtlpriv->dm_digtable.pre_cck_cca_thres = rtlpriv->dm_digtable.cur_cck_cca_thres;
-        rtlpriv->dm_digtable.cur_cck_cca_thres = cur_cck_cca_thresh;
+        dm_digtable->pre_cck_cca_thres = dm_digtable->cur_cck_cca_thres;
+        dm_digtable->cur_cck_cca_thres = cur_cck_cca_thresh;
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 "CCK cca thresh hold =%x\n",
-                 rtlpriv->dm_digtable.cur_cck_cca_thres);
+                 "CCK cca thresh hold =%x\n", dm_digtable->cur_cck_cca_thres);
 }
 
 static void rtl8723be_dm_dynamic_edcca(struct ieee80211_hw *hw)
@@ -1173,8 +1178,7 @@ static void rtl8723be_dm_dynamic_atc_switch(struct ieee80211_hw *hw)
                 if (rtlpriv->cfg->ops->get_btc_status()) {
                         if (!rtlpriv->btcoexist.btc_ops->btc_is_bt_disabled(rtlpriv)) {
                                 RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
-                                         "odm_DynamicATCSwitch(): Disable"
-                                         " CFO tracking for BT!!\n");
+                                         "odm_DynamicATCSwitch(): Disable CFO tracking for BT!!\n");
                                 return;
                         }
                 }
@@ -1207,9 +1211,8 @@ static void rtl8723be_dm_dynamic_atc_switch(struct ieee80211_hw *hw)
                 if (cfo_ave_diff > 20 && rtldm->large_cfo_hit == 0) {
                         rtldm->large_cfo_hit = 1;
                         return;
-                } else {
+                } else
                         rtldm->large_cfo_hit = 0;
-                }
 
                 rtldm->cfo_ave_pre = cfo_ave;
 
@@ -1263,20 +1266,20 @@ static void rtl8723be_dm_dynamic_atc_switch(struct ieee80211_hw *hw)
 static void rtl8723be_dm_common_info_self_update(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_sta_info *drv_priv;
         u8 cnt = 0;
+        struct rtl_sta_info *drv_priv;
 
         rtlpriv->dm.one_entry_only = false;
 
         if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_STATION &&
-            rtlpriv->mac80211.link_state >= MAC80211_LINKED) {
+                rtlpriv->mac80211.link_state >= MAC80211_LINKED) {
                 rtlpriv->dm.one_entry_only = true;
                 return;
         }
 
         if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP ||
-            rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC ||
-            rtlpriv->mac80211.opmode == NL80211_IFTYPE_MESH_POINT) {
+                rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC ||
+                rtlpriv->mac80211.opmode == NL80211_IFTYPE_MESH_POINT) {
                 spin_lock_bh(&rtlpriv->locks.entry_list_lock);
                 list_for_each_entry(drv_priv, &rtlpriv->entry_list, list) {
                         cnt++;
@@ -1305,8 +1308,8 @@ void rtl8723be_dm_watchdog(struct ieee80211_hw *hw)
                 fw_ps_awake = false;
 
         if ((ppsc->rfpwr_state == ERFON) &&
-            ((!fw_current_inpsmode) && fw_ps_awake) &&
-            (!ppsc->rfchange_inprogress)) {
+                ((!fw_current_inpsmode) && fw_ps_awake) &&
+                (!ppsc->rfchange_inprogress)) {
                 rtl8723be_dm_common_info_self_update(hw);
                 rtl8723be_dm_false_alarm_counter_statistics(hw);
                 rtl8723be_dm_check_rssi_monitor(hw);
@@ -1318,8 +1321,6 @@ void rtl8723be_dm_watchdog(struct ieee80211_hw *hw)
                 rtl8723be_dm_dynamic_atc_switch(hw);
                 rtl8723be_dm_check_txpower_tracking(hw);
                 rtl8723be_dm_dynamic_txpower(hw);
-                if (rtlpriv->cfg->ops->get_btc_status())
-                        rtlpriv->btcoexist.btc_ops->btc_periodical(rtlpriv);
         }
         rtlpriv->dm.dbginfo.num_qry_beacon_pkt = 0;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.h b/drivers/net/wireless/rtlwifi/rtl8723be/dm.h
index c6c2f2a78a66..e4c0e8ae6f47 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.h
@@ -141,7 +141,7 @@
 #define DM_REG_TX_CCK_BBON_11N                  0xE78
 #define DM_REG_OFDM_RFON_11N                    0xE7C
 #define DM_REG_OFDM_BBON_11N                    0xE80
-#define DM_REG_TX2RX_11N                        0xE84
+#define         DM_REG_TX2RX_11N                0xE84
 #define DM_REG_TX2TX_11N                        0xE88
 #define DM_REG_RX_CCK_11N                       0xE8C
 #define DM_REG_RX_OFDM_11N                      0xED0
@@ -202,6 +202,7 @@
 #define DM_DIG_BACKOFF_MIN                      -4
 #define DM_DIG_BACKOFF_DEFAULT                  10
 
+#define RXPATHSELECTION_SS_TH_LOW               30
 #define RXPATHSELECTION_DIFF_TH                 18
 
 #define DM_RATR_STA_INIT                        0
@@ -212,6 +213,8 @@
 #define CTS2SELF_THVAL                          30
 #define REGC38_TH                               20
 
+#define WAIOTTHVAL                              25
+
 #define TXHIGHPWRLEVEL_NORMAL                   0
 #define TXHIGHPWRLEVEL_LEVEL1                   1
 #define TXHIGHPWRLEVEL_LEVEL2                   2
@@ -231,22 +234,6 @@
 #define CFO_THRESHOLD_XTAL                      10 /* kHz */
 #define CFO_THRESHOLD_ATC                       80 /* kHz */
 
-enum FAT_STATE {
-        FAT_NORMAL_STATE        = 0,
-        FAT_TRAINING_STATE      = 1,
-};
-
-enum tag_dynamic_init_gain_operation_type_definition {
-        DIG_TYPE_THRESH_HIGH    = 0,
-        DIG_TYPE_THRESH_LOW     = 1,
-        DIG_TYPE_BACKOFF        = 2,
-        DIG_TYPE_RX_GAIN_MIN    = 3,
-        DIG_TYPE_RX_GAIN_MAX    = 4,
-        DIG_TYPE_ENABLE         = 5,
-        DIG_TYPE_DISABLE        = 6,
-        DIG_OP_TYPE_MAX
-};
-
 enum dm_1r_cca_e {
         CCA_1R          = 0,
         CCA_2R          = 1,
@@ -292,12 +279,17 @@ enum pwr_track_control_method {
 #define BT_RSSI_STATE_SPECIAL_LOW       BIT_OFFSET_LEN_MASK_32(2, 1)
 #define BT_RSSI_STATE_BG_EDCA_LOW       BIT_OFFSET_LEN_MASK_32(3, 1)
 #define BT_RSSI_STATE_TXPOWER_LOW       BIT_OFFSET_LEN_MASK_32(4, 1)
+#define GET_UNDECORATED_AVERAGE_RSSI(_priv)     \
+        ((((struct rtl_priv *)(_priv))->mac80211.opmode == \
+                NL80211_IFTYPE_ADHOC) ? \
+        (((struct rtl_priv *)(_priv))->dm.entry_min_undecoratedsmoothed_pwdb) :\
+        (((struct rtl_priv *)(_priv))->dm.undecorated_smoothed_pwdb))
 
 void rtl8723be_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw, u8 *pdesc,
                                         u32 mac_id);
 void rtl8723be_dm_ant_sel_statistics(struct ieee80211_hw *hw, u8 antsel_tr_mux,
                                      u32 mac_id, u32 rx_pwdb_all);
-void rtl8723be_dm_fast_antenna_trainning_callback(unsigned long data);
+void rtl8723be_dm_fast_antenna_training_callback(unsigned long data);
 void rtl8723be_dm_init(struct ieee80211_hw *hw);
 void rtl8723be_dm_watchdog(struct ieee80211_hw *hw);
 void rtl8723be_dm_write_dig(struct ieee80211_hw *hw, u8 current_igi);
@@ -305,6 +297,4 @@ void rtl8723be_dm_check_txpower_tracking(struct ieee80211_hw *hw);
 void rtl8723be_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw);
 void rtl8723be_dm_txpower_track_adjust(struct ieee80211_hw *hw, u8 type,
                                        u8 *pdirection, u32 *poutwrite_val);
-void rtl8723be_dm_init_edca_turbo(struct ieee80211_hw *hw);
-
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/fw.c b/drivers/net/wireless/rtlwifi/rtl8723be/fw.c
index f856be6fc138..69d4f0fc1af1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/fw.c
@@ -26,6 +26,7 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "fw.h"
@@ -55,8 +56,8 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
         bool isfw_read = false;
         u8 buf_index = 0;
         bool bwrite_sucess = false;
-        u8 wait_h2c_limit = 100;
-        u8 wait_writeh2c_limit = 100;
+        u8 wait_h2c_limmit = 100;
+        u8 wait_writeh2c_limmit = 100;
         u8 boxcontent[4], boxextcontent[4];
         u32 h2c_waitcounter = 0;
         unsigned long flag;
@@ -68,8 +69,8 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
                 spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
                 if (rtlhal->h2c_setinprogress) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "H2C set in progress! Wait to set.."
-                                 "element_id(%d).\n", element_id);
+                                 "H2C set in progress! Wait to set..element_id(%d).\n",
+                                 element_id);
 
                         while (rtlhal->h2c_setinprogress) {
                                 spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
@@ -92,14 +93,15 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
                         break;
                 }
         }
+
         while (!bwrite_sucess) {
-                wait_writeh2c_limit--;
-                if (wait_writeh2c_limit == 0) {
+                wait_writeh2c_limmit--;
+                if (wait_writeh2c_limmit == 0) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "Write H2C fail because no trigger "
-                                 "for FW INT!\n");
+                                 "Write H2C fail because no trigger for FW INT!\n");
                         break;
                 }
+
                 boxnum = rtlhal->last_hmeboxnum;
                 switch (boxnum) {
                 case 0:
@@ -120,39 +122,43 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "switch case not processed\n");
+                                 "switch case not process\n");
                         break;
                 }
+
                 isfw_read = _rtl8723be_check_fw_read_last_h2c(hw, boxnum);
                 while (!isfw_read) {
-                        wait_h2c_limit--;
-                        if (wait_h2c_limit == 0) {
+                        wait_h2c_limmit--;
+                        if (wait_h2c_limmit == 0) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         "Wating too long for FW read "
-                                         "clear HMEBox(%d)!\n", boxnum);
+                                         "Waiting too long for FW read clear HMEBox(%d)!\n",
+                                         boxnum);
                                 break;
                         }
+
                         udelay(10);
 
                         isfw_read = _rtl8723be_check_fw_read_last_h2c(hw,
                                                                 boxnum);
                         u1b_tmp = rtl_read_byte(rtlpriv, 0x130);
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "Wating for FW read clear HMEBox(%d)!!! 0x130 = %2x\n",
+                                 "Waiting for FW read clear HMEBox(%d)!!! 0x130 = %2x\n",
                                  boxnum, u1b_tmp);
                 }
+
                 if (!isfw_read) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 "Write H2C register BOX[%d] fail!!!!! "
-                                 "Fw do not read.\n", boxnum);
+                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
+                                 boxnum);
                         break;
                 }
+
                 memset(boxcontent, 0, sizeof(boxcontent));
                 memset(boxextcontent, 0, sizeof(boxextcontent));
                 boxcontent[0] = element_id;
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                          "Write element_id box_reg(%4x) = %2x\n",
-                         box_reg, element_id);
+                          box_reg, element_id);
 
                 switch (cmd_len) {
                 case 1:
@@ -181,6 +187,7 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
                                 rtl_write_byte(rtlpriv, box_extreg + idx,
                                                boxextcontent[idx]);
                         }
+
                         for (idx = 0; idx < 4; idx++) {
                                 rtl_write_byte(rtlpriv, box_reg + idx,
                                                boxcontent[idx]);
@@ -191,6 +198,7 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
                                  "switch case not process\n");
                         break;
                 }
+
                 bwrite_sucess = true;
 
                 rtlhal->last_hmeboxnum = boxnum + 1;
@@ -199,8 +207,9 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
 
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                          "pHalData->last_hmeboxnum  = %d\n",
-                         rtlhal->last_hmeboxnum);
+                          rtlhal->last_hmeboxnum);
         }
+
         spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
         rtlhal->h2c_setinprogress = false;
         spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
@@ -219,6 +228,7 @@ void rtl8723be_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
                           "return H2C cmd because of Fw download fail!!!\n");
                 return;
         }
+
         memset(tmp_cmdbuf, 0, 8);
         memcpy(tmp_cmdbuf, p_cmdbuffer, cmd_len);
         _rtl8723be_fill_h2c_command(hw, element_id, cmd_len,
@@ -229,17 +239,17 @@ void rtl8723be_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
 void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 u1_h2c_set_pwrmode[H2C_8723BE_PWEMODE_LENGTH] = { 0 };
+        u8 u1_h2c_set_pwrmode[H2C_PWEMODE_LENGTH] = { 0 };
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         u8 rlbm, power_state = 0;
         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
         SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));
-        rlbm = 0;/*YJ, temp, 120316. FW now not support RLBM = 2.*/
+        rlbm = 0;/*YJ,temp,120316. FW now not support RLBM=2.*/
         SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, rlbm);
         SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
                                          (rtlpriv->mac80211.p2p) ?
-                                         ppsc->smart_ps : 1);
+                                          ppsc->smart_ps : 1);
         SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(u1_h2c_set_pwrmode,
                                                ppsc->reg_max_lps_awakeintvl);
         SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(u1_h2c_set_pwrmode, 0);
@@ -251,44 +261,26 @@ void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                       "rtl92c_set_fw_pwrmode(): u1_h2c_set_pwrmode\n",
-                      u1_h2c_set_pwrmode, H2C_8723BE_PWEMODE_LENGTH);
-        rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_SETPWRMODE,
-                               H2C_8723BE_PWEMODE_LENGTH,
+                      u1_h2c_set_pwrmode, H2C_PWEMODE_LENGTH);
+        rtl8723be_fill_h2c_cmd(hw, H2C_8723B_SETPWRMODE, H2C_PWEMODE_LENGTH,
                                u1_h2c_set_pwrmode);
 }
 
-static bool _rtl8723be_cmd_send_packet(struct ieee80211_hw *hw,
-                                       struct sk_buff *skb)
+void rtl8723be_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw, u8 mstatus)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        struct rtl8192_tx_ring *ring;
-        struct rtl_tx_desc *pdesc;
-        struct sk_buff *pskb = NULL;
-        u8 own;
-        unsigned long flags;
-
-        ring = &rtlpci->tx_ring[BEACON_QUEUE];
-
-        pskb = __skb_dequeue(&ring->queue);
-        if (pskb)
-                kfree_skb(pskb);
-
-        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
-
-        pdesc = &ring->desc[0];
-        own = (u8) rtlpriv->cfg->ops->get_desc((u8 *)pdesc, true, HW_DESC_OWN);
-
-        rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *)pdesc, 1, 1, skb);
-
-        __skb_queue_tail(&ring->queue, skb);
-
-        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-
-        rtlpriv->cfg->ops->tx_polling(hw, BEACON_QUEUE);
-
-        return true;
+        u8 parm[3] = { 0, 0, 0 };
+        /* parm[0]: bit0=0-->Disconnect, bit0=1-->Connect
+         *          bit1=0-->update Media Status to MACID
+         *          bit1=1-->update Media Status from MACID to MACID_End
+         * parm[1]: MACID, if this is INFRA_STA, MacID = 0
+         * parm[2]: MACID_End
+        */
+        SET_H2CCMD_MSRRPT_PARM_OPMODE(parm, mstatus);
+        SET_H2CCMD_MSRRPT_PARM_MACID_IND(parm, 0);
+
+        rtl8723be_fill_h2c_cmd(hw, H2C_8723B_MSRRPT, 3, parm);
 }
+
 #define BEACON_PG               0 /* ->1 */
 #define PSPOLL_PG               2
 #define NULL_PG                 3
@@ -407,7 +399,7 @@ static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = {
 };
 
 void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
-                                  bool dl_finished)
+                                  bool b_dl_finished)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -416,7 +408,7 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         u32 totalpacketlen;
         bool rtstatus;
         u8 u1rsvdpageloc[5] = { 0 };
-        bool dlok = false;
+        bool b_dlok = false;
 
         u8 *beacon;
         u8 *p_pspoll;
@@ -466,43 +458,40 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
         totalpacketlen = TOTAL_RESERVED_PKT_LEN;
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "rtl8723be_set_fw_rsvdpagepkt(): "
-                      "HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl8723be_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl8723be_set_fw_rsvdpagepkt(): "
-                      "HW_VAR_SET_TX_CMD: ALL\n", u1rsvdpageloc, 3);
-
+                      "rtl8723be_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      u1rsvdpageloc, 3);
 
         skb = dev_alloc_skb(totalpacketlen);
         memcpy((u8 *)skb_put(skb, totalpacketlen),
                &reserved_page_packet, totalpacketlen);
 
-        rtstatus = _rtl8723be_cmd_send_packet(hw, skb);
+        rtstatus = rtl_cmd_send_packet(hw, skb);
 
         if (rtstatus)
-                dlok = true;
+                b_dlok = true;
 
-        if (dlok) {
+        if (b_dlok) {
                 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, 3);
-                rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_RSVDPAGE,
+                rtl8723be_fill_h2c_cmd(hw, H2C_8723B_RSVDPAGE,
                                        sizeof(u1rsvdpageloc), u1rsvdpageloc);
-        } else {
+        } else
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Set RSVD page location to Fw FAIL!!!!!!.\n");
-        }
 }
 
 /*Should check FW support p2p or not.*/
 static void rtl8723be_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw,
                                              u8 ctwindow)
 {
-        u8 u1_ctwindow_period[1] = {ctwindow};
+        u8 u1_ctwindow_period[1] = { ctwindow};
 
-        rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_P2P_PS_CTW_CMD, 1,
+        rtl8723be_fill_h2c_cmd(hw, H2C_8723B_P2P_PS_CTW_CMD, 1,
                                u1_ctwindow_period);
 }
 
@@ -521,7 +510,7 @@ void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw,
         switch (p2p_ps_state) {
         case P2P_PS_DISABLE:
                 RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
-                memset(p2p_ps_offload, 0, sizeof(struct p2p_ps_offload_t));
+                memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));
                 break;
         case P2P_PS_ENABLE:
                 RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
@@ -532,7 +521,7 @@ void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw,
                         rtl8723be_set_p2p_ctw_period_cmd(hw, ctwindow);
                 }
                 /* hw only support 2 set of NoA */
-                for (i = 0; i < p2pinfo->noa_num; i++) {
+                for (i = 0 ; i < p2pinfo->noa_num ; i++) {
                         /* To control the register setting
                          * for which NOA
                          */
@@ -563,6 +552,7 @@ void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw,
                         rtl_write_dword(rtlpriv, 0x5EC,
                                         p2pinfo->noa_count_type[i]);
                 }
+
                 if ((p2pinfo->opp_ps == 1) ||
                     (p2pinfo->noa_num > 0)) {
                         /* rst p2p circuit */
@@ -591,30 +581,60 @@ void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw,
         default:
                 break;
         }
-        rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_P2P_PS_OFFLOAD, 1,
+
+        rtl8723be_fill_h2c_cmd(hw, H2C_8723B_P2P_PS_OFFLOAD, 1,
                                (u8 *)p2p_ps_offload);
 }
 
-void rtl8723be_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
+static void _rtl8723be_c2h_content_parsing(struct ieee80211_hw *hw,
+                                           u8 c2h_cmd_id,
+                                           u8 c2h_cmd_len, u8 *tmp_buf)
 {
-        u8 u1_joinbssrpt_parm[1] = { 0 };
-
-        SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(u1_joinbssrpt_parm, mstatus);
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_JOINBSSRPT, 1,
-                               u1_joinbssrpt_parm);
+        switch (c2h_cmd_id) {
+        case C2H_8723B_DBG:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], C2H_8723BE_DBG!!\n");
+                break;
+        case C2H_8723B_TX_REPORT:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], C2H_8723BE_TX_REPORT!\n");
+                break;
+        case C2H_8723B_BT_INFO:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], C2H_8723BE_BT_INFO!!\n");
+                rtlpriv->btcoexist.btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,
+                                                              c2h_cmd_len);
+                break;
+        case C2H_8723B_BT_MP:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], C2H_8723BE_BT_MP!!\n");
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                         "[C2H], Unkown packet!! CmdId(%#X)!\n", c2h_cmd_id);
+                break;
+        }
 }
 
-void rtl8723be_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,
-                                      u8 ap_offload_enable)
+void rtl8723be_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len)
 {
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        u8 u1_apoffload_parm[H2C_8723BE_AP_OFFLOAD_LENGTH] = { 0 };
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 c2h_cmd_id = 0, c2h_cmd_seq = 0, c2h_cmd_len = 0;
+        u8 *tmp_buf = NULL;
+
+        c2h_cmd_id = buffer[0];
+        c2h_cmd_seq = buffer[1];
+        c2h_cmd_len = len - 2;
+        tmp_buf = buffer + 2;
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                 "[C2H packet], c2hCmdId=0x%x, c2hCmdSeq=0x%x, c2hCmdLen=%d\n",
+                 c2h_cmd_id, c2h_cmd_seq, c2h_cmd_len);
 
-        SET_H2CCMD_AP_OFFLOAD_ON(u1_apoffload_parm, ap_offload_enable);
-        SET_H2CCMD_AP_OFFLOAD_HIDDEN(u1_apoffload_parm, mac->hiddenssid);
-        SET_H2CCMD_AP_OFFLOAD_DENYANY(u1_apoffload_parm, 0);
+        RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_TRACE,
+                      "[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);
 
-        rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_AP_OFFLOAD,
-                               H2C_8723BE_AP_OFFLOAD_LENGTH, u1_apoffload_parm);
+        _rtl8723be_c2h_content_parsing(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/fw.h b/drivers/net/wireless/rtlwifi/rtl8723be/fw.h
index 31eec281e446..067429669bda 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/fw.h
@@ -30,50 +30,23 @@
 #define FW_8192C_END_ADDRESS                    0x5FFF
 #define FW_8192C_PAGE_SIZE                      4096
 #define FW_8192C_POLLING_DELAY                  5
-#define FW_8192C_POLLING_TIMEOUT_COUNT          6000
 
-#define IS_FW_HEADER_EXIST(_pfwhdr)     \
-        ((_pfwhdr->signature&0xFFF0) == 0x5300)
 #define USE_OLD_WOWLAN_DEBUG_FW                 0
 
-#define H2C_8723BE_RSVDPAGE_LOC_LEN             5
-#define H2C_8723BE_PWEMODE_LENGTH               5
-#define H2C_8723BE_JOINBSSRPT_LENGTH            1
-#define H2C_8723BE_AP_OFFLOAD_LENGTH            3
-#define H2C_8723BE_WOWLAN_LENGTH                3
-#define H2C_8723BE_KEEP_ALIVE_CTRL_LENGTH       3
-#if (USE_OLD_WOWLAN_DEBUG_FW == 0)
-#define H2C_8723BE_REMOTE_WAKE_CTRL_LEN         1
-#else
-#define H2C_8723BE_REMOTE_WAKE_CTRL_LEN         3
-#endif
-#define H2C_8723BE_AOAC_GLOBAL_INFO_LEN         2
-#define H2C_8723BE_AOAC_RSVDPAGE_LOC_LEN        7
-
+#define H2C_PWEMODE_LENGTH                      5
 
 /* Fw PS state for RPWM.
 *BIT[2:0] = HW state
 *BIT[3] = Protocol PS state, 1: register active state , 0: register sleep state
 *BIT[4] = sub-state
 */
-#define FW_PS_GO_ON             BIT(0)
-#define FW_PS_TX_NULL           BIT(1)
 #define FW_PS_RF_ON             BIT(2)
 #define FW_PS_REGISTER_ACTIVE   BIT(3)
 
-#define FW_PS_DPS               BIT(0)
-#define FW_PS_LCLK              (FW_PS_DPS)
-#define FW_PS_RF_OFF            BIT(1)
-#define FW_PS_ALL_ON            BIT(2)
-#define FW_PS_ST_ACTIVE BIT(3)
-#define FW_PS_ISR_ENABLE        BIT(4)
-#define FW_PS_IMR_ENABLE        BIT(5)
-
-
 #define FW_PS_ACK               BIT(6)
 #define FW_PS_TOGGLE            BIT(7)
 
- /* 88E RPWM value*/
+ /* 8723BE RPWM value*/
  /* BIT[0] = 1: 32k, 0: 40M*/
 #define FW_PS_CLOCK_OFF         BIT(0)          /* 32k*/
 #define FW_PS_CLOCK_ON          0               /*40M*/
@@ -83,75 +56,61 @@
 /*ISR_ENABLE, IMR_ENABLE, and PS mode should be inherited.*/
 #define FW_PS_STATE_INT_MASK    (0x3F)
 
-#define FW_PS_STATE(x)  (FW_PS_STATE_MASK & (x))
-#define FW_PS_STATE_HW(x)       (FW_PS_STATE_HW_MASK & (x))
-#define FW_PS_STATE_INT(x)      (FW_PS_STATE_INT_MASK & (x))
-#define FW_PS_ISR_VAL(x)        ((x) & 0x70)
-#define FW_PS_IMR_MASK(x)       ((x) & 0xDF)
-#define FW_PS_KEEP_IMR(x)       ((x) & 0x20)
-
-
-#define FW_PS_STATE_S0          (FW_PS_DPS)
-#define FW_PS_STATE_S1          (FW_PS_LCLK)
-#define FW_PS_STATE_S2          (FW_PS_RF_OFF)
-#define FW_PS_STATE_S3          (FW_PS_ALL_ON)
-#define FW_PS_STATE_S4          ((FW_PS_ST_ACTIVE) | (FW_PS_ALL_ON))
+#define FW_PS_STATE(x)          (FW_PS_STATE_MASK & (x))
 
 /* ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))*/
-#define FW_PS_STATE_ALL_ON_88E  (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_ALL_ON      (FW_PS_CLOCK_ON)
 /* (FW_PS_RF_ON)*/
-#define FW_PS_STATE_RF_ON_88E   (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_RF_ON       (FW_PS_CLOCK_ON)
 /* 0x0*/
-#define FW_PS_STATE_RF_OFF_88E  (FW_PS_CLOCK_ON)
+#define FW_PS_STATE_RF_OFF      (FW_PS_CLOCK_ON)
 /* (FW_PS_STATE_RF_OFF)*/
-#define FW_PS_STATE_RF_OFF_LOW_PWR_88E  (FW_PS_CLOCK_OFF)
+#define FW_PS_STATE_RF_OFF_LOW_PWR      (FW_PS_CLOCK_OFF)
 
-#define FW_PS_STATE_ALL_ON_92C  (FW_PS_STATE_S4)
-#define FW_PS_STATE_RF_ON_92C           (FW_PS_STATE_S3)
-#define FW_PS_STATE_RF_OFF_92C  (FW_PS_STATE_S2)
-#define FW_PS_STATE_RF_OFF_LOW_PWR_92C  (FW_PS_STATE_S1)
 
-
-/* For 88E H2C PwrMode Cmd ID 5.*/
+/* For 8723BE H2C PwrMode Cmd ID 5.*/
 #define FW_PWR_STATE_ACTIVE     ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
 #define FW_PWR_STATE_RF_OFF     0
 
-#define FW_PS_IS_ACK(x) ((x) & FW_PS_ACK)
-#define FW_PS_IS_CLK_ON(x)      ((x) & (FW_PS_RF_OFF | FW_PS_ALL_ON))
-#define FW_PS_IS_RF_ON(x)       ((x) & (FW_PS_ALL_ON))
-#define FW_PS_IS_ACTIVE(x)      ((x) & (FW_PS_ST_ACTIVE))
-#define FW_PS_IS_CPWM_INT(x)    ((x) & 0x40)
-
-#define FW_CLR_PS_STATE(x)      ((x) = ((x) & (0xF0)))
+#define FW_PS_IS_ACK(x)         ((x) & FW_PS_ACK)
 
-#define IS_IN_LOW_POWER_STATE_88E(fwpsstate)            \
-                        (FW_PS_STATE(fwpsstate) == FW_PS_CLOCK_OFF)
+#define IS_IN_LOW_POWER_STATE(__fwpsstate)      \
+        (FW_PS_STATE(__fwpsstate) == FW_PS_CLOCK_OFF)
 
 #define FW_PWR_STATE_ACTIVE     ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
 #define FW_PWR_STATE_RF_OFF     0
 
-#define pagenum_128(_len)       (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))
-
-#define SET_88E_H2CCMD_WOWLAN_FUNC_ENABLE(__ph2ccmd, __val)             \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 1, __val)
-#define SET_88E_H2CCMD_WOWLAN_PATTERN_MATCH_ENABLE(__ph2ccmd, __val)    \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 1, 1, __val)
-#define SET_88E_H2CCMD_WOWLAN_MAGIC_PKT_ENABLE(__ph2ccmd, __val)        \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 2, 1, __val)
-#define SET_88E_H2CCMD_WOWLAN_UNICAST_PKT_ENABLE(__ph2ccmd, __val)      \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 3, 1, __val)
-#define SET_88E_H2CCMD_WOWLAN_ALL_PKT_DROP(__ph2ccmd, __val)            \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 4, 1, __val)
-#define SET_88E_H2CCMD_WOWLAN_GPIO_ACTIVE(__ph2ccmd, __val)             \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 5, 1, __val)
-#define SET_88E_H2CCMD_WOWLAN_REKEY_WAKE_UP(__ph2ccmd, __val)           \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 6, 1, __val)
-#define SET_88E_H2CCMD_WOWLAN_DISCONNECT_WAKE_UP(__ph2ccmd, __val)      \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 7, 1, __val)
-#define SET_88E_H2CCMD_WOWLAN_GPIONUM(__ph2ccmd, __val)                 \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
-#define SET_88E_H2CCMD_WOWLAN_GPIO_DURATION(__ph2ccmd, __val)           \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
+enum rtl8723b_h2c_cmd {
+        H2C_8723B_RSVDPAGE = 0,
+        H2C_8723B_MSRRPT = 1,
+        H2C_8723B_SCAN = 2,
+        H2C_8723B_KEEP_ALIVE_CTRL = 3,
+        H2C_8723B_DISCONNECT_DECISION = 4,
+        H2C_8723B_BCN_RSVDPAGE = 9,
+        H2C_8723B_PROBERSP_RSVDPAGE = 10,
+
+        H2C_8723B_SETPWRMODE = 0x20,
+        H2C_8723B_PS_LPS_PARA = 0x23,
+        H2C_8723B_P2P_PS_OFFLOAD = 0x24,
+
+        H2C_8723B_RA_MASK = 0x40,
+        H2C_RSSIBE_REPORT = 0x42,
+        /*Not defined CTW CMD for P2P yet*/
+        H2C_8723B_P2P_PS_CTW_CMD,
+        MAX_8723B_H2CCMD
+};
+
+enum rtl8723b_c2h_evt {
+        C2H_8723B_DBG = 0,
+        C2H_8723B_LB = 1,
+        C2H_8723B_TXBF = 2,
+        C2H_8723B_TX_REPORT = 3,
+        C2H_8723B_BT_INFO = 9,
+        C2H_8723B_BT_MP = 11,
+        MAX_8723B_C2HEVENT
+};
+
+#define pagenum_128(_len) (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))
 
 
 #define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val)                  \
@@ -169,8 +128,11 @@
 #define GET_88E_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd)                     \
         LE_BITS_TO_1BYTE(__ph2ccmd, 0, 8)
 
-#define SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(__ph2ccmd, __val)             \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_MSRRPT_PARM_OPMODE(__ph2ccmd, __val)         \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 1, __val)
+#define SET_H2CCMD_MSRRPT_PARM_MACID_IND(__ph2ccmd, __val)      \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 1, 1, __val)
+
 #define SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(__ph2ccmd, __val)             \
         SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
 #define SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(__ph2ccmd, __val)                \
@@ -178,71 +140,13 @@
 #define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val)             \
         SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
 
-/* AP_OFFLOAD */
-#define SET_H2CCMD_AP_OFFLOAD_ON(__ph2ccmd, __val)                      \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
-#define SET_H2CCMD_AP_OFFLOAD_HIDDEN(__ph2ccmd, __val)                  \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
-#define SET_H2CCMD_AP_OFFLOAD_DENYANY(__ph2ccmd, __val)                 \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
-#define SET_H2CCMD_AP_OFFLOAD_WAKEUP_EVT_RPT(__ph2ccmd, __val)          \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+3, 0, 8, __val)
 
-/* Keep Alive Control*/
-#define SET_88E_H2CCMD_KEEP_ALIVE_ENABLE(__ph2ccmd, __val)              \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 1, __val)
-#define SET_88E_H2CCMD_KEEP_ALIVE_ACCPEPT_USER_DEFINED(__ph2ccmd, __val)\
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 1, 1, __val)
-#define SET_88E_H2CCMD_KEEP_ALIVE_PERIOD(__ph2ccmd, __val)              \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
-
-/*REMOTE_WAKE_CTRL */
-#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_EN(__ph2ccmd, __val)            \
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 1, __val)
-#if (USE_OLD_WOWLAN_DEBUG_FW == 0)
-#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_ARP_OFFLOAD_EN(__ph2ccmd, __val)\
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 1, 1, __val)
-#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_NDP_OFFLOAD_EN(__ph2ccmd, __val)\
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 2, 1, __val)
-#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_GTK_OFFLOAD_EN(__ph2ccmd, __val)\
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 3, 1, __val)
-#else
-#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_PAIRWISE_ENC_ALG(__ph2ccmd, __val)\
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
-#define SET_88E_H2CCMD_REMOTE_WAKE_CTRL_GROUP_ENC_ALG(__ph2ccmd, __val) \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
-#endif
-
-/* GTK_OFFLOAD */
-#define SET_88E_H2CCMD_AOAC_GLOBAL_INFO_PAIRWISE_ENC_ALG(__ph2ccmd, __val)\
-        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
-#define SET_88E_H2CCMD_AOAC_GLOBAL_INFO_GROUP_ENC_ALG(__ph2ccmd, __val) \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
-
-/* AOAC_RSVDPAGE_LOC */
-#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_REM_WAKE_CTRL_INFO(__ph2ccmd, __val)\
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd), 0, 8, __val)
-#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(__ph2ccmd, __val)      \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
-#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_NEIGHBOR_ADV(__ph2ccmd, __val) \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
-#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_RSP(__ph2ccmd, __val)      \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+3, 0, 8, __val)
-#define SET_88E_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_INFO(__ph2ccmd, __val)     \
-        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+4, 0, 8, __val)
-
-void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
-void rtl8723be_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,
-                                      u8 ap_offload_enable);
 void rtl8723be_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
                             u32 cmd_len, u8 *p_cmdbuffer);
-void rtl8723be_firmware_selfreset(struct ieee80211_hw *hw);
-void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
-                                  bool dl_finished);
-void rtl8723be_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);
-int rtl8723be_download_fw(struct ieee80211_hw *hw,
-                          bool buse_wake_on_wlan_fw);
-void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw,
-                                      u8 p2p_ps_state);
+void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
+void rtl8723be_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw, u8 mstatus);
+void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
+void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
+void rtl8723be_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
index 3cd286930fe0..6dad28e77bbb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
@@ -33,12 +33,14 @@
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
+#include "../rtl8723com/phy_common.h"
 #include "dm.h"
 #include "../rtl8723com/dm_common.h"
 #include "fw.h"
 #include "../rtl8723com/fw_common.h"
 #include "led.h"
 #include "hw.h"
+#include "../pwrseqcmd.h"
 #include "pwrseq.h"
 #include "../btcoexist/rtl_btc.h"
 
@@ -49,7 +51,9 @@ static void _rtl8723be_return_beacon_queue_skb(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE];
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
         while (skb_queue_len(&ring->queue)) {
                 struct rtl_tx_desc *entry = &ring->desc[ring->idx];
                 struct sk_buff *skb = __skb_dequeue(&ring->queue);
@@ -61,6 +65,7 @@ static void _rtl8723be_return_beacon_queue_skb(struct ieee80211_hw *hw)
                 kfree_skb(skb);
                 ring->idx = (ring->idx + 1) % ring->entries;
         }
+        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
 }
 
 static void _rtl8723be_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
@@ -72,7 +77,7 @@ static void _rtl8723be_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
         rtlpci->reg_bcn_ctrl_val |= set_bits;
         rtlpci->reg_bcn_ctrl_val &= ~clear_bits;
 
-        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8) rtlpci->reg_bcn_ctrl_val);
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8)rtlpci->reg_bcn_ctrl_val);
 }
 
 static void _rtl8723be_stop_tx_beacon(struct ieee80211_hw *hw)
@@ -112,15 +117,15 @@ static void _rtl8723be_disable_bcn_sub_func(struct ieee80211_hw *hw)
 }
 
 static void _rtl8723be_set_fw_clock_on(struct ieee80211_hw *hw, u8 rpwm_val,
-                                       bool need_turn_off_ckk)
+                                       bool b_need_turn_off_ckk)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        bool support_remote_wake_up;
+        bool b_support_remote_wake_up;
         u32 count = 0, isr_regaddr, content;
-        bool schedule_timer = need_turn_off_ckk;
+        bool b_schedule_timer = b_need_turn_off_ckk;
         rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
-                                      (u8 *)(&support_remote_wake_up));
+                                      (u8 *)(&b_support_remote_wake_up));
 
         if (!rtlhal->fw_ready)
                 return;
@@ -145,9 +150,10 @@ static void _rtl8723be_set_fw_clock_on(struct ieee80211_hw *hw, u8 rpwm_val,
                         break;
                 }
         }
-        if (IS_IN_LOW_POWER_STATE_88E(rtlhal->fw_ps_state)) {
+
+        if (IS_IN_LOW_POWER_STATE(rtlhal->fw_ps_state)) {
                 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM,
-                                              &rpwm_val);
+                                              (u8 *)(&rpwm_val));
                 if (FW_PS_IS_ACK(rpwm_val)) {
                         isr_regaddr = REG_HISR;
                         content = rtl_read_dword(rtlpriv, isr_regaddr);
@@ -159,20 +165,19 @@ static void _rtl8723be_set_fw_clock_on(struct ieee80211_hw *hw, u8 rpwm_val,
 
                         if (content & IMR_CPWM) {
                                 rtl_write_word(rtlpriv, isr_regaddr, 0x0100);
-                                rtlhal->fw_ps_state = FW_PS_STATE_RF_ON_88E;
+                                rtlhal->fw_ps_state = FW_PS_STATE_RF_ON;
                                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                         "Receive CPWM INT!!! Set "
-                                         "pHalData->FwPSState = %X\n",
+                                         "Receive CPWM INT!!! Set pHalData->FwPSState = %X\n",
                                          rtlhal->fw_ps_state);
                         }
                 }
+
                 spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
                 rtlhal->fw_clk_change_in_progress = false;
                 spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
-                if (schedule_timer) {
+                if (b_schedule_timer)
                         mod_timer(&rtlpriv->works.fw_clockoff_timer,
                                   jiffies + MSECS(10));
-                }
         } else  {
                 spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
                 rtlhal->fw_clk_change_in_progress = false;
@@ -187,7 +192,7 @@ static void _rtl8723be_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val)
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl8192_tx_ring *ring;
         enum rf_pwrstate rtstate;
-        bool schedule_timer = false;
+        bool b_schedule_timer = false;
         u8 queue;
 
         if (!rtlhal->fw_ready)
@@ -203,17 +208,18 @@ static void _rtl8723be_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val)
         for (queue = 0; queue < RTL_PCI_MAX_TX_QUEUE_COUNT; queue++) {
                 ring = &rtlpci->tx_ring[queue];
                 if (skb_queue_len(&ring->queue)) {
-                        schedule_timer = true;
+                        b_schedule_timer = true;
                         break;
                 }
         }
-        if (schedule_timer) {
+
+        if (b_schedule_timer) {
                 mod_timer(&rtlpriv->works.fw_clockoff_timer,
                           jiffies + MSECS(10));
                 return;
         }
-        if (FW_PS_STATE(rtlhal->fw_ps_state) !=
-            FW_PS_STATE_RF_OFF_LOW_PWR_88E) {
+
+        if (FW_PS_STATE(rtlhal->fw_ps_state) != FW_PS_STATE_RF_OFF_LOW_PWR) {
                 spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
                 if (!rtlhal->fw_clk_change_in_progress) {
                         rtlhal->fw_clk_change_in_progress = true;
@@ -221,7 +227,7 @@ static void _rtl8723be_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val)
                         rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val);
                         rtl_write_word(rtlpriv, REG_HISR, 0x0100);
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
-                                                      &rpwm_val);
+                                                      (u8 *)(&rpwm_val));
                         spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
                         rtlhal->fw_clk_change_in_progress = false;
                         spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
@@ -231,12 +237,13 @@ static void _rtl8723be_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val)
                                   jiffies + MSECS(10));
                 }
         }
+
 }
 
 static void _rtl8723be_set_fw_ps_rf_on(struct ieee80211_hw *hw)
 {
         u8 rpwm_val = 0;
-        rpwm_val |= (FW_PS_STATE_RF_OFF_88E | FW_PS_ACK);
+        rpwm_val |= (FW_PS_STATE_RF_OFF | FW_PS_ACK);
         _rtl8723be_set_fw_clock_on(hw, rpwm_val, true);
 }
 
@@ -249,21 +256,23 @@ static void _rtl8723be_fwlps_leave(struct ieee80211_hw *hw)
         u8 rpwm_val = 0, fw_pwrmode = FW_PS_ACTIVE_MODE;
 
         if (ppsc->low_power_enable) {
-                rpwm_val = (FW_PS_STATE_ALL_ON_88E | FW_PS_ACK);/* RF on */
+                rpwm_val = (FW_PS_STATE_ALL_ON | FW_PS_ACK);/* RF on */
                 _rtl8723be_set_fw_clock_on(hw, rpwm_val, false);
                 rtlhal->allow_sw_to_change_hwclc = false;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
-                                              &fw_pwrmode);
+                                              (u8 *)(&fw_pwrmode));
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
                                               (u8 *)(&fw_current_inps));
         } else {
-                rpwm_val = FW_PS_STATE_ALL_ON_88E;      /* RF on */
-                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val);
+                rpwm_val = FW_PS_STATE_ALL_ON;  /* RF on */
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                              (u8 *)(&rpwm_val));
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
-                                              &fw_pwrmode);
+                                              (u8 *)(&fw_pwrmode));
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
                                               (u8 *)(&fw_current_inps));
         }
+
 }
 
 static void _rtl8723be_fwlps_enter(struct ieee80211_hw *hw)
@@ -275,22 +284,23 @@ static void _rtl8723be_fwlps_enter(struct ieee80211_hw *hw)
         u8 rpwm_val;
 
         if (ppsc->low_power_enable) {
-                rpwm_val = FW_PS_STATE_RF_OFF_LOW_PWR_88E;      /* RF off */
+                rpwm_val = FW_PS_STATE_RF_OFF_LOW_PWR;  /* RF off */
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
                                               (u8 *)(&fw_current_inps));
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
-                                              &ppsc->fwctrl_psmode);
+                                              (u8 *)(&ppsc->fwctrl_psmode));
                 rtlhal->allow_sw_to_change_hwclc = true;
                 _rtl8723be_set_fw_clock_off(hw, rpwm_val);
-
         } else {
-                rpwm_val = FW_PS_STATE_RF_OFF_88E;      /* RF off */
+                rpwm_val = FW_PS_STATE_RF_OFF;  /* RF off */
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
                                               (u8 *)(&fw_current_inps));
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
-                                              &ppsc->fwctrl_psmode);
-                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val);
+                                              (u8 *)(&ppsc->fwctrl_psmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                              (u8 *)(&rpwm_val));
         }
+
 }
 
 void rtl8723be_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
@@ -306,13 +316,13 @@ void rtl8723be_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_RF_STATE:
                 *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
                 break;
-        case HW_VAR_FWLPS_RF_ON: {
-                enum rf_pwrstate rfstate;
+        case HW_VAR_FWLPS_RF_ON:{
+                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);
@@ -322,11 +332,12 @@ void rtl8723be_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         else
                                 *((bool *)(val)) = true;
                 }
-                break; }
+                }
+                break;
         case HW_VAR_FW_PSMODE_STATUS:
                 *((bool *)(val)) = ppsc->fw_current_inpsmode;
                 break;
-        case HW_VAR_CORRECT_TSF: {
+        case HW_VAR_CORRECT_TSF:{
                 u64 tsf;
                 u32 *ptsf_low = (u32 *)&tsf;
                 u32 *ptsf_high = ((u32 *)&tsf) + 1;
@@ -335,15 +346,65 @@ void rtl8723be_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 *ptsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
 
                 *((u64 *)(val)) = tsf;
-
-                break; }
+                }
+                break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                          "switch case not process %x\n", variable);
                 break;
         }
 }
 
+static void _rtl8723be_download_rsvd_page(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp_regcr, tmp_reg422, bcnvalid_reg;
+        u8 count = 0, dlbcn_count = 0;
+        bool b_recover = false;
+
+        tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
+        rtl_write_byte(rtlpriv, REG_CR + 1,
+                       (tmp_regcr | BIT(0)));
+
+        _rtl8723be_set_bcn_ctrl_reg(hw, 0, BIT(3));
+        _rtl8723be_set_bcn_ctrl_reg(hw, BIT(4), 0);
+
+        tmp_reg422 = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp_reg422 & (~BIT(6)));
+        if (tmp_reg422 & BIT(6))
+                b_recover = true;
+
+        do {
+                bcnvalid_reg = rtl_read_byte(rtlpriv, REG_TDECTRL + 2);
+                rtl_write_byte(rtlpriv, REG_TDECTRL + 2,
+                               (bcnvalid_reg | BIT(0)));
+                _rtl8723be_return_beacon_queue_skb(hw);
+
+                rtl8723be_set_fw_rsvdpagepkt(hw, 0);
+                bcnvalid_reg = rtl_read_byte(rtlpriv, REG_TDECTRL + 2);
+                count = 0;
+                while (!(bcnvalid_reg & BIT(0)) && count < 20) {
+                        count++;
+                        udelay(10);
+                        bcnvalid_reg = rtl_read_byte(rtlpriv,
+                                                     REG_TDECTRL + 2);
+                }
+                dlbcn_count++;
+        } while (!(bcnvalid_reg & BIT(0)) && dlbcn_count < 5);
+
+        if (bcnvalid_reg & BIT(0))
+                rtl_write_byte(rtlpriv, REG_TDECTRL + 2, BIT(0));
+
+        _rtl8723be_set_bcn_ctrl_reg(hw, BIT(3), 0);
+        _rtl8723be_set_bcn_ctrl_reg(hw, 0, BIT(4));
+
+        if (b_recover)
+                rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp_reg422);
+
+        tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
+        rtl_write_byte(rtlpriv, REG_CR + 1, (tmp_regcr & ~(BIT(0))));
+}
+
 void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -358,22 +419,24 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 for (idx = 0; idx < ETH_ALEN; idx++)
                         rtl_write_byte(rtlpriv, (REG_MACID + idx), val[idx]);
                 break;
-        case HW_VAR_BASIC_RATE: {
-                u16 rate_cfg = ((u16 *)val)[0];
+        case HW_VAR_BASIC_RATE:{
+                u16 b_rate_cfg = ((u16 *)val)[0];
                 u8 rate_index = 0;
-                rate_cfg = rate_cfg & 0x15f;
-                rate_cfg |= 0x01;
-                rtl_write_byte(rtlpriv, REG_RRSR, rate_cfg & 0xff);
-                rtl_write_byte(rtlpriv, REG_RRSR + 1, (rate_cfg >> 8) & 0xff);
-                while (rate_cfg > 0x1) {
-                        rate_cfg = (rate_cfg >> 1);
+                b_rate_cfg = b_rate_cfg & 0x15f;
+                b_rate_cfg |= 0x01;
+                rtl_write_byte(rtlpriv, REG_RRSR, b_rate_cfg & 0xff);
+                rtl_write_byte(rtlpriv, REG_RRSR + 1, (b_rate_cfg >> 8) & 0xff);
+                while (b_rate_cfg > 0x1) {
+                        b_rate_cfg = (b_rate_cfg >> 1);
                         rate_index++;
                 }
                 rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, rate_index);
-                break; }
+                }
+                break;
         case HW_VAR_BSSID:
                 for (idx = 0; idx < ETH_ALEN; idx++)
                         rtl_write_byte(rtlpriv, (REG_BSSID + idx), val[idx]);
+
                 break;
         case HW_VAR_SIFS:
                 rtl_write_byte(rtlpriv, REG_SIFS_CTX + 1, val[0]);
@@ -388,7 +451,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_word(rtlpriv, REG_RESP_SIFS_OFDM,
                                        *((u16 *)val));
                 break;
-        case HW_VAR_SLOT_TIME: {
+        case HW_VAR_SLOT_TIME:{
                 u8 e_aci;
 
                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
@@ -398,12 +461,13 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                 for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
-                                                      &e_aci);
+                                                      (u8 *)(&e_aci));
                 }
-                break; }
-        case HW_VAR_ACK_PREAMBLE: {
+                }
+                break;
+        case HW_VAR_ACK_PREAMBLE:{
                 u8 reg_tmp;
-                u8 short_preamble = (bool)*val;
+                u8 short_preamble = (bool)(*(u8 *)val);
                 reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL + 2);
                 if (short_preamble) {
                         reg_tmp |= 0x02;
@@ -412,15 +476,16 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         reg_tmp &= 0xFD;
                         rtl_write_byte(rtlpriv, REG_TRXPTCL_CTL + 2, reg_tmp);
                 }
-                break; }
+                }
+                break;
         case HW_VAR_WPA_CONFIG:
-                rtl_write_byte(rtlpriv, REG_SECCFG, *val);
+                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val));
                 break;
-        case HW_VAR_AMPDU_MIN_SPACE: {
+        case HW_VAR_AMPDU_MIN_SPACE:{
                 u8 min_spacing_to_set;
                 u8 sec_min_space;
 
-                min_spacing_to_set = *val;
+                min_spacing_to_set = *((u8 *)val);
                 if (min_spacing_to_set <= 7) {
                         sec_min_space = 0;
 
@@ -434,26 +499,28 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
                                  "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                 mac->min_space_cfg);
+                                  mac->min_space_cfg);
 
                         rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
                 }
-                break; }
-        case HW_VAR_SHORTGI_DENSITY: {
+                }
+                break;
+        case HW_VAR_SHORTGI_DENSITY:{
                 u8 density_to_set;
 
-                density_to_set = *val;
+                density_to_set = *((u8 *)val);
                 mac->min_space_cfg |= (density_to_set << 3);
 
                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
                          "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                         mac->min_space_cfg);
+                          mac->min_space_cfg);
 
                 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                mac->min_space_cfg);
-                break; }
-        case HW_VAR_AMPDU_FACTOR: {
+                }
+                break;
+        case HW_VAR_AMPDU_FACTOR:{
                 u8 regtoset_normal[4] = {0x41, 0xa8, 0x72, 0xb9};
                 u8 factor_toset;
                 u8 *p_regtoset = NULL;
@@ -461,7 +528,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                 p_regtoset = regtoset_normal;
 
-                factor_toset = *val;
+                factor_toset = *((u8 *)val);
                 if (factor_toset <= 3) {
                         factor_toset = (1 << (factor_toset + 2));
                         if (factor_toset > 0xf)
@@ -482,22 +549,26 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 rtl_write_byte(rtlpriv,
                                                (REG_AGGLEN_LMT + index),
                                                p_regtoset[index]);
+
                         }
+
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
                                  "Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                 factor_toset);
+                                  factor_toset);
                 }
-                break; }
-        case HW_VAR_AC_PARAM: {
-                u8 e_aci = *val;
+                }
+                break;
+        case HW_VAR_AC_PARAM:{
+                u8 e_aci = *((u8 *)val);
                 rtl8723_dm_init_edca_turbo(hw);
 
                 if (rtlpci->acm_method != EACMWAY2_SW)
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL,
-                                                      &e_aci);
-                break; }
-        case HW_VAR_ACM_CTRL: {
-                u8 e_aci = *val;
+                                                      (u8 *)(&e_aci));
+                }
+                break;
+        case HW_VAR_ACM_CTRL:{
+                u8 e_aci = *((u8 *)val);
                 union aci_aifsn *p_aci_aifsn =
                                 (union aci_aifsn *)(&(mac->ac[0].aifs));
                 u8 acm = p_aci_aifsn->f.acm;
@@ -519,8 +590,8 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "HW_VAR_ACM_CTRL acm set "
-                                          "failed: eACI is %d\n", acm);
+                                         "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                         acm);
                                 break;
                         }
                 } else {
@@ -535,27 +606,30 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 acm_ctrl &= (~ACMHW_BEQEN);
                                 break;
                         default:
-                                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                                          "switch case not process\n");
                                 break;
                         }
                 }
+
                 RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] "
-                         "Write 0x%X\n", acm_ctrl);
+                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                         acm_ctrl);
                 rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
-                break; }
+                }
+                break;
         case HW_VAR_RCR:
                 rtl_write_dword(rtlpriv, REG_RCR, ((u32 *)(val))[0]);
                 rtlpci->receive_config = ((u32 *)(val))[0];
                 break;
-        case HW_VAR_RETRY_LIMIT: {
-                u8 retry_limit = *val;
+        case HW_VAR_RETRY_LIMIT:{
+                u8 retry_limit = ((u8 *)(val))[0];
 
                 rtl_write_word(rtlpriv, REG_RL,
                                retry_limit << RETRY_LIMIT_SHORT_SHIFT |
                                retry_limit << RETRY_LIMIT_LONG_SHIFT);
-                break; }
+                }
+                break;
         case HW_VAR_DUAL_TSF_RST:
                 rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, (BIT(0) | BIT(1)));
                 break;
@@ -563,25 +637,27 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlefuse->efuse_usedbytes = *((u16 *)val);
                 break;
         case HW_VAR_EFUSE_USAGE:
-                rtlefuse->efuse_usedpercentage = *val;
+                rtlefuse->efuse_usedpercentage = *((u8 *)val);
                 break;
         case HW_VAR_IO_CMD:
                 rtl8723be_phy_set_io_cmd(hw, (*(enum io_type *)val));
                 break;
-        case HW_VAR_SET_RPWM: {
+        case HW_VAR_SET_RPWM:{
                 u8 rpwm_val;
 
                 rpwm_val = rtl_read_byte(rtlpriv, REG_PCIE_HRPWM);
                 udelay(1);
 
                 if (rpwm_val & BIT(7)) {
-                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val);
+                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, (*(u8 *)val));
                 } else {
-                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val | BIT(7));
+                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
+                                       ((*(u8 *)val) | BIT(7)));
                 }
-                break; }
+                }
+                break;
         case HW_VAR_H2C_FW_PWRMODE:
-                rtl8723be_set_fw_pwrmode_cmd(hw, *val);
+                rtl8723be_set_fw_pwrmode_cmd(hw, (*(u8 *)val));
                 break;
         case HW_VAR_FW_PSMODE_STATUS:
                 ppsc->fw_current_inpsmode = *((bool *)val);
@@ -589,85 +665,38 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_RESUME_CLK_ON:
                 _rtl8723be_set_fw_ps_rf_on(hw);
                 break;
-        case HW_VAR_FW_LPS_ACTION: {
-                bool enter_fwlps = *((bool *)val);
+        case HW_VAR_FW_LPS_ACTION:{
+                bool b_enter_fwlps = *((bool *)val);
 
-                if (enter_fwlps)
+                if (b_enter_fwlps)
                         _rtl8723be_fwlps_enter(hw);
                 else
                         _rtl8723be_fwlps_leave(hw);
-
-                break; }
-        case HW_VAR_H2C_FW_JOINBSSRPT: {
-                u8 mstatus = *val;
-                u8 tmp_regcr, tmp_reg422, bcnvalid_reg;
-                u8 count = 0, dlbcn_count = 0;
-                bool recover = false;
+                }
+                break;
+        case HW_VAR_H2C_FW_JOINBSSRPT:{
+                u8 mstatus = (*(u8 *)val);
 
                 if (mstatus == RT_MEDIA_CONNECT) {
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID, NULL);
-
-                        tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
-                        rtl_write_byte(rtlpriv, REG_CR + 1,
-                                       (tmp_regcr | BIT(0)));
-
-                        _rtl8723be_set_bcn_ctrl_reg(hw, 0, BIT(3));
-                        _rtl8723be_set_bcn_ctrl_reg(hw, BIT(4), 0);
-
-                        tmp_reg422 = rtl_read_byte(rtlpriv,
-                                                   REG_FWHW_TXQ_CTRL + 2);
-                        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
-                                       tmp_reg422 & (~BIT(6)));
-                        if (tmp_reg422 & BIT(6))
-                                recover = true;
-
-                        do {
-                                bcnvalid_reg = rtl_read_byte(rtlpriv,
-                                                             REG_TDECTRL + 2);
-                                rtl_write_byte(rtlpriv, REG_TDECTRL + 2,
-                                               (bcnvalid_reg | BIT(0)));
-                                _rtl8723be_return_beacon_queue_skb(hw);
-
-                                rtl8723be_set_fw_rsvdpagepkt(hw, 0);
-                                bcnvalid_reg = rtl_read_byte(rtlpriv,
-                                                             REG_TDECTRL + 2);
-                                count = 0;
-                                while (!(bcnvalid_reg & BIT(0)) && count < 20) {
-                                        count++;
-                                        udelay(10);
-                                        bcnvalid_reg = rtl_read_byte(rtlpriv,
-                                                               REG_TDECTRL + 2);
-                                }
-                                dlbcn_count++;
-                        } while (!(bcnvalid_reg & BIT(0)) && dlbcn_count < 5);
-
-                        if (bcnvalid_reg & BIT(0))
-                                rtl_write_byte(rtlpriv, REG_TDECTRL+2, BIT(0));
-
-                        _rtl8723be_set_bcn_ctrl_reg(hw, BIT(3), 0);
-                        _rtl8723be_set_bcn_ctrl_reg(hw, 0, BIT(4));
-
-                        if (recover) {
-                                rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
-                                               tmp_reg422);
-                        }
-                        rtl_write_byte(rtlpriv, REG_CR + 1,
-                                       (tmp_regcr & ~(BIT(0))));
+                        _rtl8723be_download_rsvd_page(hw);
+                }
+                rtl8723be_set_fw_media_status_rpt_cmd(hw, mstatus);
                 }
-                rtl8723be_set_fw_joinbss_report_cmd(hw, *val);
-                break; }
+                break;
         case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
-                rtl8723be_set_p2p_ps_offload_cmd(hw, *val);
+                rtl8723be_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));
                 break;
-        case HW_VAR_AID: {
+        case HW_VAR_AID:{
                 u16 u2btmp;
                 u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
                 u2btmp &= 0xC000;
                 rtl_write_word(rtlpriv, REG_BCN_PSR_RPT,
                                (u2btmp | mac->assoc_id));
-                break; }
-        case HW_VAR_CORRECT_TSF: {
-                u8 btype_ibss = *val;
+                }
+                break;
+        case HW_VAR_CORRECT_TSF:{
+                u8 btype_ibss = ((u8 *)(val))[0];
 
                 if (btype_ibss)
                         _rtl8723be_stop_tx_beacon(hw);
@@ -683,16 +712,17 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                 if (btype_ibss)
                         _rtl8723be_resume_tx_beacon(hw);
-                break; }
-        case HW_VAR_KEEP_ALIVE: {
+                }
+                break;
+        case HW_VAR_KEEP_ALIVE:{
                 u8 array[2];
                 array[0] = 0xff;
-                array[1] = *val;
-                rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_KEEP_ALIVE_CTRL,
-                                       2, array);
-                break; }
+                array[1] = *((u8 *)val);
+                rtl8723be_fill_h2c_cmd(hw, H2C_8723B_KEEP_ALIVE_CTRL, 2, array);
+                }
+                break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                          "switch case not process %x\n",
                          variable);
                 break;
@@ -703,7 +733,7 @@ static bool _rtl8723be_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         bool status = true;
-        int count = 0;
+        long count = 0;
         u32 value = _LLT_INIT_ADDR(address) | _LLT_INIT_DATA(data) |
                     _LLT_OP(_LLT_WRITE_ACCESS);
 
@@ -716,8 +746,8 @@ static bool _rtl8723be_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
 
                 if (count > POLLING_LLT_THRESHOLD) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 "Failed to polling write LLT done at "
-                                  "address %d!\n", address);
+                                 "Failed to polling write LLT done at address %d!\n",
+                                 address);
                         status = false;
                         break;
                 }
@@ -731,10 +761,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,
@@ -753,17 +783,19 @@ static bool _rtl8723be_llt_table_init(struct ieee80211_hw *hw)
                 if (!status)
                         return status;
         }
+
         status = _rtl8723be_llt_write(hw, (txpktbuf_bndy - 1), 0xFF);
 
         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;
 
@@ -795,11 +827,9 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         unsigned char bytetmp;
         unsigned short wordtmp;
-        u16 retry = 0;
-        bool mac_func_enable;
 
         rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x00);
 
@@ -807,12 +837,6 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw)
         bytetmp = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 1) & (~BIT(7));
         rtl_write_byte(rtlpriv, REG_APS_FSMCO + 1, bytetmp);
 
-        bytetmp = rtl_read_byte(rtlpriv, REG_CR);
-        if (bytetmp == 0xFF)
-                mac_func_enable = true;
-        else
-                mac_func_enable = false;
-
         /* HW Power on sequence */
         if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK,
                                       PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,
@@ -821,6 +845,10 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw)
                          "init MAC Fail as power on failure\n");
                 return false;
         }
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_MULTI_FUNC_CTRL);
+        rtl_write_byte(rtlpriv, REG_MULTI_FUNC_CTRL, bytetmp | BIT(3));
+
         bytetmp = rtl_read_byte(rtlpriv, REG_APS_FSMCO) | BIT(4);
         rtl_write_byte(rtlpriv, REG_APS_FSMCO, bytetmp);
 
@@ -837,25 +865,21 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw)
         bytetmp = rtl_read_byte(rtlpriv, REG_SYS_CFG + 3);
         if (bytetmp & BIT(0)) {
                 bytetmp = rtl_read_byte(rtlpriv, 0x7c);
-                bytetmp |= BIT(6);
-                rtl_write_byte(rtlpriv, 0x7c, bytetmp);
+                rtl_write_byte(rtlpriv, 0x7c, bytetmp | BIT(6));
         }
+
         bytetmp = rtl_read_byte(rtlpriv, REG_SYS_CLKR);
-        bytetmp |= BIT(3);
-        rtl_write_byte(rtlpriv, REG_SYS_CLKR, bytetmp);
+        rtl_write_byte(rtlpriv, REG_SYS_CLKR, bytetmp | BIT(3));
         bytetmp = rtl_read_byte(rtlpriv, REG_GPIO_MUXCFG + 1);
-        bytetmp &= ~BIT(4);
-        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG + 1, bytetmp);
-
-        bytetmp = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG+3);
-        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG+3, bytetmp | 0x77);
+        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG + 1, bytetmp & (~BIT(4)));
 
         rtl_write_word(rtlpriv, REG_CR, 0x2ff);
 
-        if (!mac_func_enable) {
-                if (!_rtl8723be_llt_table_init(hw))
+        if (!rtlhal->mac_func_enable) {
+                if (_rtl8723be_llt_table_init(hw) == false)
                         return false;
         }
+
         rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff);
         rtl_write_dword(rtlpriv, REG_HISRE, 0xffffffff);
 
@@ -873,8 +897,6 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw)
         rtl_write_word(rtlpriv, REG_RXFLTMAP2, 0xFFFF);
         rtl_write_dword(rtlpriv, REG_TCR, rtlpci->transmit_config);
 
-        rtl_write_byte(rtlpriv, 0x4d0, 0x0);
-
         rtl_write_dword(rtlpriv, REG_BCNQ_DESA,
                         ((u64) rtlpci->tx_ring[BEACON_QUEUE].dma) &
                         DMA_BIT_MASK(32));
@@ -901,57 +923,213 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw)
 
         rtl_write_dword(rtlpriv, REG_INT_MIG, 0);
 
-        bytetmp = rtl_read_byte(rtlpriv, REG_APSD_CTRL);
-        rtl_write_byte(rtlpriv, REG_APSD_CTRL, bytetmp & ~BIT(6));
+        rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0);
 
         rtl_write_byte(rtlpriv, REG_SECONDARY_CCA_CTRL, 0x3);
 
-        do {
-                retry++;
-                bytetmp = rtl_read_byte(rtlpriv, REG_APSD_CTRL);
-        } while ((retry < 200) && (bytetmp & BIT(7)));
-
-        _rtl8723be_gen_refresh_led_state(hw);
-
-        rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0);
+        /* <20130114, Kordan> The following setting is
+         * only for DPDT and Fixed board type.
+         * TODO:  A better solution is configure it
+         * according EFUSE during the run-time.
+         */
+        rtl_set_bbreg(hw, 0x64, BIT(20), 0x0);/* 0x66[4]=0 */
+        rtl_set_bbreg(hw, 0x64, BIT(24), 0x0);/* 0x66[8]=0 */
+        rtl_set_bbreg(hw, 0x40, BIT(4), 0x0)/* 0x40[4]=0 */;
+        rtl_set_bbreg(hw, 0x40, BIT(3), 0x1)/* 0x40[3]=1 */;
+        rtl_set_bbreg(hw, 0x4C, BIT(24) | BIT(23), 0x2)/* 0x4C[24:23]=10 */;
+        rtl_set_bbreg(hw, 0x944, BIT(1) | BIT(0), 0x3)/* 0x944[1:0]=11 */;
+        rtl_set_bbreg(hw, 0x930, MASKBYTE0, 0x77)/* 0x930[7:0]=77 */;
+        rtl_set_bbreg(hw, 0x38, BIT(11), 0x1)/* 0x38[11]=1 */;
 
         bytetmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
-        rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, bytetmp & ~BIT(2));
+        rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, bytetmp & (~BIT(2)));
 
+        _rtl8723be_gen_refresh_led_state(hw);
         return true;
 }
 
 static void _rtl8723be_hw_configure(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 reg_bw_opmode;
-        u32 reg_ratr, reg_prsr;
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 reg_rrsr;
+
+        reg_rrsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+        /* Init value for RRSR. */
+        rtl_write_dword(rtlpriv, REG_RRSR, reg_rrsr);
+
+        /* ARFB table 9 for 11ac 5G 2SS */
+        rtl_write_dword(rtlpriv, REG_ARFR0 + 4, 0xfffff000);
+
+        /* ARFB table 10 for 11ac 5G 1SS */
+        rtl_write_dword(rtlpriv, REG_ARFR1 + 4, 0x003ff000);
+
+        /* CF-End setting. */
+        rtl_write_word(rtlpriv, REG_FWHW_TXQ_CTRL, 0x1F00);
+
+        /* 0x456 = 0x70, sugguested by Zhilin */
+        rtl_write_byte(rtlpriv, REG_AMPDU_MAX_TIME, 0x70);
+
+        /* Set retry limit */
+        rtl_write_word(rtlpriv, REG_RL, 0x0707);
+
+        /* Set Data / Response auto rate fallack retry count */
+        rtl_write_dword(rtlpriv, REG_DARFRC, 0x01000000);
+        rtl_write_dword(rtlpriv, REG_DARFRC + 4, 0x07060504);
+        rtl_write_dword(rtlpriv, REG_RARFRC, 0x01000000);
+        rtl_write_dword(rtlpriv, REG_RARFRC + 4, 0x07060504);
+
+        rtlpci->reg_bcn_ctrl_val = 0x1d;
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, rtlpci->reg_bcn_ctrl_val);
+
+        /* TBTT prohibit hold time. Suggested by designer TimChen. */
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0xff); /* 8 ms */
+
+        rtl_write_word(rtlpriv, REG_NAV_PROT_LEN, 0x0040);
+
+        /*For Rx TP. Suggested by SD1 Richard. Added by tynli. 2010.04.12.*/
+        rtl_write_dword(rtlpriv, REG_FAST_EDCA_CTRL, 0x03086666);
 
-        reg_bw_opmode = BW_OPMODE_20MHZ;
-        reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
-                   RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
-        reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+        rtl_write_byte(rtlpriv, REG_HT_SINGLE_AMPDU, 0x80);
 
-        rtl_write_dword(rtlpriv, REG_RRSR, reg_prsr);
-        rtl_write_byte(rtlpriv, REG_HWSEQ_CTRL, 0xFF);
+        rtl_write_byte(rtlpriv, REG_RX_PKT_LIMIT, 0x20);
+
+        rtl_write_byte(rtlpriv, REG_MAX_AGGR_NUM, 0x1F);
+}
+
+static u8 _rtl8723be_dbi_read(struct rtl_priv *rtlpriv, u16 addr)
+{
+        u16 read_addr = addr & 0xfffc;
+        u8 ret = 0, tmp = 0, count = 0;
+
+        rtl_write_word(rtlpriv, REG_DBI_ADDR, read_addr);
+        rtl_write_byte(rtlpriv, REG_DBI_FLAG, 0x2);
+        tmp = rtl_read_byte(rtlpriv, REG_DBI_FLAG);
+        count = 0;
+        while (tmp && count < 20) {
+                udelay(10);
+                tmp = rtl_read_byte(rtlpriv, REG_DBI_FLAG);
+                count++;
+        }
+        if (0 == tmp) {
+                read_addr = REG_DBI_RDATA + addr % 4;
+                ret = rtl_read_byte(rtlpriv, read_addr);
+        }
+
+        return ret;
+}
+
+static void _rtl8723be_dbi_write(struct rtl_priv *rtlpriv, u16 addr, u8 data)
+{
+        u8 tmp = 0, count = 0;
+        u16 write_addr = 0, remainder = addr % 4;
+
+        /* Write DBI 1Byte Data */
+        write_addr = REG_DBI_WDATA + remainder;
+        rtl_write_byte(rtlpriv, write_addr, data);
+
+        /* Write DBI 2Byte Address & Write Enable */
+        write_addr = (addr & 0xfffc) | (BIT(0) << (remainder + 12));
+        rtl_write_word(rtlpriv, REG_DBI_ADDR, write_addr);
+
+        /* Write DBI Write Flag */
+        rtl_write_byte(rtlpriv, REG_DBI_FLAG, 0x1);
+
+        tmp = rtl_read_byte(rtlpriv, REG_DBI_FLAG);
+        count = 0;
+        while (tmp && count < 20) {
+                udelay(10);
+                tmp = rtl_read_byte(rtlpriv, REG_DBI_FLAG);
+                count++;
+        }
+}
+
+static u16 _rtl8723be_mdio_read(struct rtl_priv *rtlpriv, u8 addr)
+{
+        u16 ret = 0;
+        u8 tmp = 0, count = 0;
+
+        rtl_write_byte(rtlpriv, REG_MDIO_CTL, addr | BIT(6));
+        tmp = rtl_read_byte(rtlpriv, REG_MDIO_CTL) & BIT(6);
+        count = 0;
+        while (tmp && count < 20) {
+                udelay(10);
+                tmp = rtl_read_byte(rtlpriv, REG_MDIO_CTL) & BIT(6);
+                count++;
+        }
+
+        if (0 == tmp)
+                ret = rtl_read_word(rtlpriv, REG_MDIO_RDATA);
+
+        return ret;
+}
+
+static void _rtl8723be_mdio_write(struct rtl_priv *rtlpriv, u8 addr, u16 data)
+{
+        u8 tmp = 0, count = 0;
+
+        rtl_write_word(rtlpriv, REG_MDIO_WDATA, data);
+        rtl_write_byte(rtlpriv, REG_MDIO_CTL, addr | BIT(5));
+        tmp = rtl_read_byte(rtlpriv, REG_MDIO_CTL) & BIT(5);
+        count = 0;
+        while (tmp && count < 20) {
+                udelay(10);
+                tmp = rtl_read_byte(rtlpriv, REG_MDIO_CTL) & BIT(5);
+                count++;
+        }
 }
 
 static void _rtl8723be_enable_aspm_back_door(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 tmp8 = 0;
+        u16 tmp16 = 0;
 
-        rtl_write_byte(rtlpriv, 0x34b, 0x93);
-        rtl_write_word(rtlpriv, 0x350, 0x870c);
-        rtl_write_byte(rtlpriv, 0x352, 0x1);
+        /* <Roger_Notes> Overwrite following ePHY parameter for
+         * some platform compatibility issue,
+         * especially when CLKReq is enabled, 2012.11.09.
+         */
+        tmp16 = _rtl8723be_mdio_read(rtlpriv, 0x01);
+        if (tmp16 != 0x0663)
+                _rtl8723be_mdio_write(rtlpriv, 0x01, 0x0663);
 
-        if (ppsc->support_backdoor)
-                rtl_write_byte(rtlpriv, 0x349, 0x1b);
-        else
-                rtl_write_byte(rtlpriv, 0x349, 0x03);
+        tmp16 = _rtl8723be_mdio_read(rtlpriv, 0x04);
+        if (tmp16 != 0x7544)
+                _rtl8723be_mdio_write(rtlpriv, 0x04, 0x7544);
+
+        tmp16 = _rtl8723be_mdio_read(rtlpriv, 0x06);
+        if (tmp16 != 0xB880)
+                _rtl8723be_mdio_write(rtlpriv, 0x06, 0xB880);
+
+        tmp16 = _rtl8723be_mdio_read(rtlpriv, 0x07);
+        if (tmp16 != 0x4000)
+                _rtl8723be_mdio_write(rtlpriv, 0x07, 0x4000);
+
+        tmp16 = _rtl8723be_mdio_read(rtlpriv, 0x08);
+        if (tmp16 != 0x9003)
+                _rtl8723be_mdio_write(rtlpriv, 0x08, 0x9003);
+
+        tmp16 = _rtl8723be_mdio_read(rtlpriv, 0x09);
+        if (tmp16 != 0x0D03)
+                _rtl8723be_mdio_write(rtlpriv, 0x09, 0x0D03);
+
+        tmp16 = _rtl8723be_mdio_read(rtlpriv, 0x0A);
+        if (tmp16 != 0x4037)
+                _rtl8723be_mdio_write(rtlpriv, 0x0A, 0x4037);
 
-        rtl_write_word(rtlpriv, 0x350, 0x2718);
-        rtl_write_byte(rtlpriv, 0x352, 0x1);
+        tmp16 = _rtl8723be_mdio_read(rtlpriv, 0x0B);
+        if (tmp16 != 0x0070)
+                _rtl8723be_mdio_write(rtlpriv, 0x0B, 0x0070);
+
+        /* Configuration Space offset 0x70f BIT7 is used to control L0S */
+        tmp8 = _rtl8723be_dbi_read(rtlpriv, 0x70f);
+        _rtl8723be_dbi_write(rtlpriv, 0x70f, tmp8 | BIT(7));
+
+        /* Configuration Space offset 0x719 Bit3 is for L1
+         * BIT4 is for clock request
+         */
+        tmp8 = _rtl8723be_dbi_read(rtlpriv, 0x719);
+        _rtl8723be_dbi_write(rtlpriv, 0x719, tmp8 | BIT(3) | BIT(4));
 }
 
 void rtl8723be_enable_hw_security_config(struct ieee80211_hw *hw)
@@ -961,30 +1139,208 @@ void rtl8723be_enable_hw_security_config(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                 rtlpriv->sec.pairwise_enc_algorithm,
-                 rtlpriv->sec.group_enc_algorithm);
+                  rtlpriv->sec.pairwise_enc_algorithm,
+                  rtlpriv->sec.group_enc_algorithm);
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                          "not open hw encryption\n");
                 return;
         }
+
         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_RXBCUSEDK | SCR_TXBCUSEDK);
 
         rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "The SECR-value %x\n",
-                 sec_reg_value);
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                 "The SECR-value %x\n", sec_reg_value);
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 }
 
+static void _rtl8723be_poweroff_adapter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 u1b_tmp;
+
+        rtlhal->mac_func_enable = false;
+        /* 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);
+
+        /* 2. 0x1F[7:0] = 0 */
+        /* turn off RF */
+        /* rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x00); */
+        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) &&
+            rtlhal->fw_ready) {
+                rtl8723be_firmware_selfreset(hw);
+        }
+
+        /* Reset MCU. Suggested by Filen. */
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, (u1b_tmp & (~BIT(2))));
+
+        /* g.   MCUFWDL 0x80[1:0]=0      */
+        /* reset MCU ready status */
+        rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
+
+        /* HW card disable configuration. */
+        rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                                 PWR_INTF_PCI_MSK, RTL8723_NIC_DISABLE_FLOW);
+
+        /* Reset MCU IO Wrapper */
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1b_tmp & (~BIT(0))));
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, u1b_tmp | BIT(0));
+
+        /* 7. RSV_CTRL 0x1C[7:0] = 0x0E */
+        /* lock ISO/CLK/Power control register */
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x0e);
+}
+
+static bool _rtl8723be_check_pcie_dma_hang(struct rtl_priv *rtlpriv)
+{
+        u8 tmp;
+
+        /* write reg 0x350 Bit[26]=1. Enable debug port. */
+        tmp = rtl_read_byte(rtlpriv, REG_DBI_CTRL + 3);
+        if (!(tmp & BIT(2))) {
+                rtl_write_byte(rtlpriv, REG_DBI_CTRL + 3, (tmp | BIT(2)));
+                mdelay(100); /* Suggested by DD Justin_tsai. */
+        }
+
+        /* read reg 0x350 Bit[25] if 1 : RX hang
+         * read reg 0x350 Bit[24] if 1 : TX hang
+         */
+        tmp = rtl_read_byte(rtlpriv, REG_DBI_CTRL + 3);
+        if ((tmp & BIT(0)) || (tmp & BIT(1))) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "CheckPcieDMAHang8723BE(): true!!\n");
+                return true;
+        }
+        return false;
+}
+
+static void _rtl8723be_reset_pcie_interface_dma(struct rtl_priv *rtlpriv,
+                                                bool mac_power_on)
+{
+        u8 tmp;
+        bool release_mac_rx_pause;
+        u8 backup_pcie_dma_pause;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "ResetPcieInterfaceDMA8723BE()\n");
+
+        /* Revise Note: Follow the document "PCIe RX DMA Hang Reset Flow_v03"
+         * released by SD1 Alan.
+         * 2013.05.07, by tynli.
+         */
+
+        /* 1. disable register write lock
+         *      write 0x1C bit[1:0] = 2'h0
+         *      write 0xCC bit[2] = 1'b1
+         */
+        tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL);
+        tmp &= ~(BIT(1) | BIT(0));
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, tmp);
+        tmp = rtl_read_byte(rtlpriv, REG_PMC_DBG_CTRL2);
+        tmp |= BIT(2);
+        rtl_write_byte(rtlpriv, REG_PMC_DBG_CTRL2, tmp);
+
+        /* 2. Check and pause TRX DMA
+         *      write 0x284 bit[18] = 1'b1
+         *      write 0x301 = 0xFF
+         */
+        tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+        if (tmp & BIT(2)) {
+                /* Already pause before the function for another purpose. */
+                release_mac_rx_pause = false;
+        } else {
+                rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, (tmp | BIT(2)));
+                release_mac_rx_pause = true;
+        }
+
+        backup_pcie_dma_pause = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG + 1);
+        if (backup_pcie_dma_pause != 0xFF)
+                rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0xFF);
+
+        if (mac_power_on) {
+                /* 3. reset TRX function
+                 *      write 0x100 = 0x00
+                 */
+                rtl_write_byte(rtlpriv, REG_CR, 0);
+        }
+
+        /* 4. Reset PCIe DMA
+         *      write 0x003 bit[0] = 0
+         */
+        tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        tmp &= ~(BIT(0));
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, tmp);
+
+        /* 5. Enable PCIe DMA
+         *      write 0x003 bit[0] = 1
+         */
+        tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        tmp |= BIT(0);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, tmp);
+
+        if (mac_power_on) {
+                /* 6. enable TRX function
+                 *      write 0x100 = 0xFF
+                 */
+                rtl_write_byte(rtlpriv, REG_CR, 0xFF);
+
+                /* We should init LLT & RQPN and
+                 * prepare Tx/Rx descrptor address later
+                 * because MAC function is reset.
+                 */
+        }
+
+        /* 7. Restore PCIe autoload down bit
+         *      write 0xF8 bit[17] = 1'b1
+         */
+        tmp = rtl_read_byte(rtlpriv, REG_MAC_PHY_CTRL_NORMAL + 2);
+        tmp |= BIT(1);
+        rtl_write_byte(rtlpriv, REG_MAC_PHY_CTRL_NORMAL + 2, tmp);
+
+        /* In MAC power on state, BB and RF maybe in ON state,
+         * if we release TRx DMA here
+         * it will cause packets to be started to Tx/Rx,
+         * so we release Tx/Rx DMA later.
+         */
+        if (!mac_power_on) {
+                /* 8. release TRX DMA
+                 *      write 0x284 bit[18] = 1'b0
+                 *      write 0x301 = 0x00
+                 */
+                if (release_mac_rx_pause) {
+                        tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+                        rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL,
+                                       (tmp & (~BIT(2))));
+                }
+                rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1,
+                               backup_pcie_dma_pause);
+        }
+
+        /* 9. lock system register
+         *      write 0xCC bit[2] = 1'b0
+         */
+        tmp = rtl_read_byte(rtlpriv, REG_PMC_DBG_CTRL2);
+        tmp &= ~(BIT(2));
+        rtl_write_byte(rtlpriv, REG_PMC_DBG_CTRL2, tmp);
+}
+
 int rtl8723be_hw_init(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1002,33 +1358,51 @@ int rtl8723be_hw_init(struct ieee80211_hw *hw)
         local_save_flags(flags);
         local_irq_enable();
 
+        rtlhal->fw_ready = false;
         rtlpriv->rtlhal.being_init_adapter = true;
         rtlpriv->intf_ops->disable_aspm(hw);
+
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_CR);
+        if (tmp_u1b != 0 && tmp_u1b != 0xea) {
+                rtlhal->mac_func_enable = true;
+        } else {
+                rtlhal->mac_func_enable = false;
+                rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON;
+        }
+
+        if (_rtl8723be_check_pcie_dma_hang(rtlpriv)) {
+                _rtl8723be_reset_pcie_interface_dma(rtlpriv,
+                                                    rtlhal->mac_func_enable);
+                rtlhal->mac_func_enable = false;
+        }
+        if (rtlhal->mac_func_enable) {
+                _rtl8723be_poweroff_adapter(hw);
+                rtlhal->mac_func_enable = false;
+        }
         rtstatus = _rtl8723be_init_mac(hw);
         if (!rtstatus) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
                 err = 1;
                 goto exit;
         }
+
         tmp_u1b = rtl_read_byte(rtlpriv, REG_SYS_CFG);
-        tmp_u1b &= 0x7F;
-        rtl_write_byte(rtlpriv, REG_SYS_CFG, tmp_u1b);
+        rtl_write_byte(rtlpriv, REG_SYS_CFG, tmp_u1b & 0x7F);
 
-        err = rtl8723_download_fw(hw, true);
+        err = rtl8723_download_fw(hw, true, FW_8723B_POLLING_TIMEOUT_COUNT);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Failed to download FW. Init HW without FW now..\n");
                 err = 1;
-                rtlhal->fw_ready = false;
                 goto exit;
-        } else {
-                rtlhal->fw_ready = true;
         }
+        rtlhal->fw_ready = true;
+
         rtlhal->last_hmeboxnum = 0;
         rtl8723be_phy_mac_config(hw);
         /* because last function modify RCR, so we update
          * rcr var here, or TP will unstable for receive_config
-         * is wrong, RX RCR_ACRC32 will cause TP unstabel & Rx
+         * is wrong, RX RCR_ACRC32 will cause TP unstable & Rx
          * RCR_APP_ICV will cause mac80211 unassoc for cisco 1252
          */
         rtlpci->receive_config = rtl_read_dword(rtlpriv, REG_RCR);
@@ -1036,7 +1410,6 @@ int rtl8723be_hw_init(struct ieee80211_hw *hw)
         rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
 
         rtl8723be_phy_bb_config(hw);
-        rtlphy->rf_mode = RF_OP_BY_SW_3WIRE;
         rtl8723be_phy_rf_config(hw);
 
         rtlphy->rfreg_chnlval[0] = rtl_get_rfreg(hw, (enum radio_path)0,
@@ -1046,10 +1419,8 @@ int rtl8723be_hw_init(struct ieee80211_hw *hw)
         rtlphy->rfreg_chnlval[0] &= 0xFFF03FF;
         rtlphy->rfreg_chnlval[0] |= (BIT(10) | BIT(11));
 
-        rtl_set_bbreg(hw, RFPGA0_RFMOD, BCCKEN, 0x1);
-        rtl_set_bbreg(hw, RFPGA0_RFMOD, BOFDMEN, 0x1);
-        rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER2, BIT(10), 1);
         _rtl8723be_hw_configure(hw);
+        rtlhal->mac_func_enable = true;
         rtl_cam_reset_all_entry(hw);
         rtl8723be_enable_hw_security_config(hw);
 
@@ -1061,36 +1432,32 @@ int rtl8723be_hw_init(struct ieee80211_hw *hw)
 
         rtl8723be_bt_hw_init(hw);
 
-        rtl_set_bbreg(hw, 0x64, BIT(20), 0);
-        rtl_set_bbreg(hw, 0x64, BIT(24), 0);
-
-        rtl_set_bbreg(hw, 0x40, BIT(4), 0);
-        rtl_set_bbreg(hw, 0x40, BIT(3), 1);
-
-        rtl_set_bbreg(hw, 0x944, BIT(0)|BIT(1), 0x3);
-        rtl_set_bbreg(hw, 0x930, 0xff, 0x77);
-
-        rtl_set_bbreg(hw, 0x38, BIT(11), 0x1);
-
-        rtl_set_bbreg(hw, 0xb2c, 0xffffffff, 0x80000000);
-
         if (ppsc->rfpwr_state == ERFON) {
+                rtl8723be_phy_set_rfpath_switch(hw, 1);
+                /* when use 1ant NIC, iqk will disturb BT music
+                 * root cause is not clear now, is something
+                 * related with 'mdelay' and Reg[0x948]
+                 */
+                if (rtlpriv->btcoexist.btc_info.ant_num == ANT_X2 ||
+                    !rtlpriv->cfg->ops->get_btc_status()) {
+                        rtl8723be_phy_iq_calibrate(hw, false);
+                        rtlphy->iqk_initialized = true;
+                }
                 rtl8723be_dm_check_txpower_tracking(hw);
                 rtl8723be_phy_lc_calibrate(hw);
         }
-        tmp_u1b = efuse_read_1byte(hw, 0x1FA);
-        if (!(tmp_u1b & BIT(0))) {
-                rtl_set_rfreg(hw, RF90_PATH_A, 0x15, 0x0F, 0x05);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "PA BIAS path A\n");
-        }
-        if (!(tmp_u1b & BIT(4))) {
-                tmp_u1b = rtl_read_byte(rtlpriv, 0x16);
-                tmp_u1b &= 0x0F;
-                rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x80);
-                udelay(10);
-                rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x90);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "under 1.5V\n");
+        rtl_write_byte(rtlpriv, REG_NAV_UPPER, ((30000 + 127) / 128));
+
+        /* Release Rx DMA. */
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+        if (tmp_u1b & BIT(2)) {
+                /* Release Rx DMA if needed */
+                tmp_u1b &= (~BIT(2));
+                rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, tmp_u1b);
         }
+        /* Release Tx/Rx PCIE DMA. */
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0);
+
         rtl8723be_dm_init(hw);
 exit:
         local_irq_restore(flags);
@@ -1103,43 +1470,29 @@ static enum version_8723e _rtl8723be_read_chip_version(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         enum version_8723e version = VERSION_UNKNOWN;
-        u8 count = 0;
-        u8 value8;
         u32 value32;
 
-        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0);
-
-        value8 = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 2);
-        rtl_write_byte(rtlpriv, REG_APS_FSMCO + 2, value8 | BIT(0));
-
-        value8 = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 1);
-        rtl_write_byte(rtlpriv, REG_APS_FSMCO + 1, value8 | BIT(0));
-
-        value8 = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 1);
-        while (((value8 & BIT(0))) && (count++ < 100)) {
-                udelay(10);
-                value8 = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 1);
-        }
-        count = 0;
-        value8 = rtl_read_byte(rtlpriv, REG_ROM_VERSION);
-        while ((value8 == 0) && (count++ < 50)) {
-                value8 = rtl_read_byte(rtlpriv, REG_ROM_VERSION);
-                mdelay(1);
-        }
         value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG1);
         if ((value32 & (CHIP_8723B)) != CHIP_8723B)
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "unkown chip version\n");
         else
-                version = (enum version_8723e) VERSION_TEST_CHIP_1T1R_8723B;
+                version = (enum version_8723e)CHIP_8723B;
 
-                rtlphy->rf_type = RF_1T1R;
+        rtlphy->rf_type = RF_1T1R;
+
+        /* treat rtl8723be chip as  MP version in default */
+        version = (enum version_8723e)(version | NORMAL_CHIP);
+
+        value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
+        /* cut version */
+        version |= (enum version_8723e)(value32 & CHIP_VER_RTL_MASK);
+        /* Manufacture */
+        if (((value32 & EXT_VENDOR_ID) >> 18) == 0x01)
+                version = (enum version_8723e)(version | CHIP_VENDOR_SMIC);
 
-        value8 = rtl_read_byte(rtlpriv, REG_ROM_VERSION);
-        if (value8 >= 0x02)
-                version |= BIT(3);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
-                 "RF_2T2R" : "RF_1T1R");
+                  "RF_2T2R" : "RF_1T1R");
 
         return version;
 }
@@ -1150,43 +1503,29 @@ static int _rtl8723be_set_media_status(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 bt_msr = rtl_read_byte(rtlpriv, MSR) & 0xfc;
         enum led_ctl_mode ledaction = LED_CTL_NO_LINK;
+        u8 mode = MSR_NOLINK;
 
-        rtl_write_dword(rtlpriv, REG_BCN_CTRL, 0);
-        RT_TRACE(rtlpriv, COMP_BEACON, DBG_LOUD,
-                 "clear 0x550 when set HW_VAR_MEDIA_STATUS\n");
-
-        if (type == NL80211_IFTYPE_UNSPECIFIED ||
-            type == NL80211_IFTYPE_STATION) {
-                _rtl8723be_stop_tx_beacon(hw);
-                _rtl8723be_enable_bcn_sub_func(hw);
-        } else if (type == NL80211_IFTYPE_ADHOC || type == NL80211_IFTYPE_AP) {
-                _rtl8723be_resume_tx_beacon(hw);
-                _rtl8723be_disable_bcn_sub_func(hw);
-        } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         "Set HW_VAR_MEDIA_STATUS: "
-                         "No such media status(%x).\n", type);
-        }
         switch (type) {
         case NL80211_IFTYPE_UNSPECIFIED:
-                bt_msr |= MSR_NOLINK;
-                ledaction = LED_CTL_LINK;
+                mode = MSR_NOLINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
-                bt_msr |= MSR_ADHOC;
+        case NL80211_IFTYPE_MESH_POINT:
+                mode = MSR_ADHOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
-                bt_msr |= MSR_INFRA;
+                mode = MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
-                bt_msr |= MSR_AP;
+                mode = MSR_AP;
+                ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                          "Set Network type to AP!\n");
                 break;
@@ -1195,9 +1534,33 @@ static int _rtl8723be_set_media_status(struct ieee80211_hw *hw,
                          "Network type %d not support!\n", type);
                 return 1;
         }
-        rtl_write_byte(rtlpriv, (MSR), bt_msr);
+
+        /* MSR_INFRA == Link in infrastructure network;
+         * MSR_ADHOC == Link in ad hoc network;
+         * Therefore, check link state is necessary.
+         *
+         * MSR_AP == AP mode; link state is not cared here.
+         */
+        if (mode != MSR_AP && rtlpriv->mac80211.link_state < MAC80211_LINKED) {
+                mode = MSR_NOLINK;
+                ledaction = LED_CTL_NO_LINK;
+        }
+
+        if (mode == MSR_NOLINK || mode == MSR_INFRA) {
+                _rtl8723be_stop_tx_beacon(hw);
+                _rtl8723be_enable_bcn_sub_func(hw);
+        } else if (mode == MSR_ADHOC || mode == MSR_AP) {
+                _rtl8723be_resume_tx_beacon(hw);
+                _rtl8723be_disable_bcn_sub_func(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
+                         mode);
+        }
+
+        rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);
         rtlpriv->cfg->ops->led_control(hw, ledaction);
-        if ((bt_msr & MSR_MASK) == MSR_AP)
+        if (mode == MSR_AP)
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
         else
                 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);
@@ -1224,6 +1587,7 @@ void rtl8723be_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
                                               (u8 *)(&reg_rcr));
         }
+
 }
 
 int rtl8723be_set_network_type(struct ieee80211_hw *hw,
@@ -1240,6 +1604,7 @@ int rtl8723be_set_network_type(struct ieee80211_hw *hw,
         } else {
                 rtl8723be_set_check_bssid(hw, false);
         }
+
         return 0;
 }
 
@@ -1249,6 +1614,7 @@ int rtl8723be_set_network_type(struct ieee80211_hw *hw,
 void rtl8723be_set_qos(struct ieee80211_hw *hw, int aci)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+
         rtl8723_dm_init_edca_turbo(hw);
         switch (aci) {
         case AC1_BK:
@@ -1268,20 +1634,32 @@ void rtl8723be_set_qos(struct ieee80211_hw *hw, int aci)
         }
 }
 
+static void rtl8723be_clear_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 tmp;
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISR);
+        rtl_write_dword(rtlpriv, REG_HISR, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISRE);
+        rtl_write_dword(rtlpriv, REG_HISRE, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HSISR);
+        rtl_write_dword(rtlpriv, REG_HSISR, tmp);
+}
+
 void rtl8723be_enable_interrupt(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
+        rtl8723be_clear_interrupt(hw);/*clear it here first*/
+
         rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
         rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
         rtlpci->irq_enabled = true;
-        /* there are some C2H CMDs have been sent
-         * before system interrupt is enabled, e.g., C2H, CPWM.
-         * So we need to clear all C2H events that FW has notified,
-         * otherwise FW won't schedule any commands anymore.
-         */
-        rtl_write_byte(rtlpriv, REG_C2HEVT_CLEAR, 0);
+
         /*enable system interrupt*/
         rtl_write_dword(rtlpriv, REG_HSIMR, rtlpci->sys_irq_mask & 0xFFFFFFFF);
 }
@@ -1294,48 +1672,7 @@ void rtl8723be_disable_interrupt(struct ieee80211_hw *hw)
         rtl_write_dword(rtlpriv, REG_HIMR, IMR_DISABLED);
         rtl_write_dword(rtlpriv, REG_HIMRE, IMR_DISABLED);
         rtlpci->irq_enabled = false;
-        synchronize_irq(rtlpci->pdev->irq);
-}
-
-static void _rtl8723be_poweroff_adapter(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 u1b_tmp;
-
-        /* 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);
-
-        /* 2. 0x1F[7:0] = 0 */
-        /* turn off RF */
-        rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x00);
-        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) &&
-            rtlhal->fw_ready)
-                rtl8723be_firmware_selfreset(hw);
-
-        /* Reset MCU. Suggested by Filen. */
-        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
-        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, (u1b_tmp & (~BIT(2))));
-
-        /* g.   MCUFWDL 0x80[1:0]= 0     */
-        /* reset MCU ready status */
-        rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
-
-        /* HW card disable configuration. */
-        rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-                                 PWR_INTF_PCI_MSK, RTL8723_NIC_DISABLE_FLOW);
-
-        /* Reset MCU IO Wrapper */
-        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
-        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1b_tmp & (~BIT(0))));
-        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
-        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, u1b_tmp | BIT(0));
-
-        /* 7. RSV_CTRL 0x1C[7:0] = 0x0E */
-        /* lock ISO/CLK/Power control register */
-        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x0e);
+        /*synchronize_irq(rtlpci->pdev->irq);*/
 }
 
 void rtl8723be_card_disable(struct ieee80211_hw *hw)
@@ -1442,10 +1779,9 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
         u32 path, addr = EEPROM_TX_PWR_INX, group, cnt = 0;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "hal_ReadPowerValueFromPROM8723BE(): "
-                 "PROMContent[0x%x]= 0x%x\n",
+                 "hal_ReadPowerValueFromPROM8723BE(): PROMContent[0x%x]=0x%x\n",
                  (addr + 1), hwinfo[addr + 1]);
-        if (0xFF == hwinfo[addr + 1])  /*YJ, add, 120316*/
+        if (0xFF == hwinfo[addr + 1])  /*YJ,add,120316*/
                 autoload_fail = true;
 
         if (autoload_fail) {
@@ -1453,7 +1789,7 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                          "auto load fail : Use Default value!\n");
                 for (path = 0; path < MAX_RF_PATH; path++) {
                         /* 2.4G default value */
-                        for (group = 0; group < MAX_CHNL_GROUP_24G; group++) {
+                        for (group = 0 ; group < MAX_CHNL_GROUP_24G; group++) {
                                 pw2g->index_cck_base[path][group] = 0x2D;
                                 pw2g->index_bw40_base[path][group] = 0x2D;
                         }
@@ -1471,12 +1807,14 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                 }
                 return;
         }
+
         for (path = 0; path < MAX_RF_PATH; path++) {
                 /*2.4G default value*/
                 for (group = 0; group < MAX_CHNL_GROUP_24G; group++) {
                         pw2g->index_cck_base[path][group] = hwinfo[addr++];
                         if (pw2g->index_cck_base[path][group] == 0xFF)
                                 pw2g->index_cck_base[path][group] = 0x2D;
+
                 }
                 for (group = 0; group < MAX_CHNL_GROUP_24G - 1; group++) {
                         pw2g->index_bw40_base[path][group] = hwinfo[addr++];
@@ -1493,8 +1831,10 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                                                 (hwinfo[addr] & 0xf0) >> 4;
                                         /*bit sign number to 8 bit sign number*/
                                         if (pw2g->bw20_diff[path][cnt] & BIT(3))
-                                                pw2g->bw20_diff[path][cnt] |= 0xF0;
+                                                pw2g->bw20_diff[path][cnt] |=
+                                                                          0xF0;
                                 }
+
                                 if (hwinfo[addr] == 0xFF) {
                                         pw2g->ofdm_diff[path][cnt] = 0x04;
                                 } else {
@@ -1517,6 +1857,7 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                                                 pw2g->bw40_diff[path][cnt] |=
                                                                           0xF0;
                                 }
+
                                 if (hwinfo[addr] == 0xFF) {
                                         pw2g->bw20_diff[path][cnt] = 0xFE;
                                 } else {
@@ -1537,9 +1878,10 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                                                 pw2g->ofdm_diff[path][cnt] |=
                                                                           0xF0;
                                 }
-                                if (hwinfo[addr] == 0xFF) {
+
+                                if (hwinfo[addr] == 0xFF)
                                         pw2g->cck_diff[path][cnt] = 0xFE;
-                                } else {
+                                else {
                                         pw2g->cck_diff[path][cnt] =
                                                         (hwinfo[addr] & 0x0f);
                                         if (pw2g->cck_diff[path][cnt] & BIT(3))
@@ -1549,12 +1891,14 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                                 addr++;
                         }
                 }
+
                 /*5G default value*/
                 for (group = 0; group < MAX_CHNL_GROUP_5G; group++) {
                         pw5g->index_bw40_base[path][group] = hwinfo[addr++];
                         if (pw5g->index_bw40_base[path][group] == 0xFF)
                                 pw5g->index_bw40_base[path][group] = 0xFE;
                 }
+
                 for (cnt = 0; cnt < MAX_TX_COUNT; cnt++) {
                         if (cnt == 0) {
                                 pw5g->bw40_diff[path][cnt] = 0;
@@ -1568,9 +1912,10 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                                                 pw5g->bw20_diff[path][cnt] |=
                                                                           0xF0;
                                 }
-                                if (hwinfo[addr] == 0xFF) {
+
+                                if (hwinfo[addr] == 0xFF)
                                         pw5g->ofdm_diff[path][cnt] = 0x04;
-                                } else {
+                                else {
                                         pw5g->ofdm_diff[path][0] =
                                                         (hwinfo[addr] & 0x0f);
                                         if (pw5g->ofdm_diff[path][cnt] & BIT(3))
@@ -1587,6 +1932,7 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                                         if (pw5g->bw40_diff[path][cnt] & BIT(3))
                                                 pw5g->bw40_diff[path][cnt] |= 0xF0;
                                 }
+
                                 if (hwinfo[addr] == 0xFF) {
                                         pw5g->bw20_diff[path][cnt] = 0xFE;
                                 } else {
@@ -1598,6 +1944,7 @@ static void _rtl8723be_read_power_value_fromprom(struct ieee80211_hw *hw,
                                 addr++;
                         }
                 }
+
                 if (hwinfo[addr] == 0xFF) {
                         pw5g->ofdm_diff[path][1] = 0xFE;
                         pw5g->ofdm_diff[path][2] = 0xFE;
@@ -1653,14 +2000,16 @@ static void _rtl8723be_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                         rtlefuse->txpwr_legacyhtdiff[rf_path][i] =
                                                 pw2g.ofdm_diff[rf_path][i];
                 }
+
                 for (i = 0; i < 14; i++) {
-                        RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                "RF(%d)-Ch(%d) [CCK / HT40_1S ] = "
-                                "[0x%x / 0x%x ]\n", rf_path, i,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S ] = [0x%x / 0x%x ]\n",
+                                rf_path, i,
                                 rtlefuse->txpwrlevel_cck[rf_path][i],
                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i]);
                 }
         }
+
         if (!autoload_fail)
                 rtlefuse->eeprom_thermalmeter =
                                         hwinfo[EEPROM_THERMAL_METER_88E];
@@ -1671,8 +2020,9 @@ static void _rtl8723be_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->apk_thermalmeterignore = true;
                 rtlefuse->eeprom_thermalmeter = EEPROM_DEFAULT_THERMALMETER;
         }
+
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
-        RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 
         if (!autoload_fail) {
@@ -1683,7 +2033,7 @@ static void _rtl8723be_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         } else {
                 rtlefuse->eeprom_regulatory = 0;
         }
-        RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 }
 
@@ -1743,6 +2093,7 @@ static void _rtl8723be_read_adapter_info(struct ieee80211_hw *hw,
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
+
         if (rtlefuse->autoload_failflag)
                 return;
 
@@ -1958,100 +2309,10 @@ void rtl8723be_read_eeprom_info(struct ieee80211_hw *hw)
         _rtl8723be_hal_customized_behavior(hw);
 }
 
-static void rtl8723be_update_hal_rate_table(struct ieee80211_hw *hw,
-                                            struct ieee80211_sta *sta)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u32 ratr_value;
-        u8 ratr_index = 0;
-        u8 nmode = mac->ht_enable;
-        u8 mimo_ps = IEEE80211_SMPS_OFF;
-        u16 shortgi_rate;
-        u32 tmp_ratr_value;
-        u8 curtxbw_40mhz = mac->bw_40;
-        u8 curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
-                               1 : 0;
-        u8 curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
-                               1 : 0;
-        enum wireless_mode wirelessmode = mac->mode;
-
-        if (rtlhal->current_bandtype == BAND_ON_5G)
-                ratr_value = sta->supp_rates[1] << 4;
-        else
-                ratr_value = sta->supp_rates[0];
-        if (mac->opmode == NL80211_IFTYPE_ADHOC)
-                ratr_value = 0xfff;
-        ratr_value |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
-                       sta->ht_cap.mcs.rx_mask[0] << 12);
-        switch (wirelessmode) {
-        case WIRELESS_MODE_B:
-                if (ratr_value & 0x0000000c)
-                        ratr_value &= 0x0000000d;
-                else
-                        ratr_value &= 0x0000000f;
-                break;
-        case WIRELESS_MODE_G:
-                ratr_value &= 0x00000FF5;
-                break;
-        case WIRELESS_MODE_N_24G:
-        case WIRELESS_MODE_N_5G:
-                nmode = 1;
-                if (mimo_ps == IEEE80211_SMPS_STATIC) {
-                        ratr_value &= 0x0007F005;
-                } else {
-                        u32 ratr_mask;
-
-                        if (get_rf_type(rtlphy) == RF_1T2R ||
-                            get_rf_type(rtlphy) == RF_1T1R)
-                                ratr_mask = 0x000ff005;
-                        else
-                                ratr_mask = 0x0f0ff005;
-                        ratr_value &= ratr_mask;
-                }
-                break;
-        default:
-                if (rtlphy->rf_type == RF_1T2R)
-                        ratr_value &= 0x000ff0ff;
-                else
-                        ratr_value &= 0x0f0ff0ff;
-                break;
-        }
-        if ((rtlpriv->btcoexist.bt_coexistence) &&
-            (rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4) &&
-            (rtlpriv->btcoexist.bt_cur_state) &&
-            (rtlpriv->btcoexist.bt_ant_isolation) &&
-            ((rtlpriv->btcoexist.bt_service == BT_SCO) ||
-             (rtlpriv->btcoexist.bt_service == BT_BUSY)))
-                ratr_value &= 0x0fffcfc0;
-        else
-                ratr_value &= 0x0FFFFFFF;
-
-        if (nmode && ((curtxbw_40mhz && curshortgi_40mhz) ||
-                      (!curtxbw_40mhz && curshortgi_20mhz))) {
-                ratr_value |= 0x10000000;
-                tmp_ratr_value = (ratr_value >> 12);
-
-                for (shortgi_rate = 15; shortgi_rate > 0; shortgi_rate--) {
-                        if ((1 << shortgi_rate) & tmp_ratr_value)
-                                break;
-                }
-                shortgi_rate = (shortgi_rate << 12) | (shortgi_rate << 8) |
-                               (shortgi_rate << 4) | (shortgi_rate);
-        }
-        rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
-
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 "%x\n", rtl_read_dword(rtlpriv, REG_ARFR0));
-}
-
 static u8 _rtl8723be_mrate_idx_to_arfr_id(struct ieee80211_hw *hw,
                                           u8 rate_index)
 {
         u8 ret = 0;
-
         switch (rate_index) {
         case RATR_INX_WIRELESS_NGB:
                 ret = 1;
@@ -2090,16 +2351,15 @@ static void rtl8723be_update_hal_rate_mask(struct ieee80211_hw *hw,
         u32 ratr_bitmap;
         u8 ratr_index;
         u8 curtxbw_40mhz = (sta->ht_cap.cap &
-                            IEEE80211_HT_CAP_SUP_WIDTH_20_40) ? 1 : 0;
+                              IEEE80211_HT_CAP_SUP_WIDTH_20_40) ? 1 : 0;
         u8 curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
-                               1 : 0;
+                                1 : 0;
         u8 curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
-                               1 : 0;
+                                1 : 0;
         enum wireless_mode wirelessmode = 0;
         bool shortgi = false;
         u8 rate_mask[7];
         u8 macid = 0;
-        u8 mimo_ps = IEEE80211_SMPS_OFF;
 
         sta_entry = (struct rtl_sta_info *)sta->drv_priv;
         wirelessmode = sta_entry->wireless_mode;
@@ -2135,55 +2395,40 @@ static void rtl8723be_update_hal_rate_mask(struct ieee80211_hw *hw,
                 else
                         ratr_bitmap &= 0x00000ff5;
                 break;
-        case WIRELESS_MODE_A:
-                ratr_index = RATR_INX_WIRELESS_A;
-                ratr_bitmap &= 0x00000ff0;
-                break;
         case WIRELESS_MODE_N_24G:
         case WIRELESS_MODE_N_5G:
                 ratr_index = RATR_INX_WIRELESS_NGB;
-
-                if (mimo_ps == IEEE80211_SMPS_STATIC  ||
-                    mimo_ps == IEEE80211_SMPS_DYNAMIC) {
-                        if (rssi_level == 1)
-                                ratr_bitmap &= 0x00070000;
-                        else if (rssi_level == 2)
-                                ratr_bitmap &= 0x0007f000;
-                        else
-                                ratr_bitmap &= 0x0007f005;
+                if (rtlphy->rf_type == RF_1T1R) {
+                        if (curtxbw_40mhz) {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x000f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x000ff000;
+                                else
+                                        ratr_bitmap &= 0x000ff015;
+                        } else {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x000f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x000ff000;
+                                else
+                                        ratr_bitmap &= 0x000ff005;
+                        }
                 } else {
-                        if (rtlphy->rf_type == RF_1T1R) {
-                                if (curtxbw_40mhz) {
-                                        if (rssi_level == 1)
-                                                ratr_bitmap &= 0x000f0000;
-                                        else if (rssi_level == 2)
-                                                ratr_bitmap &= 0x000ff000;
-                                        else
-                                                ratr_bitmap &= 0x000ff015;
-                                } else {
-                                        if (rssi_level == 1)
-                                                ratr_bitmap &= 0x000f0000;
-                                        else if (rssi_level == 2)
-                                                ratr_bitmap &= 0x000ff000;
-                                        else
-                                                ratr_bitmap &= 0x000ff005;
-                                }
+                        if (curtxbw_40mhz) {
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x0f8f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x0f8ff000;
+                                else
+                                        ratr_bitmap &= 0x0f8ff015;
                         } else {
-                                if (curtxbw_40mhz) {
-                                        if (rssi_level == 1)
-                                                ratr_bitmap &= 0x0f8f0000;
-                                        else if (rssi_level == 2)
-                                                ratr_bitmap &= 0x0f8ff000;
-                                        else
-                                                ratr_bitmap &= 0x0f8ff015;
-                                } else {
-                                        if (rssi_level == 1)
-                                                ratr_bitmap &= 0x0f8f0000;
-                                        else if (rssi_level == 2)
-                                                ratr_bitmap &= 0x0f8ff000;
-                                        else
-                                                ratr_bitmap &= 0x0f8ff005;
-                                }
+                                if (rssi_level == 1)
+                                        ratr_bitmap &= 0x0f8f0000;
+                                else if (rssi_level == 2)
+                                        ratr_bitmap &= 0x0f8ff000;
+                                else
+                                        ratr_bitmap &= 0x0f8ff005;
                         }
                 }
                 if ((curtxbw_40mhz && curshortgi_40mhz) ||
@@ -2203,18 +2448,17 @@ static void rtl8723be_update_hal_rate_mask(struct ieee80211_hw *hw,
                         ratr_bitmap &= 0x0f0ff0ff;
                 break;
         }
+
         sta_entry->ratr_index = ratr_index;
 
         RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
                  "ratr_bitmap :%x\n", ratr_bitmap);
-        *(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) | (ratr_index << 28);
+        *(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |
+                                       (ratr_index << 28);
         rate_mask[0] = macid;
         rate_mask[1] = _rtl8723be_mrate_idx_to_arfr_id(hw, ratr_index) |
-                                                       (shortgi ? 0x80 : 0x00);
+                                                      (shortgi ? 0x80 : 0x00);
         rate_mask[2] = curtxbw_40mhz;
-        /* if (prox_priv->proxim_modeinfo->power_output > 0)
-         *      rate_mask[2] |= BIT(6);
-         */
 
         rate_mask[3] = (u8)(ratr_bitmap & 0x000000ff);
         rate_mask[4] = (u8)((ratr_bitmap & 0x0000ff00) >> 8);
@@ -2228,7 +2472,7 @@ static void rtl8723be_update_hal_rate_mask(struct ieee80211_hw *hw,
                  rate_mask[2], rate_mask[3],
                  rate_mask[4], rate_mask[5],
                  rate_mask[6]);
-        rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_RA_MASK, 7, rate_mask);
+        rtl8723be_fill_h2c_cmd(hw, H2C_8723B_RA_MASK, 7, rate_mask);
         _rtl8723be_set_bcn_ctrl_reg(hw, BIT(3), 0);
 }
 
@@ -2239,8 +2483,6 @@ void rtl8723be_update_hal_rate_tbl(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         if (rtlpriv->dm.useramask)
                 rtl8723be_update_hal_rate_mask(hw, sta, rssi_level);
-        else
-                rtl8723be_update_hal_rate_table(hw, sta);
 }
 
 void rtl8723be_update_channel_access_setting(struct ieee80211_hw *hw)
@@ -2264,7 +2506,7 @@ bool rtl8723be_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;
         u8 u1tmp;
-        bool actuallyset = false;
+        bool b_actuallyset = false;
 
         if (rtlpriv->rtlhal.being_init_adapter)
                 return false;
@@ -2280,6 +2522,7 @@ bool rtl8723be_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
                 ppsc->rfchange_inprogress = true;
                 spin_unlock(&rtlpriv->locks.rf_ps_lock);
         }
+
         cur_rfstate = ppsc->rfpwr_state;
 
         rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2,
@@ -2292,24 +2535,23 @@ bool rtl8723be_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         else
                 e_rfpowerstate_toset = (u1tmp & BIT(1)) ? ERFON : ERFOFF;
 
-        if (ppsc->hwradiooff &&
-            (e_rfpowerstate_toset == ERFON)) {
+        if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          "GPIOChangeRF  - HW Radio ON, RF ON\n");
 
                 e_rfpowerstate_toset = ERFON;
                 ppsc->hwradiooff = false;
-                actuallyset = true;
-        } else if (!ppsc->hwradiooff &&
-                   (e_rfpowerstate_toset == ERFOFF)) {
+                b_actuallyset = true;
+        } else if (!ppsc->hwradiooff && (e_rfpowerstate_toset == ERFOFF)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
 
                 e_rfpowerstate_toset = ERFOFF;
                 ppsc->hwradiooff = true;
-                actuallyset = true;
+                b_actuallyset = true;
         }
-        if (actuallyset) {
+
+        if (b_actuallyset) {
                 spin_lock(&rtlpriv->locks.rf_ps_lock);
                 ppsc->rfchange_inprogress = false;
                 spin_unlock(&rtlpriv->locks.rf_ps_lock);
@@ -2321,8 +2563,10 @@ bool rtl8723be_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
                 ppsc->rfchange_inprogress = false;
                 spin_unlock(&rtlpriv->locks.rf_ps_lock);
         }
+
         *valid = 1;
         return !ppsc->hwradiooff;
+
 }
 
 void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index,
@@ -2363,6 +2607,7 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index,
                                 rtlpriv->sec.key_len[idx] = 0;
                         }
                 }
+
         } else {
                 switch (enc_algo) {
                 case WEP40_ENCRYPTION:
@@ -2378,7 +2623,7 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index,
                         enc_algo = CAM_AES;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                                  "switch case not process\n");
                         enc_algo = CAM_TKIP;
                         break;
@@ -2398,22 +2643,22 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index,
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv, COMP_SEC,
                                                          DBG_EMERG,
-                                                         "Can not find free"
-                                                         " hw security cam "
-                                                         "entry\n");
+                                                         "Can not find free hw security cam entry\n");
                                                 return;
                                         }
                                 } else {
                                         entry_id = CAM_PAIRWISE_KEY_POSITION;
                                 }
+
                                 key_index = PAIRWISE_KEYIDX;
                                 is_pairwise = true;
                         }
                 }
+
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                                  "delete one entry, entry_id is %d\n",
-                                 entry_id);
+                                  entry_id);
                         if (mac->opmode == NL80211_IFTYPE_AP)
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
@@ -2422,12 +2667,12 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index,
                                  "add one entry\n");
                         if (is_pairwise) {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         "set Pairwise key\n");
+                                         "set Pairwiase key\n");
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
-                                                      entry_id, enc_algo,
-                                                      CAM_CONFIG_NO_USEDK,
-                                                      rtlpriv->sec.key_buf[key_index]);
+                                               entry_id, enc_algo,
+                                               CAM_CONFIG_NO_USEDK,
+                                               rtlpriv->sec.key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                                          "set group key\n");
@@ -2442,10 +2687,11 @@ void rtl8723be_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                 rtlpriv->sec.key_buf
                                                 [entry_id]);
                                 }
+
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
-                                                      entry_id, enc_algo,
-                                                      CAM_CONFIG_NO_USEDK,
-                                                      rtlpriv->sec.key_buf[entry_id]);
+                                                entry_id, enc_algo,
+                                                CAM_CONFIG_NO_USEDK,
+                                                rtlpriv->sec.key_buf[entry_id]);
                         }
                 }
         }
@@ -2464,7 +2710,7 @@ void rtl8723be_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
                         rtlpriv->btcoexist.btc_info.btcoexist = 1;
                 else
                         rtlpriv->btcoexist.btc_info.btcoexist = 0;
-                value = hwinfo[RF_OPTION4];
+                value = hwinfo[EEPROM_RF_BT_SETTING_8723B];
                 rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8723B;
                 rtlpriv->btcoexist.btc_info.ant_num = (value & 0x1);
         } else {
@@ -2472,6 +2718,7 @@ void rtl8723be_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8723B;
                 rtlpriv->btcoexist.btc_info.ant_num = ANT_X2;
         }
+
 }
 
 void rtl8723be_bt_reg_init(struct ieee80211_hw *hw)
@@ -2492,6 +2739,7 @@ void rtl8723be_bt_hw_init(struct ieee80211_hw *hw)
 
         if (rtlpriv->cfg->ops->get_btc_status())
                 rtlpriv->btcoexist.btc_ops->btc_init_hw_config(rtlpriv);
+
 }
 
 void rtl8723be_suspend(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.h b/drivers/net/wireless/rtlwifi/rtl8723be/hw.h
index 64c7551af6b7..eae863d08de8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.h
@@ -59,4 +59,5 @@ void rtl8723be_bt_reg_init(struct ieee80211_hw *hw);
 void rtl8723be_bt_hw_init(struct ieee80211_hw *hw);
 void rtl8723be_suspend(struct ieee80211_hw *hw);
 void rtl8723be_resume(struct ieee80211_hw *hw);
+
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/led.c b/drivers/net/wireless/rtlwifi/rtl8723be/led.c
index cb931a38dc48..4196efb723a2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/led.c
@@ -42,7 +42,7 @@ void rtl8723be_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 "LedAddr:%X ledpin =%d\n", REG_LEDCFG2, pled->ledpin);
+                 "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
 
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
@@ -71,7 +71,7 @@ void rtl8723be_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
 
         RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 "LedAddr:%X ledpin =%d\n", REG_LEDCFG2, pled->ledpin);
+                 "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
 
@@ -100,7 +100,7 @@ void rtl8723be_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not processed\n");
+                         "switch case not process\n");
                 break;
         }
         pled->ledon = false;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/phy.c b/drivers/net/wireless/rtlwifi/rtl8723be/phy.c
index 1575ef9ece9f..20dcc25c506c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/phy.c
@@ -26,224 +26,28 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../ps.h"
-#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
 #include "../rtl8723com/phy_common.h"
 #include "rf.h"
 #include "dm.h"
+#include "../rtl8723com/dm_common.h"
 #include "table.h"
 #include "trx.h"
 
 static bool _rtl8723be_phy_bb8723b_config_parafile(struct ieee80211_hw *hw);
+static bool _rtl8723be_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
+static bool _rtl8723be_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
+                                                     u8 configtype);
 static bool _rtl8723be_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
                                                        u8 configtype);
-static bool rtl8723be_phy_sw_chn_step_by_step(struct ieee80211_hw *hw,
-                                              u8 channel, u8 *stage,
-                                              u8 *step, u32 *delay);
-static bool _rtl8723be_check_condition(struct ieee80211_hw *hw,
-                                       const u32  condition)
-{
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-        u32 _board = rtlefuse->board_type; /*need efuse define*/
-        u32 _interface = rtlhal->interface;
-        u32 _platform = 0x08;/*SupportPlatform */
-        u32 cond = condition;
-
-        if (condition == 0xCDCDCDCD)
-                return true;
-
-        cond = condition & 0xFF;
-        if ((_board & cond) == 0 && cond != 0x1F)
-                return false;
-
-        cond = condition & 0xFF00;
-        cond = cond >> 8;
-        if ((_interface & cond) == 0 && cond != 0x07)
-                return false;
-
-        cond = condition & 0xFF0000;
-        cond = cond >> 16;
-        if ((_platform & cond) == 0 && cond != 0x0F)
-                return false;
-        return true;
-}
-
-static bool _rtl8723be_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 i;
-        u32 arraylength;
-        u32 *ptrarray;
-
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read rtl8723beMACPHY_Array\n");
-        arraylength = RTL8723BEMAC_1T_ARRAYLEN;
-        ptrarray = RTL8723BEMAC_1T_ARRAY;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "Img:RTL8723bEMAC_1T_ARRAY LEN %d\n", arraylength);
-        for (i = 0; i < arraylength; i = i + 2)
-                rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
-        return true;
-}
-
-static bool _rtl8723be_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
-                                                     u8 configtype)
-{
-        #define READ_NEXT_PAIR(v1, v2, i) \
-                do { \
-                        i += 2; \
-                        v1 = array_table[i];\
-                        v2 = array_table[i+1]; \
-                } while (0)
-
-        int i;
-        u32 *array_table;
-        u16 arraylen;
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 v1 = 0, v2 = 0;
-
-        if (configtype == BASEBAND_CONFIG_PHY_REG) {
-                arraylen = RTL8723BEPHY_REG_1TARRAYLEN;
-                array_table = RTL8723BEPHY_REG_1TARRAY;
-
-                for (i = 0; i < arraylen; i = i + 2) {
-                        v1 = array_table[i];
-                        v2 = array_table[i+1];
-                        if (v1 < 0xcdcdcdcd) {
-                                rtl_bb_delay(hw, v1, v2);
-                        } else {/*This line is the start line of branch.*/
-                                if (!_rtl8723be_check_condition(hw, array_table[i])) {
-                                        /*Discard the following (offset, data) pairs*/
-                                        READ_NEXT_PAIR(v1, v2, i);
-                                        while (v2 != 0xDEAD &&
-                                               v2 != 0xCDEF &&
-                                               v2 != 0xCDCD &&
-                                               i < arraylen - 2) {
-                                                READ_NEXT_PAIR(v1, v2, i);
-                                        }
-                                        i -= 2; /* prevent from for-loop += 2*/
-                                /* Configure matched pairs and
-                                 * skip to end of if-else.
-                                 */
-                                } else {
-                                        READ_NEXT_PAIR(v1, v2, i);
-                                        while (v2 != 0xDEAD &&
-                                               v2 != 0xCDEF &&
-                                               v2 != 0xCDCD &&
-                                               i < arraylen - 2) {
-                                                rtl_bb_delay(hw,
-                                                                    v1, v2);
-                                                READ_NEXT_PAIR(v1, v2, i);
-                                        }
+static bool _rtl8723be_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+                                                u8 channel, u8 *stage,
+                                                u8 *step, u32 *delay);
 
-                                        while (v2 != 0xDEAD && i < arraylen - 2)
-                                                READ_NEXT_PAIR(v1, v2, i);
-                                }
-                        }
-                }
-        } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
-                arraylen = RTL8723BEAGCTAB_1TARRAYLEN;
-                array_table = RTL8723BEAGCTAB_1TARRAY;
-
-                for (i = 0; i < arraylen; i = i + 2) {
-                        v1 = array_table[i];
-                        v2 = array_table[i+1];
-                        if (v1 < 0xCDCDCDCD) {
-                                rtl_set_bbreg(hw, array_table[i],
-                                              MASKDWORD,
-                                              array_table[i + 1]);
-                                udelay(1);
-                                continue;
-                        } else {/*This line is the start line of branch.*/
-                                if (!_rtl8723be_check_condition(hw, array_table[i])) {
-                                        /* Discard the following
-                                         * (offset, data) pairs
-                                         */
-                                        READ_NEXT_PAIR(v1, v2, i);
-                                        while (v2 != 0xDEAD &&
-                                               v2 != 0xCDEF &&
-                                               v2 != 0xCDCD &&
-                                               i < arraylen - 2) {
-                                                READ_NEXT_PAIR(v1, v2, i);
-                                        }
-                                        i -= 2; /* prevent from for-loop += 2*/
-                                /*Configure matched pairs and
-                                 *skip to end of if-else.
-                                 */
-                                } else {
-                                        READ_NEXT_PAIR(v1, v2, i);
-                                        while (v2 != 0xDEAD &&
-                                               v2 != 0xCDEF &&
-                                               v2 != 0xCDCD &&
-                                               i < arraylen - 2) {
-                                                rtl_set_bbreg(hw, array_table[i],
-                                                              MASKDWORD,
-                                                              array_table[i + 1]);
-                                                udelay(1);
-                                                READ_NEXT_PAIR(v1, v2, i);
-                                        }
-
-                                        while (v2 != 0xDEAD && i < arraylen - 2)
-                                                READ_NEXT_PAIR(v1, v2, i);
-                                }
-                        }
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 "The agctab_array_table[0] is "
-                                  "%x Rtl818EEPHY_REGArray[1] is %x\n",
-                                  array_table[i], array_table[i + 1]);
-                }
-        }
-        return true;
-}
-
-static u8 _rtl8723be_get_rate_section_index(u32 regaddr)
-{
-        u8 index = 0;
-
-        switch (regaddr) {
-        case RTXAGC_A_RATE18_06:
-        case RTXAGC_B_RATE18_06:
-                index = 0;
-                break;
-        case RTXAGC_A_RATE54_24:
-        case RTXAGC_B_RATE54_24:
-                index = 1;
-                break;
-        case RTXAGC_A_CCK1_MCS32:
-        case RTXAGC_B_CCK1_55_MCS32:
-                index = 2;
-                break;
-        case RTXAGC_B_CCK11_A_CCK2_11:
-                index = 3;
-                break;
-        case RTXAGC_A_MCS03_MCS00:
-        case RTXAGC_B_MCS03_MCS00:
-                index = 4;
-                break;
-        case RTXAGC_A_MCS07_MCS04:
-        case RTXAGC_B_MCS07_MCS04:
-                index = 5;
-                break;
-        case RTXAGC_A_MCS11_MCS08:
-        case RTXAGC_B_MCS11_MCS08:
-                index = 6;
-                break;
-        case RTXAGC_A_MCS15_MCS12:
-        case RTXAGC_B_MCS15_MCS12:
-                index = 7;
-                break;
-        default:
-                regaddr &= 0xFFF;
-                if (regaddr >= 0xC20 && regaddr <= 0xC4C)
-                        index = (u8) ((regaddr - 0xC20) / 4);
-                else if (regaddr >= 0xE20 && regaddr <= 0xE4C)
-                        index = (u8) ((regaddr - 0xE20) / 4);
-                break;
-        };
-        return index;
-}
+static void rtl8723be_phy_set_rf_on(struct ieee80211_hw *hw);
+static void rtl8723be_phy_set_io(struct ieee80211_hw *hw);
 
 u32 rtl8723be_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
                                u32 regaddr, u32 bitmask)
@@ -265,9 +69,8 @@ u32 rtl8723be_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
         spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 "regaddr(%#x), rfpath(%#x), "
-                  "bitmask(%#x), original_value(%#x)\n",
-                  regaddr, rfpath, bitmask, original_value);
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
 
         return readback_value;
 }
@@ -300,6 +103,7 @@ void rtl8723be_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path path,
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                  "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                   regaddr, bitmask, data, path);
+
 }
 
 bool rtl8723be_phy_mac_config(struct ieee80211_hw *hw)
@@ -316,7 +120,7 @@ bool rtl8723be_phy_bb_config(struct ieee80211_hw *hw)
         bool rtstatus = true;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u16 regval;
-        u8 reg_hwparafile = 1;
+        u8 b_reg_hwparafile = 1;
         u32 tmp;
         u8 crystalcap = rtlpriv->efuse.crystalcap;
         rtl8723_phy_init_bb_rf_reg_def(hw);
@@ -333,7 +137,7 @@ bool rtl8723be_phy_bb_config(struct ieee80211_hw *hw)
 
         rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80);
 
-        if (reg_hwparafile == 1)
+        if (b_reg_hwparafile == 1)
                 rtstatus = _rtl8723be_phy_bb8723b_config_parafile(hw);
 
         crystalcap = crystalcap & 0x3F;
@@ -348,18 +152,49 @@ bool rtl8723be_phy_rf_config(struct ieee80211_hw *hw)
         return rtl8723be_phy_rf6052_config(hw);
 }
 
+static bool _rtl8723be_check_condition(struct ieee80211_hw *hw,
+                                       const u32  condition)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u32 _board = rtlefuse->board_type; /*need efuse define*/
+        u32 _interface = rtlhal->interface;
+        u32 _platform = 0x08;/*SupportPlatform */
+        u32 cond = condition;
+
+        if (condition == 0xCDCDCDCD)
+                return true;
+
+        cond = condition & 0xFF;
+        if ((_board & cond) == 0 && cond != 0x1F)
+                return false;
+
+        cond = condition & 0xFF00;
+        cond = cond >> 8;
+        if ((_interface & cond) == 0 && cond != 0x07)
+                return false;
+
+        cond = condition & 0xFF0000;
+        cond = cond >> 16;
+        if ((_platform & cond) == 0 && cond != 0x0F)
+                return false;
+        return true;
+}
+
 static void _rtl8723be_config_rf_reg(struct ieee80211_hw *hw, u32 addr,
                                      u32 data, enum radio_path rfpath,
                                      u32 regaddr)
 {
         if (addr == 0xfe || addr == 0xffe) {
+                /* In order not to disturb BT music
+                 *      when wifi init.(1ant NIC only)
+                 */
                 mdelay(50);
         } else {
                 rtl_set_rfreg(hw, rfpath, regaddr, RFREG_OFFSET_MASK, data);
                 udelay(1);
         }
 }
-
 static void _rtl8723be_config_rf_radio_a(struct ieee80211_hw *hw,
                                          u32 addr, u32 data)
 {
@@ -368,12 +203,13 @@ static void _rtl8723be_config_rf_radio_a(struct ieee80211_hw *hw,
 
         _rtl8723be_config_rf_reg(hw, addr, data, RF90_PATH_A,
                                  addr | maskforphyset);
+
 }
 
 static void _rtl8723be_phy_init_tx_power_by_rate(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
         u8 band, path, txnum, section;
 
@@ -383,16 +219,38 @@ static void _rtl8723be_phy_init_tx_power_by_rate(struct ieee80211_hw *hw)
                                 for (section = 0;
                                      section < TX_PWR_BY_RATE_NUM_SECTION;
                                      ++section)
-                                        rtlphy->tx_power_by_rate_offset[band]
-                                                [path][txnum][section] = 0;
+                                        rtlphy->tx_power_by_rate_offset
+                                          [band][path][txnum][section] = 0;
+}
+
+static void _rtl8723be_config_bb_reg(struct ieee80211_hw *hw,
+                                     u32 addr, u32 data)
+{
+        if (addr == 0xfe) {
+                mdelay(50);
+        } else if (addr == 0xfd) {
+                mdelay(5);
+        } else if (addr == 0xfc) {
+                mdelay(1);
+        } else if (addr == 0xfb) {
+                udelay(50);
+        } else if (addr == 0xfa) {
+                udelay(5);
+        } else if (addr == 0xf9) {
+                udelay(1);
+        } else {
+                rtl_set_bbreg(hw, addr, MASKDWORD, data);
+                udelay(1);
+        }
 }
 
-static void phy_set_txpwr_by_rate_base(struct ieee80211_hw *hw, u8 band,
-                                       u8 path, u8 rate_section,
-                                       u8 txnum, u8 value)
+static void _rtl8723be_phy_set_txpower_by_rate_base(struct ieee80211_hw *hw,
+                                                    u8 band,
+                                                    u8 path, u8 rate_section,
+                                                    u8 txnum, u8 value)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
         if (path > RF90_PATH_D) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
@@ -417,23 +275,24 @@ static void phy_set_txpwr_by_rate_base(struct ieee80211_hw *hw, u8 band,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 "Invalid RateSection %d in Band 2.4G, Rf Path"
-                                  " %d, %dTx in PHY_SetTxPowerByRateBase()\n",
-                                  rate_section, path, txnum);
+                                 "Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in PHY_SetTxPowerByRateBase()\n",
+                                 rate_section, path, txnum);
                         break;
                 };
         } else {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "Invalid Band %d in PHY_SetTxPowerByRateBase()\n",
-                          band);
+                         band);
         }
+
 }
 
-static u8 phy_get_txpwr_by_rate_base(struct ieee80211_hw *hw, u8 band, u8 path,
-                                     u8 txnum, u8 rate_section)
+static u8 _rtl8723be_phy_get_txpower_by_rate_base(struct ieee80211_hw *hw,
+                                                  u8 band, u8 path, u8 txnum,
+                                                  u8 rate_section)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u8 value = 0;
         if (path > RF90_PATH_D) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
@@ -458,15 +317,14 @@ static u8 phy_get_txpwr_by_rate_base(struct ieee80211_hw *hw, u8 band, u8 path,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 "Invalid RateSection %d in Band 2.4G, Rf Path"
-                                  " %d, %dTx in PHY_GetTxPowerByRateBase()\n",
-                                  rate_section, path, txnum);
+                                 "Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
+                                 rate_section, path, txnum);
                         break;
                 };
         } else {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "Invalid Band %d in PHY_GetTxPowerByRateBase()\n",
-                          band);
+                         band);
         }
 
         return value;
@@ -475,45 +333,51 @@ static u8 phy_get_txpwr_by_rate_base(struct ieee80211_hw *hw, u8 band, u8 path,
 static void _rtl8723be_phy_store_txpower_by_rate_base(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        u16 raw_value = 0;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u16 rawvalue = 0;
         u8 base = 0, path = 0;
 
         for (path = RF90_PATH_A; path <= RF90_PATH_B; ++path) {
                 if (path == RF90_PATH_A) {
-                        raw_value = (u16) (rtlphy->tx_power_by_rate_offset
+                        rawvalue = (u16)(rtlphy->tx_power_by_rate_offset
                                 [BAND_ON_2_4G][path][RF_1TX][3] >> 24) & 0xFF;
-                        base = (raw_value >> 4) * 10 + (raw_value & 0xF);
-                        phy_set_txpwr_by_rate_base(hw, BAND_ON_2_4G, path, CCK,
-                                                   RF_1TX, base);
+                        base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
+                        _rtl8723be_phy_set_txpower_by_rate_base(hw,
+                                BAND_ON_2_4G, path, CCK, RF_1TX, base);
                 } else if (path == RF90_PATH_B) {
-                        raw_value = (u16) (rtlphy->tx_power_by_rate_offset
+                        rawvalue = (u16)(rtlphy->tx_power_by_rate_offset
                                 [BAND_ON_2_4G][path][RF_1TX][3] >> 0) & 0xFF;
-                        base = (raw_value >> 4) * 10 + (raw_value & 0xF);
-                        phy_set_txpwr_by_rate_base(hw, BAND_ON_2_4G, path,
-                                                   CCK, RF_1TX, base);
+                        base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
+                        _rtl8723be_phy_set_txpower_by_rate_base(hw,
+                                                                BAND_ON_2_4G,
+                                                                path, CCK,
+                                                                RF_1TX, base);
                 }
-                raw_value = (u16) (rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                                          [path][RF_1TX][1] >> 24) & 0xFF;
-                base = (raw_value >> 4) * 10 + (raw_value & 0xF);
-                phy_set_txpwr_by_rate_base(hw, BAND_ON_2_4G, path, OFDM, RF_1TX,
-                                           base);
-
-                raw_value = (u16) (rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                                          [path][RF_1TX][5] >> 24) & 0xFF;
-                base = (raw_value >> 4) * 10 + (raw_value & 0xF);
-                phy_set_txpwr_by_rate_base(hw, BAND_ON_2_4G, path, HT_MCS0_MCS7,
-                                           RF_1TX, base);
-
-                raw_value = (u16) (rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                                          [path][RF_2TX][7] >> 24) & 0xFF;
-                base = (raw_value >> 4) * 10 + (raw_value & 0xF);
-                phy_set_txpwr_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][1] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
+                _rtl8723be_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][5] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
+                _rtl8723be_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][7] >> 24) & 0xFF;
+                base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
+                _rtl8723be_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G,
+                                                        path, HT_MCS8_MCS15,
+                                                        RF_2TX, base);
         }
 }
 
-static void phy_conv_dbm_to_rel(u32 *data, u8 start, u8 end, u8 base_val)
+static void _phy_convert_txpower_dbm_to_relative_value(u32 *data, u8 start,
+                                                u8 end, u8 base_val)
 {
         char i = 0;
         u8 temp_value = 0;
@@ -522,15 +386,15 @@ static void phy_conv_dbm_to_rel(u32 *data, u8 start, u8 end, u8 base_val)
         for (i = 3; i >= 0; --i) {
                 if (i >= start && i <= end) {
                         /* Get the exact value */
-                        temp_value = (u8) (*data >> (i * 8)) & 0xF;
-                        temp_value += ((u8) ((*data >> (i*8 + 4)) & 0xF)) * 10;
+                        temp_value = (u8)(*data >> (i * 8)) & 0xF;
+                        temp_value += ((u8)((*data >> (i*8 + 4)) & 0xF)) * 10;
 
                         /* Change the value to a relative value */
                         temp_value = (temp_value > base_val) ?
                                      temp_value - base_val :
                                      base_val - temp_value;
                 } else {
-                        temp_value = (u8) (*data >> (i * 8)) & 0xFF;
+                        temp_value = (u8)(*data >> (i * 8)) & 0xFF;
                 }
                 temp_data <<= 8;
                 temp_data |= temp_value;
@@ -538,56 +402,65 @@ static void phy_conv_dbm_to_rel(u32 *data, u8 start, u8 end, u8 base_val)
         *data = temp_data;
 }
 
-static void conv_dbm_to_rel(struct ieee80211_hw *hw)
+static void _rtl8723be_phy_convert_txpower_dbm_to_relative_value(
+                                                        struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u8 base = 0, rfpath = RF90_PATH_A;
 
-        base = phy_get_txpwr_by_rate_base(hw, BAND_ON_2_4G, rfpath,
-                                          RF_1TX, CCK);
-        phy_conv_dbm_to_rel(&(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                            [rfpath][RF_1TX][2]), 1, 1, base);
-        phy_conv_dbm_to_rel(&(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                            [rfpath][RF_1TX][3]), 1, 3, base);
-
-        base = phy_get_txpwr_by_rate_base(hw, BAND_ON_2_4G, rfpath,
-                                          RF_1TX, OFDM);
-        phy_conv_dbm_to_rel(&(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                            [rfpath][RF_1TX][0]), 0, 3, base);
-        phy_conv_dbm_to_rel(&(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                            [rfpath][RF_1TX][1]), 0, 3, base);
-
-        base = phy_get_txpwr_by_rate_base(hw, BAND_ON_2_4G, rfpath,
-                                          RF_1TX, HT_MCS0_MCS7);
-        phy_conv_dbm_to_rel(&(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                            [rfpath][RF_1TX][4]), 0, 3, base);
-        phy_conv_dbm_to_rel(&(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                            [rfpath][RF_1TX][5]), 0, 3, base);
-
-        base = phy_get_txpwr_by_rate_base(hw, BAND_ON_2_4G, rfpath,
-                                          RF_2TX, HT_MCS8_MCS15);
-        phy_conv_dbm_to_rel(&(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                            [rfpath][RF_2TX][6]), 0, 3, base);
-
-        phy_conv_dbm_to_rel(&(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G]
-                            [rfpath][RF_2TX][7]), 0, 3, base);
+        base = _rtl8723be_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][2],
+            1, 1, base);
+        _phy_convert_txpower_dbm_to_relative_value(
+            &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][3],
+            1, 3, base);
+
+        base = _rtl8723be_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][0],
+            0, 3, base);
+        _phy_convert_txpower_dbm_to_relative_value(
+            &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][1],
+            0, 3, base);
+
+        base = _rtl8723be_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][4],
+            0, 3, base);
+        _phy_convert_txpower_dbm_to_relative_value(
+            &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][5],
+            0, 3, base);
+
+        base = _rtl8723be_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][6],
+            0, 3, base);
+
+        _phy_convert_txpower_dbm_to_relative_value(
+            &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][7],
+            0, 3, base);
 
         RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                 "<=== conv_dbm_to_rel()\n");
+            "<===_rtl8723be_phy_convert_txpower_dbm_to_relative_value()\n");
 }
 
-static void _rtl8723be_phy_txpower_by_rate_configuration(
-                                                        struct ieee80211_hw *hw)
+static void phy_txpower_by_rate_config(struct ieee80211_hw *hw)
 {
         _rtl8723be_phy_store_txpower_by_rate_base(hw);
-        conv_dbm_to_rel(hw);
+        _rtl8723be_phy_convert_txpower_dbm_to_relative_value(hw);
 }
 
 static bool _rtl8723be_phy_bb8723b_config_parafile(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         bool rtstatus;
 
@@ -603,7 +476,7 @@ static bool _rtl8723be_phy_bb8723b_config_parafile(struct ieee80211_hw *hw)
                 rtstatus = _rtl8723be_phy_config_bb_with_pgheaderfile(hw,
                                                 BASEBAND_CONFIG_PHY_REG);
         }
-        _rtl8723be_phy_txpower_by_rate_configuration(hw);
+        phy_txpower_by_rate_config(hw);
         if (!rtstatus) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!");
                 return false;
@@ -614,39 +487,237 @@ static bool _rtl8723be_phy_bb8723b_config_parafile(struct ieee80211_hw *hw)
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
                 return false;
         }
-        rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
-                                                       RFPGA0_XA_HSSIPARAMETER2,
-                                                       0x200));
+        rtlphy->cck_high_power = (bool)(rtl_get_bbreg(hw,
+                                                      RFPGA0_XA_HSSIPARAMETER2,
+                                                      0x200));
         return true;
 }
 
+static bool _rtl8723be_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+        u32 arraylength;
+        u32 *ptrarray;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read rtl8723beMACPHY_Array\n");
+        arraylength = RTL8723BEMAC_1T_ARRAYLEN;
+        ptrarray = RTL8723BEMAC_1T_ARRAY;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Img:RTL8723bEMAC_1T_ARRAY LEN %d\n", arraylength);
+        for (i = 0; i < arraylength; i = i + 2)
+                rtl_write_byte(rtlpriv, ptrarray[i], (u8)ptrarray[i + 1]);
+        return true;
+}
+
+static bool _rtl8723be_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
+                                                     u8 configtype)
+{
+        #define READ_NEXT_PAIR(v1, v2, i) \
+                do { \
+                        i += 2; \
+                        v1 = array_table[i];\
+                        v2 = array_table[i+1]; \
+                } while (0)
+
+        int i;
+        u32 *array_table;
+        u16 arraylen;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 v1 = 0, v2 = 0;
+
+        if (configtype == BASEBAND_CONFIG_PHY_REG) {
+                arraylen = RTL8723BEPHY_REG_1TARRAYLEN;
+                array_table = RTL8723BEPHY_REG_1TARRAY;
+
+                for (i = 0; i < arraylen; i = i + 2) {
+                        v1 = array_table[i];
+                        v2 = array_table[i+1];
+                        if (v1 < 0xcdcdcdcd) {
+                                _rtl8723be_config_bb_reg(hw, v1, v2);
+                        } else {/*This line is the start line of branch.*/
+                                /* to protect READ_NEXT_PAIR not overrun */
+                                if (i >= arraylen - 2)
+                                        break;
+
+                                if (!_rtl8723be_check_condition(hw,
+                                                array_table[i])) {
+                                        /*Discard the following
+                                         *(offset, data) pairs
+                                         */
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < arraylen - 2) {
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                        }
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                /*Configure matched pairs and
+                                 *skip to end of if-else.
+                                 */
+                                } else {
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < arraylen - 2) {
+                                                _rtl8723be_config_bb_reg(hw,
+                                                                    v1, v2);
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < arraylen - 2)
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                }
+                        }
+                }
+        } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
+                arraylen = RTL8723BEAGCTAB_1TARRAYLEN;
+                array_table = RTL8723BEAGCTAB_1TARRAY;
+
+                for (i = 0; i < arraylen; i = i + 2) {
+                        v1 = array_table[i];
+                        v2 = array_table[i+1];
+                        if (v1 < 0xCDCDCDCD) {
+                                rtl_set_bbreg(hw, array_table[i],
+                                              MASKDWORD,
+                                              array_table[i + 1]);
+                                udelay(1);
+                                continue;
+                        } else {/*This line is the start line of branch.*/
+                                /* to protect READ_NEXT_PAIR not overrun */
+                                if (i >= arraylen - 2)
+                                        break;
+
+                                if (!_rtl8723be_check_condition(hw,
+                                        array_table[i])) {
+                                        /*Discard the following
+                                         *(offset, data) pairs
+                                         */
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < arraylen - 2) {
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                        }
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                /*Configure matched pairs and
+                                 *skip to end of if-else.
+                                 */
+                                } else {
+                                        READ_NEXT_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < arraylen - 2) {
+                                                rtl_set_bbreg(hw, array_table[i],
+                                                              MASKDWORD,
+                                                              array_table[i + 1]);
+                                                udelay(1);
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < arraylen - 2)
+                                                READ_NEXT_PAIR(v1, v2, i);
+                                }
+                        }
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                 "The agctab_array_table[0] is %x Rtl818EEPHY_REGArray[1] is %x\n",
+                                 array_table[i], array_table[i + 1]);
+                }
+        }
+        return true;
+}
+
+static u8 _rtl8723be_get_rate_section_index(u32 regaddr)
+{
+        u8 index = 0;
+
+        switch (regaddr) {
+        case RTXAGC_A_RATE18_06:
+                index = 0;
+        break;
+        case RTXAGC_A_RATE54_24:
+                index = 1;
+        break;
+        case RTXAGC_A_CCK1_MCS32:
+                index = 2;
+        break;
+        case RTXAGC_B_CCK11_A_CCK2_11:
+                index = 3;
+        break;
+        case RTXAGC_A_MCS03_MCS00:
+                index = 4;
+        break;
+        case RTXAGC_A_MCS07_MCS04:
+                index = 5;
+        break;
+        case RTXAGC_A_MCS11_MCS08:
+                index = 6;
+        break;
+        case RTXAGC_A_MCS15_MCS12:
+                index = 7;
+        break;
+        case RTXAGC_B_RATE18_06:
+                index = 0;
+        break;
+        case RTXAGC_B_RATE54_24:
+                index = 1;
+        break;
+        case RTXAGC_B_CCK1_55_MCS32:
+                index = 2;
+        break;
+        case RTXAGC_B_MCS03_MCS00:
+                index = 4;
+        break;
+        case RTXAGC_B_MCS07_MCS04:
+                index = 5;
+        break;
+        case RTXAGC_B_MCS11_MCS08:
+                index = 6;
+        break;
+        case RTXAGC_B_MCS15_MCS12:
+                index = 7;
+        break;
+        default:
+                regaddr &= 0xFFF;
+                if (regaddr >= 0xC20 && regaddr <= 0xC4C)
+                        index = (u8)((regaddr - 0xC20) / 4);
+                else if (regaddr >= 0xE20 && regaddr <= 0xE4C)
+                        index = (u8)((regaddr - 0xE20) / 4);
+                break;
+        };
+        return index;
+}
+
 static void _rtl8723be_store_tx_power_by_rate(struct ieee80211_hw *hw,
                                               u32 band, u32 rfpath,
                                               u32 txnum, u32 regaddr,
                                               u32 bitmask, u32 data)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u8 rate_section = _rtl8723be_get_rate_section_index(regaddr);
 
         if (band != BAND_ON_2_4G && band != BAND_ON_5G) {
-                RT_TRACE(rtlpriv, COMP_POWER, PHY_TXPWR,
-                         "Invalid Band %d\n", band);
+                RT_TRACE(rtlpriv, FPHY, PHY_TXPWR, "Invalid Band %d\n", band);
                 return;
         }
-
-        if (rfpath > TX_PWR_BY_RATE_NUM_RF) {
-                RT_TRACE(rtlpriv, COMP_POWER, PHY_TXPWR,
+        if (rfpath > MAX_RF_PATH - 1) {
+                RT_TRACE(rtlpriv, FPHY, PHY_TXPWR,
                          "Invalid RfPath %d\n", rfpath);
                 return;
         }
-        if (txnum > TX_PWR_BY_RATE_NUM_RF) {
-                RT_TRACE(rtlpriv, COMP_POWER, PHY_TXPWR,
-                         "Invalid TxNum %d\n", txnum);
+        if (txnum > MAX_RF_PATH - 1) {
+                RT_TRACE(rtlpriv, FPHY, PHY_TXPWR, "Invalid TxNum %d\n", txnum);
                 return;
         }
+
         rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section] =
                                                                         data;
+
 }
 
 static bool _rtl8723be_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
@@ -678,21 +749,6 @@ static bool _rtl8723be_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
                                         _rtl8723be_store_tx_power_by_rate(hw,
                                                         v1, v2, v3, v4, v5, v6);
                                 continue;
-                        } else {
-                                /*don't need the hw_body*/
-                                if (!_rtl8723be_check_condition(hw,
-                                                phy_regarray_table_pg[i])) {
-                                        i += 2; /* skip the pair of expression*/
-                                        v1 = phy_regarray_table_pg[i];
-                                        v2 = phy_regarray_table_pg[i+1];
-                                        v3 = phy_regarray_table_pg[i+2];
-                                        while (v2 != 0xDEAD) {
-                                                i += 3;
-                                                v1 = phy_regarray_table_pg[i];
-                                                v2 = phy_regarray_table_pg[i+1];
-                                                v3 = phy_regarray_table_pg[i+2];
-                                        }
-                                }
                         }
                 }
         } else {
@@ -733,22 +789,27 @@ bool rtl8723be_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                         v2 = radioa_array_table[i+1];
                         if (v1 < 0xcdcdcdcd) {
                                 _rtl8723be_config_rf_radio_a(hw, v1, v2);
-                        } else { /*This line is the start line of branch.*/
+                        } else {/*This line is the start line of branch.*/
+                                /* to protect READ_NEXT_PAIR not overrun */
+                                if (i >= radioa_arraylen - 2)
+                                        break;
+
                                 if (!_rtl8723be_check_condition(hw,
                                                 radioa_array_table[i])) {
-                                        /* Discard the following
-                                         * (offset, data) pairs
+                                        /*Discard the following
+                                         *(offset, data) pairs
                                          */
                                         READ_NEXT_RF_PAIR(v1, v2, i);
                                         while (v2 != 0xDEAD &&
                                                v2 != 0xCDEF &&
                                                v2 != 0xCDCD &&
-                                               i < radioa_arraylen - 2)
+                                               i < radioa_arraylen - 2) {
                                                 READ_NEXT_RF_PAIR(v1, v2, i);
+                                        }
                                         i -= 2; /* prevent from for-loop += 2*/
                                 } else {
-                                        /* Configure matched pairs
-                                         * and skip to end of if-else.
+                                        /*Configure matched pairs
+                                         *and skip to end of if-else.
                                          */
                                         READ_NEXT_RF_PAIR(v1, v2, i);
                                         while (v2 != 0xDEAD &&
@@ -770,18 +831,12 @@ bool rtl8723be_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
 
                 if (rtlhal->oem_id == RT_CID_819X_HP)
                         _rtl8723be_config_rf_radio_a(hw, 0x52, 0x7E4BD);
-
                 break;
         case RF90_PATH_B:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not process\n");
-                break;
         case RF90_PATH_C:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not process\n");
                 break;
         case RF90_PATH_D:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                          "switch case not process\n");
                 break;
         }
@@ -791,26 +846,25 @@ bool rtl8723be_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
 void rtl8723be_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
         rtlphy->default_initialgain[0] =
-            (u8) rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
+            (u8)rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
         rtlphy->default_initialgain[1] =
-            (u8) rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
+            (u8)rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
         rtlphy->default_initialgain[2] =
-            (u8) rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
+            (u8)rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
         rtlphy->default_initialgain[3] =
-            (u8) rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
+            (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 "Default initial gain (c50 = 0x%x, "
-                  "c58 = 0x%x, c60 = 0x%x, c68 = 0x%x\n",
-                  rtlphy->default_initialgain[0],
-                  rtlphy->default_initialgain[1],
-                  rtlphy->default_initialgain[2],
-                  rtlphy->default_initialgain[3]);
-
-        rtlphy->framesync = (u8) rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+                 rtlphy->default_initialgain[0],
+                 rtlphy->default_initialgain[1],
+                 rtlphy->default_initialgain[2],
+                 rtlphy->default_initialgain[3]);
+
+        rtlphy->framesync = (u8)rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
                                                MASKBYTE0);
         rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
                                               MASKDWORD);
@@ -823,7 +877,7 @@ void rtl8723be_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
 void rtl8723be_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u8 txpwr_level;
         long txpwr_dbm;
 
@@ -854,6 +908,7 @@ static u8 _rtl8723be_phy_get_ratesection_intxpower_byrate(enum radio_path path,
         case DESC92C_RATE1M:
                 rate_section = 2;
                 break;
+
         case DESC92C_RATE2M:
         case DESC92C_RATE5_5M:
                 if (path == RF90_PATH_A)
@@ -861,49 +916,58 @@ static u8 _rtl8723be_phy_get_ratesection_intxpower_byrate(enum radio_path path,
                 else if (path == RF90_PATH_B)
                         rate_section = 2;
                 break;
+
         case DESC92C_RATE11M:
                 rate_section = 3;
                 break;
+
         case DESC92C_RATE6M:
         case DESC92C_RATE9M:
         case DESC92C_RATE12M:
         case DESC92C_RATE18M:
                 rate_section = 0;
                 break;
+
         case DESC92C_RATE24M:
         case DESC92C_RATE36M:
         case DESC92C_RATE48M:
         case DESC92C_RATE54M:
                 rate_section = 1;
                 break;
+
         case DESC92C_RATEMCS0:
         case DESC92C_RATEMCS1:
         case DESC92C_RATEMCS2:
         case DESC92C_RATEMCS3:
                 rate_section = 4;
                 break;
+
         case DESC92C_RATEMCS4:
         case DESC92C_RATEMCS5:
         case DESC92C_RATEMCS6:
         case DESC92C_RATEMCS7:
                 rate_section = 5;
                 break;
+
         case DESC92C_RATEMCS8:
         case DESC92C_RATEMCS9:
         case DESC92C_RATEMCS10:
         case DESC92C_RATEMCS11:
                 rate_section = 6;
                 break;
+
         case DESC92C_RATEMCS12:
         case DESC92C_RATEMCS13:
         case DESC92C_RATEMCS14:
         case DESC92C_RATEMCS15:
                 rate_section = 7;
                 break;
+
         default:
                 RT_ASSERT(true, "Rate_Section is Illegal\n");
                 break;
         }
+
         return rate_section;
 }
 
@@ -912,7 +976,7 @@ static u8 _rtl8723be_get_txpower_by_rate(struct ieee80211_hw *hw,
                                          enum radio_path rfpath, u8 rate)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u8 shift = 0, rate_section, tx_num;
         char tx_pwr_diff = 0;
 
@@ -988,7 +1052,7 @@ static u8 _rtl8723be_get_txpower_index(struct ieee80211_hw *hw, u8 path,
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Illegal channel!\n");
         }
-        if (RTL8723E_RX_HAL_IS_CCK_RATE(rate))
+        if (RX_HAL_IS_CCK_RATE(rate))
                 txpower = rtlefuse->txpwrlevel_cck[path][index];
         else if (DESC92C_RATE6M <= rate)
                 txpower = rtlefuse->txpwrlevel_ht40_1s[path][index];
@@ -997,7 +1061,7 @@ static u8 _rtl8723be_get_txpower_index(struct ieee80211_hw *hw, u8 path,
                          "invalid rate\n");
 
         if (DESC92C_RATE6M <= rate && rate <= DESC92C_RATE54M &&
-            !RTL8723E_RX_HAL_IS_CCK_RATE(rate))
+            !RX_HAL_IS_CCK_RATE(rate))
                 txpower += rtlefuse->txpwr_legacyhtdiff[0][TX_1S];
 
         if (bandwidth == HT_CHANNEL_WIDTH_20) {
@@ -1011,6 +1075,7 @@ static u8 _rtl8723be_get_txpower_index(struct ieee80211_hw *hw, u8 path,
                 if (DESC92C_RATEMCS8 <= rate && rate <= DESC92C_RATEMCS15)
                         txpower += rtlefuse->txpwr_ht40diff[0][TX_2S];
         }
+
         if (rtlefuse->eeprom_regulatory != 2)
                 power_diff_byrate = _rtl8723be_get_txpower_by_rate(hw,
                                                                    BAND_ON_2_4G,
@@ -1046,6 +1111,7 @@ static void _rtl8723be_phy_set_txpower_index(struct ieee80211_hw *hw,
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_B_CCK11_A_CCK2_11,
                                                MASKBYTE3, power_index);
                         break;
+
                 case DESC92C_RATE6M:
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_RATE18_06,
                                                MASKBYTE0, power_index);
@@ -1062,6 +1128,7 @@ static void _rtl8723be_phy_set_txpower_index(struct ieee80211_hw *hw,
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_RATE18_06,
                                                MASKBYTE3, power_index);
                         break;
+
                 case DESC92C_RATE24M:
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_RATE54_24,
                                                MASKBYTE0, power_index);
@@ -1078,6 +1145,7 @@ static void _rtl8723be_phy_set_txpower_index(struct ieee80211_hw *hw,
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_RATE54_24,
                                                MASKBYTE3, power_index);
                         break;
+
                 case DESC92C_RATEMCS0:
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_MCS03_MCS00,
                                                MASKBYTE0, power_index);
@@ -1094,6 +1162,7 @@ static void _rtl8723be_phy_set_txpower_index(struct ieee80211_hw *hw,
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_MCS03_MCS00,
                                                MASKBYTE3, power_index);
                         break;
+
                 case DESC92C_RATEMCS4:
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_MCS07_MCS04,
                                                MASKBYTE0, power_index);
@@ -1110,6 +1179,7 @@ static void _rtl8723be_phy_set_txpower_index(struct ieee80211_hw *hw,
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_MCS07_MCS04,
                                                MASKBYTE3, power_index);
                         break;
+
                 case DESC92C_RATEMCS8:
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_MCS11_MCS08,
                                                MASKBYTE0, power_index);
@@ -1126,9 +1196,9 @@ static void _rtl8723be_phy_set_txpower_index(struct ieee80211_hw *hw,
                         rtl8723_phy_set_bb_reg(hw, RTXAGC_A_MCS11_MCS08,
                                                MASKBYTE3, power_index);
                         break;
+
                 default:
-                        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 "Invalid Rate!!\n");
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Invalid Rate!!\n");
                         break;
                 }
         } else {
@@ -1192,10 +1262,11 @@ void rtl8723be_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
 
         if (!is_hal_stop(rtlhal)) {
                 switch (operation) {
-                case SCAN_OPT_BACKUP:
-                        iotype = IO_CMD_PAUSE_DM_BY_SCAN;
+                case SCAN_OPT_BACKUP_BAND0:
+                        iotype = IO_CMD_PAUSE_BAND0_DM_BY_SCAN;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_IO_CMD,
                                                       (u8 *)&iotype);
+
                         break;
                 case SCAN_OPT_RESTORE:
                         iotype = IO_CMD_RESUME_DM_BY_SCAN;
@@ -1214,15 +1285,15 @@ void rtl8723be_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u8 reg_bw_opmode;
         u8 reg_prsr_rsc;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
                  "Switch to %s bandwidth\n",
-                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                 "20MHz" : "40MHz");
+                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                  "20MHz" : "40MHz");
 
         if (is_hal_stop(rtlhal)) {
                 rtlphy->set_bwmode_inprogress = false;
@@ -1254,13 +1325,17 @@ void rtl8723be_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
         case HT_CHANNEL_WIDTH_20:
                 rtl_set_bbreg(hw, RFPGA0_RFMOD, BRFMOD, 0x0);
                 rtl_set_bbreg(hw, RFPGA1_RFMOD, BRFMOD, 0x0);
+        /*      rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER2, BIT(10), 1);*/
                 break;
         case HT_CHANNEL_WIDTH_20_40:
                 rtl_set_bbreg(hw, RFPGA0_RFMOD, BRFMOD, 0x1);
                 rtl_set_bbreg(hw, RFPGA1_RFMOD, BRFMOD, 0x1);
+
                 rtl_set_bbreg(hw, RCCK0_SYSTEM, BCCK_SIDEBAND,
                               (mac->cur_40_prime_sc >> 1));
                 rtl_set_bbreg(hw, ROFDM1_LSTF, 0xC00, mac->cur_40_prime_sc);
+                /*rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER2, BIT(10), 0);*/
+
                 rtl_set_bbreg(hw, 0x818, (BIT(26) | BIT(27)),
                               (mac->cur_40_prime_sc ==
                                HAL_PRIME_CHNL_OFFSET_LOWER) ? 2 : 1);
@@ -1279,7 +1354,7 @@ void rtl8723be_phy_set_bw_mode(struct ieee80211_hw *hw,
                             enum nl80211_channel_type ch_type)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 tmp_bw = rtlphy->current_chan_bw;
 
@@ -1300,7 +1375,7 @@ void rtl8723be_phy_sw_chnl_callback(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u32 delay;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
@@ -1310,11 +1385,11 @@ void rtl8723be_phy_sw_chnl_callback(struct ieee80211_hw *hw)
         do {
                 if (!rtlphy->sw_chnl_inprogress)
                         break;
-                if (!rtl8723be_phy_sw_chn_step_by_step(hw,
-                                                       rtlphy->current_channel,
-                                                       &rtlphy->sw_chnl_stage,
-                                                       &rtlphy->sw_chnl_step,
-                                                       &delay)) {
+                if (!_rtl8723be_phy_sw_chnl_step_by_step(hw,
+                                                         rtlphy->current_channel,
+                                                         &rtlphy->sw_chnl_stage,
+                                                         &rtlphy->sw_chnl_step,
+                                                         &delay)) {
                         if (delay > 0)
                                 mdelay(delay);
                         else
@@ -1330,7 +1405,7 @@ void rtl8723be_phy_sw_chnl_callback(struct ieee80211_hw *hw)
 u8 rtl8723be_phy_sw_chnl(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
         if (rtlphy->sw_chnl_inprogress)
@@ -1345,25 +1420,23 @@ u8 rtl8723be_phy_sw_chnl(struct ieee80211_hw *hw)
         if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
                 rtl8723be_phy_sw_chnl_callback(hw);
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         "sw_chnl_inprogress false schdule "
-                          "workitem current channel %d\n",
-                          rtlphy->current_channel);
+                         "sw_chnl_inprogress false schdule workitem current channel %d\n",
+                         rtlphy->current_channel);
                 rtlphy->sw_chnl_inprogress = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         "sw_chnl_inprogress false driver sleep or"
-                          " unload\n");
+                         "sw_chnl_inprogress false driver sleep or unload\n");
                 rtlphy->sw_chnl_inprogress = false;
         }
         return 1;
 }
 
-static bool rtl8723be_phy_sw_chn_step_by_step(struct ieee80211_hw *hw,
-                                              u8 channel, u8 *stage,
-                                              u8 *step, u32 *delay)
+static bool _rtl8723be_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+                                                u8 channel, u8 *stage,
+                                                u8 *step, u32 *delay)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         struct swchnlcmd precommoncmd[MAX_PRECMD_CNT];
         u32 precommoncmdcnt;
         struct swchnlcmd postcommoncmd[MAX_POSTCMD_CNT];
@@ -1381,10 +1454,13 @@ static bool rtl8723be_phy_sw_chn_step_by_step(struct ieee80211_hw *hw,
                                          0, 0, 0);
         rtl8723_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
                                          MAX_PRECMD_CNT, CMDID_END, 0, 0, 0);
+
         postcommoncmdcnt = 0;
+
         rtl8723_phy_set_sw_chnl_cmdarray(postcommoncmd, postcommoncmdcnt++,
                                          MAX_POSTCMD_CNT, CMDID_END,
-                                         0, 0, 0);
+                                            0, 0, 0);
+
         rfdependcmdcnt = 0;
 
         RT_ASSERT((channel >= 1 && channel <= 14),
@@ -1397,7 +1473,7 @@ static bool rtl8723be_phy_sw_chn_step_by_step(struct ieee80211_hw *hw,
 
         rtl8723_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
                                          MAX_RFDEPENDCMD_CNT,
-                                         CMDID_END, 0, 0, 0);
+                                            CMDID_END, 0, 0, 0);
 
         do {
                 switch (*stage) {
@@ -1410,6 +1486,10 @@ static bool rtl8723be_phy_sw_chn_step_by_step(struct ieee80211_hw *hw,
                 case 2:
                         currentcmd = &postcommoncmd[*step];
                         break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Invalid 'stage' = %d, Check it!\n", *stage);
+                        return true;
                 }
 
                 if (currentcmd->cmdid == CMDID_END) {
@@ -1432,11 +1512,11 @@ static bool rtl8723be_phy_sw_chn_step_by_step(struct ieee80211_hw *hw,
                         break;
                 case CMDID_WRITEPORT_USHORT:
                         rtl_write_word(rtlpriv, currentcmd->para1,
-                                       (u16) currentcmd->para2);
+                                       (u16)currentcmd->para2);
                         break;
                 case CMDID_WRITEPORT_UCHAR:
                         rtl_write_byte(rtlpriv, currentcmd->para1,
-                                       (u8) currentcmd->para2);
+                                       (u8)currentcmd->para2);
                         break;
                 case CMDID_RF_WRITEREG:
                         for (rfpath = 0; rfpath < num_total_rfpath; rfpath++) {
@@ -1451,7 +1531,7 @@ static bool rtl8723be_phy_sw_chn_step_by_step(struct ieee80211_hw *hw,
                         }
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                                  "switch case not process\n");
                         break;
                 }
@@ -1464,54 +1544,515 @@ static bool rtl8723be_phy_sw_chn_step_by_step(struct ieee80211_hw *hw,
         return false;
 }
 
-static u8 _rtl8723be_phy_path_a_iqk(struct ieee80211_hw *hw, bool config_pathb)
+static u8 _rtl8723be_phy_path_a_iqk(struct ieee80211_hw *hw)
 {
-        u32 reg_eac, reg_e94, reg_e9c, reg_ea4;
+        u32 reg_eac, reg_e94, reg_e9c, tmp;
         u8 result = 0x00;
 
-        rtl_set_bbreg(hw, 0xe30, MASKDWORD, 0x10008c1c);
-        rtl_set_bbreg(hw, 0xe34, MASKDWORD, 0x30008c1c);
-        rtl_set_bbreg(hw, 0xe38, MASKDWORD, 0x8214032a);
-        rtl_set_bbreg(hw, 0xe3c, MASKDWORD, 0x28160000);
-
-        rtl_set_bbreg(hw, 0xe4c, MASKDWORD, 0x00462911);
-        rtl_set_bbreg(hw, 0xe48, MASKDWORD, 0xf9000000);
-        rtl_set_bbreg(hw, 0xe48, MASKDWORD, 0xf8000000);
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        /* switch to path A */
+        rtl_set_bbreg(hw, 0x948, MASKDWORD, 0x00000000);
+        /* enable path A PA in TXIQK mode */
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x20000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0003f);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xc7f87);
+
+        /* 1. TX IQK */
+        /* path-A IQK setting */
+        /* IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+        /* path-A IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x821403ea);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x28160000);
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x82110000);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x28110000);
+        /* LO calibration setting */
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x00462911);
+        /* enter IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /* One shot, path A LOK & IQK */
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
 
         mdelay(IQK_DELAY_TIME);
 
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+
+        /* Check failed */
         reg_eac = rtl_get_bbreg(hw, 0xeac, MASKDWORD);
         reg_e94 = rtl_get_bbreg(hw, 0xe94, MASKDWORD);
         reg_e9c = rtl_get_bbreg(hw, 0xe9c, MASKDWORD);
-        reg_ea4 = rtl_get_bbreg(hw, 0xea4, MASKDWORD);
 
         if (!(reg_eac & BIT(28)) &&
             (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
             (((reg_e9c & 0x03FF0000) >> 16) != 0x42))
                 result |= 0x01;
+        else /* if Tx not OK, ignore Rx */
+                return result;
+
+        /* Allen 20131125 */
+        tmp = (reg_e9c & 0x03FF0000) >> 16;
+        if ((tmp & 0x200) > 0)
+                tmp = 0x400 - tmp;
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) < 0x110) &&
+            (((reg_e94 & 0x03FF0000) >> 16) > 0xf0) &&
+            (tmp < 0xf))
+                result |= 0x01;
+        else /* if Tx not OK, ignore Rx */
+                return result;
+
         return result;
 }
 
-static bool phy_similarity_cmp(struct ieee80211_hw *hw, long result[][8],
-                               u8 c1, u8 c2)
+/* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */
+static u8 _rtl8723be_phy_path_a_rx_iqk(struct ieee80211_hw *hw)
 {
-        u32 i, j, diff, simularity_bitmap, bound;
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 reg_eac, reg_e94, reg_e9c, reg_ea4, u32tmp, tmp;
+        u8 result = 0x00;
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+
+        /* switch to path A */
+        rtl_set_bbreg(hw, 0x948, MASKDWORD, 0x00000000);
+
+        /* 1 Get TXIMR setting */
+        /* modify RXIQK mode table */
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, 0x80000, 0x1);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0001f);
+        /* LNA2 off, PA on for Dcut */
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7fb7);
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /* IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /* path-A IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82160ff0);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x28110000);
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x82110000);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x28110000);
+
+        /* LO calibration setting */
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a911);
+
+        /* enter IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /* One shot, path A LOK & IQK */
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+
+        /* Check failed */
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_e94 = rtl_get_bbreg(hw, RTX_POWER_BEFORE_IQK_A, MASKDWORD);
+        reg_e9c = rtl_get_bbreg(hw, RTX_POWER_AFTER_IQK_A, MASKDWORD);
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_e9c & 0x03FF0000) >> 16) != 0x42))
+                result |= 0x01;
+        else /* if Tx not OK, ignore Rx */
+                return result;
+
+        /* Allen 20131125 */
+        tmp = (reg_e9c & 0x03FF0000) >> 16;
+        if ((tmp & 0x200) > 0)
+                tmp = 0x400 - tmp;
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) < 0x110) &&
+            (((reg_e94 & 0x03FF0000) >> 16) > 0xf0) &&
+            (tmp < 0xf))
+                result |= 0x01;
+        else /* if Tx not OK, ignore Rx */
+                return result;
+
+        u32tmp = 0x80007C00 | (reg_e94 & 0x3FF0000) |
+                 ((reg_e9c & 0x3FF0000) >> 16);
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, u32tmp);
+
+        /* 1 RX IQK */
+        /* modify RXIQK mode table */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, 0x80000, 0x1);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0001f);
+        /* LAN2 on, PA off for Dcut */
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7d77);
+
+        /* PA, PAD setting */
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xdf, RFREG_OFFSET_MASK, 0xf80);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x55, RFREG_OFFSET_MASK, 0x4021f);
+
+        /* IQK setting */
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /* path-A IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82110000);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x2816001f);
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x82110000);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x28110000);
+
+        /* LO calibration setting */
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a8d1);
+
+        /* enter IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /* One shot, path A LOK & IQK */
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+
+        /* Check failed */
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_ea4 = rtl_get_bbreg(hw, RRX_POWER_BEFORE_IQK_A_2, MASKDWORD);
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xdf, RFREG_OFFSET_MASK, 0x780);
+
+        /* Allen 20131125 */
+        tmp = (reg_eac & 0x03FF0000) >> 16;
+                if ((tmp & 0x200) > 0)
+                        tmp = 0x400 - tmp;
+        /* if Tx is OK, check whether Rx is OK */
+        if (!(reg_eac & BIT(27)) &&
+            (((reg_ea4 & 0x03FF0000) >> 16) != 0x132) &&
+            (((reg_eac & 0x03FF0000) >> 16) != 0x36))
+                result |= 0x02;
+        else if (!(reg_eac & BIT(27)) &&
+                 (((reg_ea4 & 0x03FF0000) >> 16) < 0x110) &&
+                 (((reg_ea4 & 0x03FF0000) >> 16) > 0xf0) &&
+                 (tmp < 0xf))
+                result |= 0x02;
+
+        return result;
+}
+
+static u8 _rtl8723be_phy_path_b_iqk(struct ieee80211_hw *hw)
+{
+        u32 reg_eac, reg_e94, reg_e9c, tmp;
+        u8 result = 0x00;
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        /* switch to path B */
+        rtl_set_bbreg(hw, 0x948, MASKDWORD, 0x00000280);
+
+        /* enable path B PA in TXIQK mode */
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xed, RFREG_OFFSET_MASK, 0x00020);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x43, RFREG_OFFSET_MASK, 0x40fc1);
+
+        /* 1 Tx IQK */
+        /* IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+        /* path-A IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x821403ea);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x28110000);
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x82110000);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x28110000);
+
+        /* LO calibration setting */
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x00462911);
+
+        /* enter IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /* One shot, path B LOK & IQK */
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+
+        /* Check failed */
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_e94 = rtl_get_bbreg(hw, RTX_POWER_BEFORE_IQK_A, MASKDWORD);
+        reg_e9c = rtl_get_bbreg(hw, RTX_POWER_AFTER_IQK_A, MASKDWORD);
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_e9c & 0x03FF0000) >> 16) != 0x42))
+                result |= 0x01;
+        else
+                return result;
+
+        /* Allen 20131125 */
+        tmp = (reg_e9c & 0x03FF0000) >> 16;
+        if ((tmp & 0x200) > 0)
+                tmp = 0x400 - tmp;
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) < 0x110) &&
+            (((reg_e94 & 0x03FF0000) >> 16) > 0xf0) &&
+            (tmp < 0xf))
+                result |= 0x01;
+        else
+                return result;
+
+        return result;
+}
+
+/* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */
+static u8 _rtl8723be_phy_path_b_rx_iqk(struct ieee80211_hw *hw)
+{
+        u32 reg_e94, reg_e9c, reg_ea4, reg_eac, u32tmp, tmp;
+        u8 result = 0x00;
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        /* switch to path B */
+        rtl_set_bbreg(hw, 0x948, MASKDWORD, 0x00000280);
+
+        /* 1 Get TXIMR setting */
+        /* modify RXIQK mode table */
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, RFREG_OFFSET_MASK, 0x800a0);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0001f);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7ff7);
+
+        /* open PA S1 & SMIXER */
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xed, RFREG_OFFSET_MASK, 0x00020);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x43, RFREG_OFFSET_MASK, 0x60fed);
+
+        /* IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, 0x01007c00);
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /* path-B IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82160ff0);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x28110000);
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x82110000);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x28110000);
+
+        /* LO calibration setting */
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a911);
+        /* enter IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /* One shot, path B TXIQK @ RXIQK */
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        /* Check failed */
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_e94 = rtl_get_bbreg(hw, RTX_POWER_BEFORE_IQK_A, MASKDWORD);
+        reg_e9c = rtl_get_bbreg(hw, RTX_POWER_AFTER_IQK_A, MASKDWORD);
+
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) != 0x142) &&
+            (((reg_e9c & 0x03FF0000) >> 16) != 0x42))
+                result |= 0x01;
+        else    /* if Tx not OK, ignore Rx */
+                return result;
 
-        u8 final_candidate[2] = { 0xFF, 0xFF };
-        bool bresult = true, is2t = IS_92C_SERIAL(rtlhal->version);
+        /* Allen 20131125 */
+        tmp = (reg_e9c & 0x03FF0000) >> 16;
+        if ((tmp & 0x200) > 0)
+                tmp = 0x400 - tmp;
 
-        if (is2t)
-                bound = 8;
+        if (!(reg_eac & BIT(28)) &&
+            (((reg_e94 & 0x03FF0000) >> 16) < 0x110) &&
+            (((reg_e94 & 0x03FF0000) >> 16) > 0xf0) &&
+            (tmp < 0xf))
+                result |= 0x01;
+        else
+                return result;
+
+        u32tmp = 0x80007C00 | (reg_e94 & 0x3FF0000)  |
+                 ((reg_e9c & 0x3FF0000) >> 16);
+        rtl_set_bbreg(hw, RTX_IQK, MASKDWORD, u32tmp);
+
+        /* 1 RX IQK */
+
+        /* <20121009, Kordan> RF Mode = 3 */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, 0x80000, 0x1);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_RCK_OS, RFREG_OFFSET_MASK, 0x30000);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G1, RFREG_OFFSET_MASK, 0x0001f);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_TXPA_G2, RFREG_OFFSET_MASK, 0xf7d77);
+        rtl_set_rfreg(hw, RF90_PATH_A, RF_WE_LUT, 0x80000, 0x0);
+
+        /* open PA S1 & close SMIXER */
+        rtl_set_rfreg(hw, RF90_PATH_A, 0xed, RFREG_OFFSET_MASK, 0x00020);
+        rtl_set_rfreg(hw, RF90_PATH_A, 0x43, RFREG_OFFSET_MASK, 0x60fbd);
+
+        /* IQK setting */
+        rtl_set_bbreg(hw, RRX_IQK, MASKDWORD, 0x01004800);
+
+        /* path-B IQK setting */
+        rtl_set_bbreg(hw, RTX_IQK_TONE_A, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_A, MASKDWORD, 0x18008c1c);
+        rtl_set_bbreg(hw, RTX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+        rtl_set_bbreg(hw, RRX_IQK_TONE_B, MASKDWORD, 0x38008c1c);
+
+        rtl_set_bbreg(hw, RTX_IQK_PI_A, MASKDWORD, 0x82110000);
+        rtl_set_bbreg(hw, RRX_IQK_PI_A, MASKDWORD, 0x2816001f);
+        rtl_set_bbreg(hw, RTX_IQK_PI_B, MASKDWORD, 0x82110000);
+        rtl_set_bbreg(hw, RRX_IQK_PI_B, MASKDWORD, 0x28110000);
+
+        /* LO calibration setting */
+        rtl_set_bbreg(hw, RIQK_AGC_RSP, MASKDWORD, 0x0046a8d1);
+        /* enter IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x80800000);
+
+        /* One shot, path B LOK & IQK */
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf9000000);
+        rtl_set_bbreg(hw, RIQK_AGC_PTS, MASKDWORD, 0xf8000000);
+
+        mdelay(IQK_DELAY_TIME);
+
+        /* leave IQK mode */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0x00000000);
+        /* Check failed */
+        reg_eac = rtl_get_bbreg(hw, RRX_POWER_AFTER_IQK_A_2, MASKDWORD);
+        reg_ea4 = rtl_get_bbreg(hw, RRX_POWER_BEFORE_IQK_A_2, MASKDWORD);
+
+        /* Allen 20131125 */
+        tmp = (reg_eac & 0x03FF0000) >> 16;
+        if ((tmp & 0x200) > 0)
+                tmp = 0x400 - tmp;
+
+        /* if Tx is OK, check whether Rx is OK */
+        if (!(reg_eac & BIT(27)) &&
+            (((reg_ea4 & 0x03FF0000) >> 16) != 0x132) &&
+            (((reg_eac & 0x03FF0000) >> 16) != 0x36))
+                result |= 0x02;
+        else if (!(reg_eac & BIT(27)) &&
+                 (((reg_ea4 & 0x03FF0000) >> 16) < 0x110) &&
+                 (((reg_ea4 & 0x03FF0000) >> 16) > 0xf0) &&
+                 (tmp < 0xf))
+                result |= 0x02;
         else
-                bound = 4;
+                return result;
+
+        return result;
+}
+
+static void _rtl8723be_phy_path_b_fill_iqk_matrix(struct ieee80211_hw *hw,
+                                                  bool b_iqk_ok,
+                                                  long result[][8],
+                                                  u8 final_candidate,
+                                                  bool btxonly)
+{
+        u32 oldval_1, x, tx1_a, reg;
+        long y, tx1_c;
+
+        if (final_candidate == 0xFF) {
+                return;
+        } else if (b_iqk_ok) {
+                oldval_1 = (rtl_get_bbreg(hw, ROFDM0_XBTXIQIMBALANCE,
+                                          MASKDWORD) >> 22) & 0x3FF;
+                x = result[final_candidate][4];
+                if ((x & 0x00000200) != 0)
+                        x = x | 0xFFFFFC00;
+                tx1_a = (x * oldval_1) >> 8;
+                rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, 0x3FF, tx1_a);
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(27),
+                              ((x * oldval_1 >> 7) & 0x1));
+                y = result[final_candidate][5];
+                if ((y & 0x00000200) != 0)
+                        y = y | 0xFFFFFC00;
+                tx1_c = (y * oldval_1) >> 8;
+                rtl_set_bbreg(hw, ROFDM0_XDTXAFE, 0xF0000000,
+                              ((tx1_c & 0x3C0) >> 6));
+                rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, 0x003F0000,
+                              (tx1_c & 0x3F));
+                rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(25),
+                              ((y * oldval_1 >> 7) & 0x1));
+                if (btxonly)
+                        return;
+                reg = result[final_candidate][6];
+                rtl_set_bbreg(hw, ROFDM0_XBRXIQIMBALANCE, 0x3FF, reg);
+                reg = result[final_candidate][7] & 0x3F;
+                rtl_set_bbreg(hw, ROFDM0_XBRXIQIMBALANCE, 0xFC00, reg);
+                reg = (result[final_candidate][7] >> 6) & 0xF;
+                /* rtl_set_bbreg(hw, 0xca0, 0xF0000000, reg); */
+        }
+}
+
+static bool _rtl8723be_phy_simularity_compare(struct ieee80211_hw *hw,
+                                              long result[][8], u8 c1, u8 c2)
+{
+        u32 i, j, diff, simularity_bitmap, bound = 0;
+
+        u8 final_candidate[2] = {0xFF, 0xFF}; /* for path A and path B */
+        bool bresult = true; /* is2t = true*/
+        s32 tmp1 = 0, tmp2 = 0;
+
+        bound = 8;
 
         simularity_bitmap = 0;
 
         for (i = 0; i < bound; i++) {
-                diff = (result[c1][i] > result[c2][i]) ?
-                    (result[c1][i] - result[c2][i]) :
-                    (result[c2][i] - result[c1][i]);
+                if ((i == 1) || (i == 3) || (i == 5) || (i == 7)) {
+                        if ((result[c1][i] & 0x00000200) != 0)
+                                tmp1 = result[c1][i] | 0xFFFFFC00;
+                        else
+                                tmp1 = result[c1][i];
+
+                        if ((result[c2][i] & 0x00000200) != 0)
+                                tmp2 = result[c2][i] | 0xFFFFFC00;
+                        else
+                                tmp2 = result[c2][i];
+                } else {
+                        tmp1 = result[c1][i];
+                        tmp2 = result[c2][i];
+                }
+
+                diff = (tmp1 > tmp2) ? (tmp1 - tmp2) : (tmp2 - tmp1);
 
                 if (diff > MAX_TOLERANCE) {
                         if ((i == 2 || i == 6) && !simularity_bitmap) {
@@ -1521,9 +2062,8 @@ static bool phy_similarity_cmp(struct ieee80211_hw *hw, long result[][8],
                                         final_candidate[(i / 4)] = c1;
                                 else
                                         simularity_bitmap |= (1 << i);
-                        } else {
+                        } else
                                 simularity_bitmap |= (1 << i);
-                        }
                 }
         }
 
@@ -1537,15 +2077,23 @@ static bool phy_similarity_cmp(struct ieee80211_hw *hw, long result[][8],
                         }
                 }
                 return bresult;
-        } else if (!(simularity_bitmap & 0x0F)) {
-                for (i = 0; i < 4; i++)
-                        result[3][i] = result[c1][i];
-                return false;
-        } else if (!(simularity_bitmap & 0xF0) && is2t) {
-                for (i = 4; i < 8; i++)
-                        result[3][i] = result[c1][i];
-                return false;
         } else {
+                if (!(simularity_bitmap & 0x03)) { /* path A TX OK */
+                        for (i = 0; i < 2; i++)
+                                result[3][i] = result[c1][i];
+                }
+                if (!(simularity_bitmap & 0x0c)) { /* path A RX OK */
+                        for (i = 2; i < 4; i++)
+                                result[3][i] = result[c1][i];
+                }
+                if (!(simularity_bitmap & 0x30)) { /* path B TX OK */
+                        for (i = 4; i < 6; i++)
+                                result[3][i] = result[c1][i];
+                }
+                if (!(simularity_bitmap & 0xc0)) { /* path B RX OK */
+                        for (i = 6; i < 8; i++)
+                                result[3][i] = result[c1][i];
+                }
                 return false;
         }
 }
@@ -1554,9 +2102,9 @@ static void _rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw,
                                         long result[][8], u8 t, bool is2t)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         u32 i;
-        u8 patha_ok;
+        u8 patha_ok, pathb_ok;
         u32 adda_reg[IQK_ADDA_REG_NUM] = {
                 0x85c, 0xe6c, 0xe70, 0xe74,
                 0xe78, 0xe7c, 0xe80, 0xe84,
@@ -1571,10 +2119,12 @@ static void _rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw,
                 ROFDM0_TRXPATHENABLE, ROFDM0_TRMUXPAR,
                 RFPGA0_XCD_RFINTERFACESW, 0xb68, 0xb6c,
                 0x870, 0x860,
-                0x864, 0x800
+                0x864, 0xa04
         };
         const u32 retrycount = 2;
-        u32 path_sel_bb, path_sel_rf;
+
+        u32 path_sel_bb;/* path_sel_rf */
+
         u8 tmp_reg_c50, tmp_reg_c58;
 
         tmp_reg_c50 = rtl_get_bbreg(hw, 0xc50, MASKBYTE0);
@@ -1591,62 +2141,97 @@ static void _rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw,
         }
         rtl8723_phy_path_adda_on(hw, adda_reg, true, is2t);
         if (t == 0) {
-                rtlphy->rfpi_enable = (u8) rtl_get_bbreg(hw,
+                rtlphy->rfpi_enable = (u8)rtl_get_bbreg(hw,
                                                 RFPGA0_XA_HSSIPARAMETER1,
                                                 BIT(8));
         }
-        if (!rtlphy->rfpi_enable)
-                rtl8723_phy_pi_mode_switch(hw, true);
 
         path_sel_bb = rtl_get_bbreg(hw, 0x948, MASKDWORD);
-        path_sel_rf = rtl_get_rfreg(hw, RF90_PATH_A, 0xb0, 0xfffff);
 
+        rtl8723_phy_mac_setting_calibration(hw, iqk_mac_reg,
+                                            rtlphy->iqk_mac_backup);
         /*BB Setting*/
-        rtl_set_bbreg(hw, 0x800, BIT(24), 0x00);
+        rtl_set_bbreg(hw, 0xa04, 0x0f000000, 0xf);
         rtl_set_bbreg(hw, 0xc04, MASKDWORD, 0x03a05600);
         rtl_set_bbreg(hw, 0xc08, MASKDWORD, 0x000800e4);
         rtl_set_bbreg(hw, 0x874, MASKDWORD, 0x22204000);
 
-        rtl_set_bbreg(hw, 0x870, BIT(10), 0x01);
-        rtl_set_bbreg(hw, 0x870, BIT(26), 0x01);
-        rtl_set_bbreg(hw, 0x860, BIT(10), 0x00);
-        rtl_set_bbreg(hw, 0x864, BIT(10), 0x00);
-
-        if (is2t)
-                rtl_set_rfreg(hw, RF90_PATH_B, 0x00, MASKDWORD, 0x10000);
-        rtl8723_phy_mac_setting_calibration(hw, iqk_mac_reg,
-                                            rtlphy->iqk_mac_backup);
-        rtl_set_bbreg(hw, 0xb68, MASKDWORD, 0x0f600000);
-
-        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0x80800000);
-        rtl_set_bbreg(hw, 0xe40, MASKDWORD, 0x01007c00);
-        rtl_set_bbreg(hw, 0xe44, MASKDWORD, 0x81004800);
+        /* path A TX IQK */
         for (i = 0; i < retrycount; i++) {
-                patha_ok = _rtl8723be_phy_path_a_iqk(hw, is2t);
+                patha_ok = _rtl8723be_phy_path_a_iqk(hw);
                 if (patha_ok == 0x01) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 "Path A Tx IQK Success!!\n");
+                                "Path A Tx IQK Success!!\n");
                         result[t][0] = (rtl_get_bbreg(hw, 0xe94, MASKDWORD) &
                                         0x3FF0000) >> 16;
                         result[t][1] = (rtl_get_bbreg(hw, 0xe9c, MASKDWORD) &
                                         0x3FF0000) >> 16;
                         break;
+                } else {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Path A Tx IQK Fail!!\n");
                 }
         }
-
-        if (0 == patha_ok)
+        /* path A RX IQK */
+        for (i = 0; i < retrycount; i++) {
+                patha_ok = _rtl8723be_phy_path_a_rx_iqk(hw);
+                if (patha_ok == 0x03) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Path A Rx IQK Success!!\n");
+                        result[t][2] = (rtl_get_bbreg(hw, 0xea4, MASKDWORD) &
+                                        0x3FF0000) >> 16;
+                        result[t][3] = (rtl_get_bbreg(hw, 0xeac, MASKDWORD) &
+                                        0x3FF0000) >> 16;
+                        break;
+                }
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         "Path A IQK Success!!\n");
+                         "Path A Rx IQK Fail!!\n");
+        }
+
+        if (0x00 == patha_ok)
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Path A IQK Fail!!\n");
+
         if (is2t) {
-                rtl8723_phy_path_a_standby(hw);
-                rtl8723_phy_path_adda_on(hw, adda_reg, false, is2t);
+                /* path B TX IQK */
+                for (i = 0; i < retrycount; i++) {
+                        pathb_ok = _rtl8723be_phy_path_b_iqk(hw);
+                        if (pathb_ok == 0x01) {
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "Path B Tx IQK Success!!\n");
+                                result[t][4] = (rtl_get_bbreg(hw, 0xe94,
+                                                              MASKDWORD) &
+                                                              0x3FF0000) >> 16;
+                                result[t][5] = (rtl_get_bbreg(hw, 0xe9c,
+                                                              MASKDWORD) &
+                                                              0x3FF0000) >> 16;
+                                break;
+                        }
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Path B Tx IQK Fail!!\n");
+                }
+                /* path B RX IQK */
+                for (i = 0; i < retrycount; i++) {
+                        pathb_ok = _rtl8723be_phy_path_b_rx_iqk(hw);
+                        if (pathb_ok == 0x03) {
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "Path B Rx IQK Success!!\n");
+                                result[t][6] = (rtl_get_bbreg(hw, 0xea4,
+                                                              MASKDWORD) &
+                                                              0x3FF0000) >> 16;
+                                result[t][7] = (rtl_get_bbreg(hw, 0xeac,
+                                                              MASKDWORD) &
+                                                              0x3FF0000) >> 16;
+                                break;
+                        }
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Path B Rx IQK Fail!!\n");
+                }
         }
 
-        rtl_set_bbreg(hw, 0xe28, MASKDWORD, 0);
+        /* Back to BB mode, load original value */
+        rtl_set_bbreg(hw, RFPGA0_IQK, MASKDWORD, 0);
 
         if (t != 0) {
-                if (!rtlphy->rfpi_enable)
-                        rtl8723_phy_pi_mode_switch(hw, false);
                 rtl8723_phy_reload_adda_registers(hw, adda_reg,
                                                   rtlphy->adda_backup, 16);
                 rtl8723_phy_reload_mac_registers(hw, iqk_mac_reg,
@@ -1656,7 +2241,7 @@ static void _rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw,
                                                   IQK_BB_REG_NUM);
 
                 rtl_set_bbreg(hw, 0x948, MASKDWORD, path_sel_bb);
-                rtl_set_rfreg(hw, RF90_PATH_B, 0xb0, 0xfffff, path_sel_rf);
+                /*rtl_set_rfreg(hw, RF90_PATH_B, 0xb0, 0xfffff, path_sel_rf);*/
 
                 rtl_set_bbreg(hw, 0xc50, MASKBYTE0, 0x50);
                 rtl_set_bbreg(hw, 0xc50, MASKBYTE0, tmp_reg_c50);
@@ -1670,11 +2255,33 @@ static void _rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "8723be IQK Finish!!\n");
 }
 
+static u8 _get_right_chnl_place_for_iqk(u8 chnl)
+{
+        u8 channel_all[TARGET_CHNL_NUM_2G_5G] = {
+                        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+                        13, 14, 36, 38, 40, 42, 44, 46,
+                        48, 50, 52, 54, 56, 58, 60, 62, 64,
+                        100, 102, 104, 106, 108, 110,
+                        112, 114, 116, 118, 120, 122,
+                        124, 126, 128, 130, 132, 134, 136,
+                        138, 140, 149, 151, 153, 155, 157,
+                        159, 161, 163, 165};
+        u8 place = chnl;
+
+        if (chnl > 14) {
+                for (place = 14; place < sizeof(channel_all); place++) {
+                        if (channel_all[place] == chnl)
+                                return place - 13;
+                }
+        }
+        return 0;
+}
+
 static void _rtl8723be_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmpreg;
         u32 rf_a_mode = 0, rf_b_mode = 0, lc_cal;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         tmpreg = rtl_read_byte(rtlpriv, 0xd03);
 
@@ -1702,7 +2309,10 @@ static void _rtl8723be_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
         rtl_set_rfreg(hw, RF90_PATH_A, 0xb0, RFREG_OFFSET_MASK, 0xdfbe0);
         rtl_set_rfreg(hw, RF90_PATH_A, 0x18, MASK12BITS, 0x8c0a);
 
-        mdelay(100);
+        /* In order not to disturb BT music when wifi init.(1ant NIC only) */
+        /*mdelay(100);*/
+        /* In order not to disturb BT music when wifi init.(1ant NIC only) */
+        mdelay(50);
 
         rtl_set_rfreg(hw, RF90_PATH_A, 0xb0, RFREG_OFFSET_MASK, 0xdffe0);
 
@@ -1716,68 +2326,34 @@ static void _rtl8723be_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
         } else {
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+
 }
 
 static void _rtl8723be_phy_set_rfpath_switch(struct ieee80211_hw *hw,
                                              bool bmain, bool is2t)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
 
-        if (is_hal_stop(rtlhal)) {
-                u8 u1btmp;
-                u1btmp = rtl_read_byte(rtlpriv, REG_LEDCFG0);
-                rtl_write_byte(rtlpriv, REG_LEDCFG0, u1btmp | BIT(7));
-                rtl_set_bbreg(hw, RFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
-        }
-        if (is2t) {
-                if (bmain)
-                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
-                                      BIT(5) | BIT(6), 0x1);
-                else
-                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
-                                      BIT(5) | BIT(6), 0x2);
-        } else {
-                rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW, BIT(8) | BIT(9), 0);
-                rtl_set_bbreg(hw, 0x914, MASKLWORD, 0x0201);
-
-                /* We use the RF definition of MAIN and AUX,
-                 * left antenna and right antenna repectively.
-                 * Default output at AUX.
-                 */
-                if (bmain) {
-                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE,
-                                      BIT(14) | BIT(13) | BIT(12), 0);
-                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
-                                      BIT(5) | BIT(4) | BIT(3), 0);
-                        if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
-                                rtl_set_bbreg(hw, CONFIG_RAM64X16, BIT(31), 0);
-                } else {
-                        rtl_set_bbreg(hw, RFPGA0_XA_RFINTERFACEOE,
-                                      BIT(14) | BIT(13) | BIT(12), 1);
-                        rtl_set_bbreg(hw, RFPGA0_XB_RFINTERFACEOE,
-                                      BIT(5) | BIT(4) | BIT(3), 1);
-                        if (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)
-                                rtl_set_bbreg(hw, CONFIG_RAM64X16, BIT(31), 1);
-                }
-        }
+        if (bmain) /* left antenna */
+                rtl_set_bbreg(hw, 0x92C, MASKDWORD, 0x1);
+        else
+                rtl_set_bbreg(hw, 0x92C, MASKDWORD, 0x2);
 }
 
 #undef IQK_ADDA_REG_NUM
 #undef IQK_DELAY_TIME
-
-void rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
+/* IQK is merge from Merge Temp */
+void rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
         long result[4][8];
-        u8 i, final_candidate;
-        bool patha_ok, pathb_ok;
-        long reg_e94, reg_e9c, reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4,
-            reg_ecc, reg_tmp = 0;
+        u8 i, final_candidate, idx;
+        bool b_patha_ok, b_pathb_ok;
+        long reg_e94, reg_e9c, reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4;
+        long reg_ecc, reg_tmp = 0;
         bool is12simular, is13simular, is23simular;
         u32 iqk_bb_reg[9] = {
                 ROFDM0_XARXIQIMBALANCE,
@@ -1790,12 +2366,23 @@ void rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 ROFDM0_XDTXAFE,
                 ROFDM0_RXIQEXTANTA
         };
+        u32 path_sel_bb = 0; /* path_sel_rf = 0 */
 
-        if (recovery) {
+        if (rtlphy->lck_inprogress)
+                return;
+
+        spin_lock(&rtlpriv->locks.iqk_lock);
+        rtlphy->lck_inprogress = true;
+        spin_unlock(&rtlpriv->locks.iqk_lock);
+
+        if (b_recovery) {
                 rtl8723_phy_reload_adda_registers(hw, iqk_bb_reg,
                                                   rtlphy->iqk_bb_backup, 9);
                 return;
         }
+        /* Save RF Path */
+        path_sel_bb = rtl_get_bbreg(hw, 0x948, MASKDWORD);
+        /* path_sel_rf = rtl_get_rfreg(hw, RF90_PATH_A, 0xb0, 0xfffff); */
 
         for (i = 0; i < 8; i++) {
                 result[0][i] = 0;
@@ -1804,30 +2391,33 @@ void rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 result[3][i] = 0;
         }
         final_candidate = 0xff;
-        patha_ok = false;
-        pathb_ok = false;
+        b_patha_ok = false;
+        b_pathb_ok = false;
         is12simular = false;
         is23simular = false;
         is13simular = false;
         for (i = 0; i < 3; i++) {
-                if (get_rf_type(rtlphy) == RF_2T2R)
-                        _rtl8723be_phy_iq_calibrate(hw, result, i, true);
-                else
-                        _rtl8723be_phy_iq_calibrate(hw, result, i, false);
+                _rtl8723be_phy_iq_calibrate(hw, result, i, true);
                 if (i == 1) {
-                        is12simular = phy_similarity_cmp(hw, result, 0, 1);
+                        is12simular = _rtl8723be_phy_simularity_compare(hw,
+                                                                        result,
+                                                                        0, 1);
                         if (is12simular) {
                                 final_candidate = 0;
                                 break;
                         }
                 }
                 if (i == 2) {
-                        is13simular = phy_similarity_cmp(hw, result, 0, 2);
+                        is13simular = _rtl8723be_phy_simularity_compare(hw,
+                                                                        result,
+                                                                        0, 2);
                         if (is13simular) {
                                 final_candidate = 0;
                                 break;
                         }
-                        is23simular = phy_similarity_cmp(hw, result, 1, 2);
+                        is23simular = _rtl8723be_phy_simularity_compare(hw,
+                                                                        result,
+                                                                        1, 2);
                         if (is23simular) {
                                 final_candidate = 1;
                         } else {
@@ -1864,32 +2454,48 @@ void rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 rtlphy->reg_ebc = reg_ebc;
                 reg_ec4 = result[final_candidate][6];
                 reg_ecc = result[final_candidate][7];
-                patha_ok = true;
-                pathb_ok = true;
+                b_patha_ok = true;
+                b_pathb_ok = true;
         } else {
                 rtlphy->reg_e94 = 0x100;
                 rtlphy->reg_eb4 = 0x100;
                 rtlphy->reg_e9c = 0x0;
                 rtlphy->reg_ebc = 0x0;
         }
-        if (reg_e94 != 0) /*&&(reg_ea4 != 0) */
-                rtl8723_phy_path_a_fill_iqk_matrix(hw, patha_ok, result,
+        if (reg_e94 != 0)
+                rtl8723_phy_path_a_fill_iqk_matrix(hw, b_patha_ok, result,
                                                    final_candidate,
                                                    (reg_ea4 == 0));
-        if (final_candidate != 0xFF) {
+        if (reg_eb4 != 0)
+                _rtl8723be_phy_path_b_fill_iqk_matrix(hw, b_pathb_ok, result,
+                                                      final_candidate,
+                                                      (reg_ec4 == 0));
+
+        idx = _get_right_chnl_place_for_iqk(rtlphy->current_channel);
+
+        if (final_candidate < 4) {
                 for (i = 0; i < IQK_MATRIX_REG_NUM; i++)
-                        rtlphy->iqk_matrix[0].value[0][i] =
+                        rtlphy->iqk_matrix[idx].value[0][i] =
                                                 result[final_candidate][i];
-                rtlphy->iqk_matrix[0].iqk_done = true;
+                rtlphy->iqk_matrix[idx].iqk_done = true;
+
         }
-        rtl8723_save_adda_registers(hw, iqk_bb_reg, rtlphy->iqk_bb_backup, 9);
+        rtl8723_save_adda_registers(hw, iqk_bb_reg,
+                                    rtlphy->iqk_bb_backup, 9);
+
+        rtl_set_bbreg(hw, 0x948, MASKDWORD, path_sel_bb);
+        /* rtl_set_rfreg(hw, RF90_PATH_A, 0xb0, 0xfffff, path_sel_rf); */
+
+        spin_lock(&rtlpriv->locks.iqk_lock);
+        rtlphy->lck_inprogress = false;
+        spin_unlock(&rtlpriv->locks.iqk_lock);
 }
 
 void rtl8723be_phy_lc_calibrate(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct rtl_hal *rtlhal = &(rtlpriv->rtlhal);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = &rtlpriv->rtlhal;
         u32 timeout = 2000, timecount = 0;
 
         while (rtlpriv->mac80211.act_scanning && timecount < timeout) {
@@ -1898,68 +2504,25 @@ void rtl8723be_phy_lc_calibrate(struct ieee80211_hw *hw)
         }
 
         rtlphy->lck_inprogress = true;
-        RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,
                 "LCK:Start!!! currentband %x delay %d ms\n",
-                rtlhal->current_bandtype, timecount);
+                 rtlhal->current_bandtype, timecount);
 
         _rtl8723be_phy_lc_calibrate(hw, false);
 
         rtlphy->lck_inprogress = false;
 }
 
-void rtl23b_phy_ap_calibrate(struct ieee80211_hw *hw, char delta)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-
-        if (rtlphy->apk_done)
-                return;
-
-        return;
-}
-
 void rtl8723be_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain)
 {
-        _rtl8723be_phy_set_rfpath_switch(hw, bmain, false);
-}
-
-static void rtl8723be_phy_set_io(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
-                  rtlphy->current_io_type, rtlphy->set_io_inprogress);
-        switch (rtlphy->current_io_type) {
-        case IO_CMD_RESUME_DM_BY_SCAN:
-                rtlpriv->dm_digtable.cur_igvalue =
-                                 rtlphy->initgain_backup.xaagccore1;
-                /*rtl92c_dm_write_dig(hw);*/
-                rtl8723be_phy_set_txpower_level(hw, rtlphy->current_channel);
-                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x83);
-                break;
-        case IO_CMD_PAUSE_DM_BY_SCAN:
-                rtlphy->initgain_backup.xaagccore1 =
-                                 rtlpriv->dm_digtable.cur_igvalue;
-                rtlpriv->dm_digtable.cur_igvalue = 0x17;
-                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x40);
-                break;
-        default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "switch case not process\n");
-                break;
-        }
-        rtlphy->set_io_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 "(%#x)\n", rtlphy->current_io_type);
+        _rtl8723be_phy_set_rfpath_switch(hw, bmain, true);
 }
 
 bool rtl8723be_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        bool postprocessing = false;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        bool b_postprocessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                  "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
@@ -1969,20 +2532,20 @@ bool rtl8723be_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                 case IO_CMD_RESUME_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                                  "[IO CMD] Resume DM after scan.\n");
-                        postprocessing = true;
+                        b_postprocessing = true;
                         break;
-                case IO_CMD_PAUSE_DM_BY_SCAN:
+                case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                                  "[IO CMD] Pause DM before scan.\n");
-                        postprocessing = true;
+                        b_postprocessing = true;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                                  "switch case not process\n");
                         break;
                 }
         } while (false);
-        if (postprocessing && !rtlphy->set_io_inprogress) {
+        if (b_postprocessing && !rtlphy->set_io_inprogress) {
                 rtlphy->set_io_inprogress = true;
                 rtlphy->current_io_type = iotype;
         } else {
@@ -1993,6 +2556,37 @@ bool rtl8723be_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
         return true;
 }
 
+static void rtl8723be_phy_set_io(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                  rtlphy->current_io_type, rtlphy->set_io_inprogress);
+        switch (rtlphy->current_io_type) {
+        case IO_CMD_RESUME_DM_BY_SCAN:
+                dm_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
+                /*rtl92c_dm_write_dig(hw);*/
+                rtl8723be_phy_set_txpower_level(hw, rtlphy->current_channel);
+                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x83);
+                break;
+        case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
+                rtlphy->initgain_backup.xaagccore1 = dm_digtable->cur_igvalue;
+                dm_digtable->cur_igvalue = 0x17;
+                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x40);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
+                break;
+        }
+        rtlphy->set_io_inprogress = false;
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "(%#x)\n", rtlphy->current_io_type);
+}
+
 static void rtl8723be_phy_set_rf_on(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -2028,15 +2622,15 @@ static bool _rtl8723be_phy_set_rf_power_state(struct ieee80211_hw *hw,
         switch (rfpwr_state) {
         case ERFON:
                 if ((ppsc->rfpwr_state == ERFOFF) &&
-                    RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
+                     RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
                         bool rtstatus;
-                        u32 initialize_count = 0;
+                        u32 initializecount = 0;
                         do {
-                                initialize_count++;
+                                initializecount++;
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                          "IPS Set eRf nic enable\n");
                                 rtstatus = rtl_ps_enable_nic(hw);
-                        } while (!rtstatus && (initialize_count < 10));
+                        } while (!rtstatus && (initializecount < 10));
                                 RT_CLEAR_PS_LEVEL(ppsc,
                                                   RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
@@ -2051,28 +2645,33 @@ static bool _rtl8723be_phy_set_rf_power_state(struct ieee80211_hw *hw,
                         rtlpriv->cfg->ops->led_control(hw, LED_CTL_LINK);
                 else
                         rtlpriv->cfg->ops->led_control(hw, LED_CTL_NO_LINK);
+
                 break;
+
         case ERFOFF:
                 for (queue_id = 0, i = 0;
                      queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
                         ring = &pcipriv->dev.tx_ring[queue_id];
-                        if (skb_queue_len(&ring->queue) == 0) {
+                        /* Don't check BEACON Q.
+                         * BEACON Q is always not empty,
+                         * because '_rtl8723be_cmd_send_packet'
+                         */
+                        if (queue_id == BEACON_QUEUE ||
+                            skb_queue_len(&ring->queue) == 0) {
                                 queue_id++;
                                 continue;
                         } else {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "eRf Off/Sleep: %d times "
-                                          "TcbBusyQueue[%d] =%d before "
-                                          "doze!\n", (i + 1), queue_id,
-                                          skb_queue_len(&ring->queue));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         (i + 1), queue_id,
+                                         skb_queue_len(&ring->queue));
 
                                 udelay(10);
                                 i++;
                         }
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "\n ERFSLEEP: %d times "
-                                          "TcbBusyQueue[%d] = %d !\n",
+                                         "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
                                           MAX_DOZE_WAITING_TIMES_9x,
                                           queue_id,
                                           skb_queue_len(&ring->queue));
@@ -2095,6 +2694,7 @@ static bool _rtl8723be_phy_set_rf_power_state(struct ieee80211_hw *hw,
                         }
                 }
                 break;
+
         case ERFSLEEP:
                 if (ppsc->rfpwr_state == ERFOFF)
                         break;
@@ -2106,21 +2706,19 @@ static bool _rtl8723be_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 continue;
                         } else {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "eRf Off/Sleep: %d times "
-                                          "TcbBusyQueue[%d] =%d before "
-                                          "doze!\n", (i + 1), queue_id,
-                                          skb_queue_len(&ring->queue));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         (i + 1), queue_id,
+                                         skb_queue_len(&ring->queue));
 
                                 udelay(10);
                                 i++;
                         }
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         "\n ERFSLEEP: %d times "
-                                          "TcbBusyQueue[%d] = %d !\n",
-                                          MAX_DOZE_WAITING_TIMES_9x,
-                                          queue_id,
-                                          skb_queue_len(&ring->queue));
+                                         "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                         MAX_DOZE_WAITING_TIMES_9x,
+                                         queue_id,
+                                         skb_queue_len(&ring->queue));
                                 break;
                         }
                 }
@@ -2131,8 +2729,9 @@ static bool _rtl8723be_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 ppsc->last_sleep_jiffies = jiffies;
                 _rtl8723be_phy_set_rf_sleep(hw);
                 break;
+
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
                          "switch case not process\n");
                 bresult = false;
                 break;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/phy.h b/drivers/net/wireless/rtlwifi/rtl8723be/phy.h
index 444ef95bb6af..6339738a0e33 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/phy.h
@@ -26,22 +26,28 @@
 #ifndef __RTL8723BE_PHY_H__
 #define __RTL8723BE_PHY_H__
 
-/*It must always set to 4, otherwise read efuse table secquence will be wrong.*/
+/* MAX_TX_COUNT must always set to 4, otherwise read efuse table sequence
+ * will be wrong.
+ */
 #define MAX_TX_COUNT            4
 #define TX_1S                   0
 #define TX_2S                   1
+#define TX_3S                   2
+#define TX_4S                   3
 
 #define MAX_POWER_INDEX         0x3F
 
 #define MAX_PRECMD_CNT                  16
 #define MAX_RFDEPENDCMD_CNT             16
-#define MAX_POSTCMD_CNT         16
+#define MAX_POSTCMD_CNT                 16
 
 #define MAX_DOZE_WAITING_TIMES_9x       64
 
 #define RT_CANNOT_IO(hw)                false
 #define HIGHPOWER_RADIOA_ARRAYLEN       22
 
+#define TARGET_CHNL_NUM_2G_5G           59
+
 #define IQK_ADDA_REG_NUM                16
 #define IQK_BB_REG_NUM                  9
 #define MAX_TOLERANCE                   5
@@ -83,104 +89,19 @@
 
 #define RTL92C_MAX_PATH_NUM                     2
 
-enum hw90_block_e {
-        HW90_BLOCK_MAC = 0,
-        HW90_BLOCK_PHY0 = 1,
-        HW90_BLOCK_PHY1 = 2,
-        HW90_BLOCK_RF = 3,
-        HW90_BLOCK_MAXIMUM = 4,
-};
-
 enum baseband_config_type {
         BASEBAND_CONFIG_PHY_REG = 0,
         BASEBAND_CONFIG_AGC_TAB = 1,
 };
 
-enum ra_offset_area {
-        RA_OFFSET_LEGACY_OFDM1,
-        RA_OFFSET_LEGACY_OFDM2,
-        RA_OFFSET_HT_OFDM1,
-        RA_OFFSET_HT_OFDM2,
-        RA_OFFSET_HT_OFDM3,
-        RA_OFFSET_HT_OFDM4,
-        RA_OFFSET_HT_CCK,
-};
-
-enum antenna_path {
-        ANTENNA_NONE,
-        ANTENNA_D,
-        ANTENNA_C,
-        ANTENNA_CD,
-        ANTENNA_B,
-        ANTENNA_BD,
-        ANTENNA_BC,
-        ANTENNA_BCD,
-        ANTENNA_A,
-        ANTENNA_AD,
-        ANTENNA_AC,
-        ANTENNA_ACD,
-        ANTENNA_AB,
-        ANTENNA_ABD,
-        ANTENNA_ABC,
-        ANTENNA_ABCD
-};
-
-struct r_antenna_select_ofdm {
-        u32 r_tx_antenna:4;
-        u32 r_ant_l:4;
-        u32 r_ant_non_ht:4;
-        u32 r_ant_ht1:4;
-        u32 r_ant_ht2:4;
-        u32 r_ant_ht_s1:4;
-        u32 r_ant_non_ht_s1:4;
-        u32 ofdm_txsc:2;
-        u32 reserved:2;
-};
-
-struct r_antenna_select_cck {
-        u8 r_cckrx_enable_2:2;
-        u8 r_cckrx_enable:2;
-        u8 r_ccktx_enable:4;
-};
-
-
-struct efuse_contents {
-        u8 mac_addr[ETH_ALEN];
-        u8 cck_tx_power_idx[6];
-        u8 ht40_1s_tx_power_idx[6];
-        u8 ht40_2s_tx_power_idx_diff[3];
-        u8 ht20_tx_power_idx_diff[3];
-        u8 ofdm_tx_power_idx_diff[3];
-        u8 ht40_max_power_offset[3];
-        u8 ht20_max_power_offset[3];
-        u8 channel_plan;
-        u8 thermal_meter;
-        u8 rf_option[5];
-        u8 version;
-        u8 oem_id;
-        u8 regulatory;
-};
-
-struct tx_power_struct {
-        u8 cck[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 ht40_1s[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 ht40_2s[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 ht20_diff[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 legacy_ht_diff[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 legacy_ht_txpowerdiff;
-        u8 groupht20[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 groupht40[RTL92C_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
-        u8 pwrgroup_cnt;
-        u32 mcs_original_offset[4][16];
-};
-
-enum _ANT_DIV_TYPE {
-        NO_ANTDIV                               = 0xFF,
-        CG_TRX_HW_ANTDIV                = 0x01,
-        CGCS_RX_HW_ANTDIV               = 0x02,
+enum ant_div_type {
+        NO_ANTDIV               = 0xFF,
+        CG_TRX_HW_ANTDIV        = 0x01,
+        CGCS_RX_HW_ANTDIV       = 0x02,
         FIXED_HW_ANTDIV         = 0x03,
-        CG_TRX_SMART_ANTDIV             = 0x04,
-        CGCS_RX_SW_ANTDIV               = 0x05,
+        CG_TRX_SMART_ANTDIV     = 0x04,
+        CGCS_RX_SW_ANTDIV       = 0x05,
+
 };
 
 u32 rtl8723be_phy_query_rf_reg(struct ieee80211_hw *hw,
@@ -206,7 +127,6 @@ void rtl8723be_phy_sw_chnl_callback(struct ieee80211_hw *hw);
 u8 rtl8723be_phy_sw_chnl(struct ieee80211_hw *hw);
 void rtl8723be_phy_iq_calibrate(struct ieee80211_hw *hw,
                                 bool b_recovery);
-void rtl23b_phy_ap_calibrate(struct ieee80211_hw *hw, char delta);
 void rtl8723be_phy_lc_calibrate(struct ieee80211_hw *hw);
 void rtl8723be_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain);
 bool rtl8723be_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.c b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.c
index b5167e73fecf..a1bb1f6116fb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 
-#include "pwrseqcmd.h"
+#include "../pwrseqcmd.h"
 #include "pwrseq.h"
 
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.h b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.h
index a62f43ed8d32..0fee5e0e55c2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.h
@@ -26,7 +26,9 @@
 #ifndef __RTL8723BE_PWRSEQ_H__
 #define __RTL8723BE_PWRSEQ_H__
 
-/*      Check document WM-20130425-JackieLau-RTL8723B_Power_Architecture v05.vsd
+#include "../pwrseqcmd.h"
+/**
+ *      Check document WM-20130425-JackieLau-RTL8723B_Power_Architecture v05.vsd
  *      There are 6 HW Power States:
  *      0: POFF--Power Off
  *      1: PDN--Power Down
@@ -35,7 +37,7 @@
  *      4: LPS--Low Power State
  *      5: SUS--Suspend
  *
- *      The transition from different states are defined below
+ *      The transision from different states are defined below
  *      TRANS_CARDEMU_TO_ACT
  *      TRANS_ACT_TO_CARDEMU
  *      TRANS_CARDEMU_TO_SUS
@@ -57,203 +59,320 @@
 #define RTL8723B_TRANS_END_STEPS                1
 
 #define RTL8723B_TRANS_CARDEMU_TO_ACT                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* {offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value}, */\
+        /*0x20[0] = 1b'1 enable LDOA12 MACRO block for all interface*/  \
         {0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK,                          \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},              \
+        /*0x67[0] = 0 to disable BT_GPS_SEL pins*/                      \
         {0x0067, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK,                          \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                   \
+        /*Delay 1ms*/                                                   \
         {0x0001, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK,                          \
          PWR_BASEADDR_MAC, PWR_CMD_DELAY, 1, PWRSEQ_DELAY_MS},          \
+        /*0x00[5] = 1b'0 release analog Ips to digital ,1:isolation*/   \
         {0x0000, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK,                          \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(5), 0},                   \
+        /* disable SW LPS 0x04[10]=0 and WLSUS_EN 0x04[11]=0*/          \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, (BIT(4)|BIT(3)|BIT(2)), 0},   \
+        /* Disable USB suspend */                                       \
         {0x0075, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
-         PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0) , 0},                  \
+         PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0) , BIT(0)},             \
+        /* wait till 0x04[17] = 1    power ready*/                      \
         {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), BIT(1)},            \
+        /* Enable USB suspend */                                        \
         {0x0075, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
-         PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0) , BIT(0)},             \
+         PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0) , 0},                  \
+        /* release WLON reset  0x04[16]=1*/                             \
         {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},              \
+        /* disable HWPDN 0x04[15]=0*/                                   \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},                   \
+        /* disable WL suspend*/                                         \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, (BIT(4)|BIT(3)), 0},          \
+        /* polling until return 0*/                                     \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},              \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(0), 0},                 \
+        /* Enable WL control XTAL setting*/                             \
         {0x0010, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(6), BIT(6)},              \
+        /*Enable falling edge triggering interrupt*/                    \
         {0x0049, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},              \
+        /*Enable GPIO9 interrupt mode*/                                 \
         {0x0063, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},              \
+        /*Enable GPIO9 input mode*/                                     \
         {0x0062, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0},                   \
+        /*Enable HSISR GPIO[C:0] interrupt*/                            \
         {0x0058, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), BIT(0)},              \
+        /*Enable HSISR GPIO9 interrupt*/                                \
         {0x005A, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},              \
+        /*For GPIO9 internal pull high setting by test chip*/           \
         {0x0068, PWR_CUT_TESTCHIP_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3), BIT(3)},              \
+        /*For GPIO9 internal pull high setting*/                        \
         {0x0069, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(6), BIT(6)},
 
 #define RTL8723B_TRANS_ACT_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        /*0x1F[7:0] = 0 turn off RF*/                                   \
         {0x001F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},                     \
+        /*0x4C[24] = 0x4F[0] = 0, */                                    \
+        /*switch DPDT_SEL_P output from register 0x65[2] */             \
         {0x004F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},                   \
+        /*Enable rising edge triggering interrupt*/                     \
         {0x0049, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0},                   \
+         /*0x04[9] = 1 turn off MAC by HW state machine*/               \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},              \
+         /*wait till 0x04[9] = 0 polling until return 0 to disable*/    \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(1), 0},                 \
+        /* Enable BT control XTAL setting*/                             \
         {0x0010, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(6), 0},                   \
+        /*0x00[5] = 1b'1 analog Ips to digital ,1:isolation*/           \
         {0x0000, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK, PWR_BASEADDR_MAC,        \
          PWR_CMD_WRITE, BIT(5), BIT(5)},                                \
+        /*0x20[0] = 1b'0 disable LDOA12 MACRO block*/                   \
         {0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK, PWR_BASEADDR_MAC,        \
          PWR_CMD_WRITE, BIT(0), 0},
 
 #define RTL8723B_TRANS_CARDEMU_TO_SUS                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value },*/\
+        /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/              \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4) | BIT(3), (BIT(4) | BIT(3))}, \
+        /*0x04[12:11] = 2b'01 enable WL suspend*/                       \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK, PWR_BASEADDR_MAC,        \
          PWR_CMD_WRITE, BIT(3) | BIT(4), BIT(3)},                       \
+        /*0x23[4] = 1b'1 12H LDO enter sleep mode*/                     \
         {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)},              \
+        /*0x07[7:0] = 0x20 SDIO SOP option to disable BG/MB/ACK/SWR*/   \
         {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x20},                  \
+        /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/              \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3) | BIT(4), BIT(3) | BIT(4)},\
+        /*Set SDIO suspend local register*/                             \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)},             \
+        /*wait power state to suspend*/                                 \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), 0},
 
 #define RTL8723B_TRANS_SUS_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        /*clear suspend enable and power down enable*/                  \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3) | BIT(7), 0},          \
+        /*Set SDIO suspend local register*/                             \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0},                  \
+        /*wait power state to suspend*/                                 \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)},           \
+        /*0x23[4] = 1b'0 12H LDO enter normal mode*/                    \
         {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                   \
+        /*0x04[12:11] = 2b'01enable WL suspend*/                        \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0},
 
 #define RTL8723B_TRANS_CARDEMU_TO_CARDDIS                               \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        /*0x07=0x20 , SOP option to disable BG/MB*/                     \
         {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x20},                  \
+        /*0x04[12:11] = 2b'01 enable WL suspend*/                       \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_USB_MSK | PWR_INTF_SDIO_MSK,                          \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), BIT(3)},       \
+        /*0x04[10] = 1, enable SW LPS*/                                 \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(2), BIT(2)},              \
+        /*0x48[16] = 1 to enable GPIO9 as EXT WAKEUP*/                  \
         {0x004A, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 1},                   \
+        /*0x23[4] = 1b'1 12H LDO enter sleep mode*/                     \
         {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)},              \
+        /*Set SDIO suspend local register*/                             \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), BIT(0)},             \
+        /*wait power state to suspend*/                                 \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), 0},
 
 #define RTL8723B_TRANS_CARDDIS_TO_CARDEMU                               \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        /*clear suspend enable and power down enable*/                  \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3) | BIT(7), 0},          \
+        /*Set SDIO suspend local register*/                             \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT(0), 0},                  \
+        /*wait power state to suspend*/                                 \
         {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)},           \
+        /*0x48[16] = 0 to disable GPIO9 as EXT WAKEUP*/                 \
         {0x004A, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},                   \
+        /*0x04[12:11] = 2b'01enable WL suspend*/                        \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0},            \
+        /*0x23[4] = 1b'0 12H LDO enter normal mode*/                    \
         {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                   \
+        /*PCIe DMA start*/                                              \
         {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},
 
 #define RTL8723B_TRANS_CARDEMU_TO_PDN                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        /*0x23[4] = 1b'1 12H LDO enter sleep mode*/                     \
         {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), BIT(4)},              \
+        /*0x07[7:0] = 0x20 SOP option to disable BG/MB/ACK/SWR*/        \
         {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
          PWR_INTF_SDIO_MSK | PWR_INTF_USB_MSK, PWR_BASEADDR_MAC,        \
          PWR_CMD_WRITE, 0xFF, 0x20},                                    \
+        /* 0x04[16] = 0*/                                               \
         {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},                   \
+        /* 0x04[15] = 1*/                                               \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), BIT(7)},
 
 #define RTL8723B_TRANS_PDN_TO_CARDEMU                                   \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        /* 0x04[15] = 0*/                                               \
         {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(7), 0},
 
 #define RTL8723B_TRANS_ACT_TO_LPS                                       \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        /*PCIe DMA stop*/                                               \
         {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF},                  \
+        /*Tx Pause*/                                                    \
         {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF},                  \
+        /*Should be zero if no packet is transmitting*/                 \
         {0x05F8, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                   \
+        /*Should be zero if no packet is transmitting*/                 \
         {0x05F9, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                   \
+        /*Should be zero if no packet is transmitting*/                 \
         {0x05FA, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                   \
+        /*Should be zero if no packet is transmitting*/                 \
         {0x05FB, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0},                   \
+        /*CCK and OFDM are disabled,and clock are gated*/               \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(0), 0},                   \
+        /*Delay 1us*/                                                   \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US},          \
+        /*Whole BB is reset*/                                           \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0},                   \
+        /*Reset MAC TRX*/                                               \
         {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x03},                  \
+        /*check if removed later*/                                      \
         {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), 0},                   \
+        /*When driver enter Sus/ Disable, enable LOP for BT*/           \
         {0x0093, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x00},                  \
+        /*Respond TxOK to scheduler*/                                   \
         {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(5), BIT(5)},
 
 #define RTL8723B_TRANS_LPS_TO_ACT                                       \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
+        /*SDIO RPWM*/                                                   \
         {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,   \
-         PWR_BASEADDR_SDIO, PWR_CMD_WRITE, 0xFF, 0x84},         \
+         PWR_BASEADDR_SDIO, PWR_CMD_WRITE, 0xFF, 0x84},                 \
+        /*USB RPWM*/                                                    \
         {0xFE58, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84},                  \
+        /*PCIe RPWM*/                                                   \
         {0x0361, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84},                  \
+        /*Delay*/                                                       \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS},          \
+        /*.     0x08[4] = 0              switch TSF to 40M*/            \
         {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0},                   \
+        /*Polling 0x109[7]=0  TSF in 40M*/                              \
         {0x0109, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
-         PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(7), 0},         \
+         PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT(7), 0},                 \
+        /*.     0x29[7:6] = 2b'00        enable BB clock*/              \
         {0x0029, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(6)|BIT(7), 0},            \
+        /*.     0x101[1] = 1*/                                          \
         {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1), BIT(1)},              \
+        /*.     0x100[7:0] = 0xFF        enable WMAC TRX*/              \
         {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF},                  \
+        /*.     0x02[1:0] = 2b'11        enable BB macro*/              \
         {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(1) | BIT(0), BIT(1) | BIT(0)}, \
+        /*.     0x522 = 0*/                                             \
         {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,    \
          PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0},
 
 #define RTL8723B_TRANS_END                                              \
+        /* format */                                                    \
+        /* comments here */                                             \
+        /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, */\
         {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK, 0, \
          PWR_CMD_END, 0, 0},
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c
deleted file mode 100644
index 4573310c707f..000000000000
--- a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/******************************************************************************
- *
- * 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>
- *
- *****************************************************************************/
-
-#include "pwrseq.h"
-
-/*      Description:
- *              This routine deal with the Power Configuration CMDs
- *               parsing for RTL8723/RTL8188E Series IC.
- *      Assumption:
- *              We should follow specific format which was released from HW SD.
- *
- *      2011.07.07, added by Roger.
- */
-bool rtlbe_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
-                                 u8 fab_version, u8 interface_type,
-                                 struct wlan_pwr_cfg pwrcfgcmd[])
-
-{
-        struct wlan_pwr_cfg pwr_cfg_cmd = {0};
-        bool b_polling_bit = false;
-        u32 ary_idx = 0;
-        u8 value = 0;
-        u32 offset = 0;
-        u32 polling_count = 0;
-        u32 max_polling_cnt = 5000;
-
-        do {
-                pwr_cfg_cmd = pwrcfgcmd[ary_idx];
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "rtlbe_hal_pwrseqcmdparsing(): "
-                         "offset(%#x),cut_msk(%#x), fab_msk(%#x),"
-                         "interface_msk(%#x), base(%#x), "
-                         "cmd(%#x), msk(%#x), value(%#x)\n",
-                         GET_PWR_CFG_OFFSET(pwr_cfg_cmd),
-                         GET_PWR_CFG_CUT_MASK(pwr_cfg_cmd),
-                         GET_PWR_CFG_FAB_MASK(pwr_cfg_cmd),
-                         GET_PWR_CFG_INTF_MASK(pwr_cfg_cmd),
-                         GET_PWR_CFG_BASE(pwr_cfg_cmd),
-                         GET_PWR_CFG_CMD(pwr_cfg_cmd),
-                         GET_PWR_CFG_MASK(pwr_cfg_cmd),
-                         GET_PWR_CFG_VALUE(pwr_cfg_cmd));
-
-                if ((GET_PWR_CFG_FAB_MASK(pwr_cfg_cmd)&fab_version) &&
-                    (GET_PWR_CFG_CUT_MASK(pwr_cfg_cmd)&cut_version) &&
-                    (GET_PWR_CFG_INTF_MASK(pwr_cfg_cmd)&interface_type)) {
-                        switch (GET_PWR_CFG_CMD(pwr_cfg_cmd)) {
-                        case PWR_CMD_READ:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtlbe_hal_pwrseqcmdparsing(): "
-                                          "PWR_CMD_READ\n");
-                                break;
-                        case PWR_CMD_WRITE:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtlbe_hal_pwrseqcmdparsing(): "
-                                          "PWR_CMD_WRITE\n");
-                                offset = GET_PWR_CFG_OFFSET(pwr_cfg_cmd);
-
-                                /*Read the value from system register*/
-                                value = rtl_read_byte(rtlpriv, offset);
-                                value &= (~(GET_PWR_CFG_MASK(pwr_cfg_cmd)));
-                                value = value | (GET_PWR_CFG_VALUE(pwr_cfg_cmd)
-                                        & GET_PWR_CFG_MASK(pwr_cfg_cmd));
-
-                                /*Write the value back to sytem register*/
-                                rtl_write_byte(rtlpriv, offset, value);
-                                break;
-                        case PWR_CMD_POLLING:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtlbe_hal_pwrseqcmdparsing(): "
-                                          "PWR_CMD_POLLING\n");
-                                b_polling_bit = false;
-                                offset = GET_PWR_CFG_OFFSET(pwr_cfg_cmd);
-
-                                do {
-                                        value = rtl_read_byte(rtlpriv, offset);
-
-                                        value &= GET_PWR_CFG_MASK(pwr_cfg_cmd);
-                                        if (value ==
-                                            (GET_PWR_CFG_VALUE(pwr_cfg_cmd) &
-                                             GET_PWR_CFG_MASK(pwr_cfg_cmd)))
-                                                b_polling_bit = true;
-                                        else
-                                                udelay(10);
-
-                                        if (polling_count++ > max_polling_cnt)
-                                                return false;
-
-                                } while (!b_polling_bit);
-                                break;
-                        case PWR_CMD_DELAY:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtlbe_hal_pwrseqcmdparsing(): "
-                                         "PWR_CMD_DELAY\n");
-                                if (GET_PWR_CFG_VALUE(pwr_cfg_cmd) ==
-                                    PWRSEQ_DELAY_US)
-                                        udelay(GET_PWR_CFG_OFFSET(pwr_cfg_cmd));
-                                else
-                                        mdelay(GET_PWR_CFG_OFFSET(pwr_cfg_cmd));
-                                break;
-                        case PWR_CMD_END:
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         "rtlbe_hal_pwrseqcmdparsing(): "
-                                         "PWR_CMD_END\n");
-                                return true;
-                        default:
-                                RT_ASSERT(false,
-                                          "rtlbe_hal_pwrseqcmdparsing(): "
-                                          "Unknown CMD!!\n");
-                                break;
-                        }
-                }
-
-                ary_idx++;
-        } while (1);
-
-        return true;
-}
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h
deleted file mode 100644
index ce14a3b5cb71..000000000000
--- a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************
- *
- * 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>
- *
- *****************************************************************************/
-
-#ifndef __RTL8723BE_PWRSEQCMD_H__
-#define __RTL8723BE_PWRSEQCMD_H__
-
-#include "../wifi.h"
-/*---------------------------------------------*/
-/*The value of cmd: 4 bits */
-/*---------------------------------------------*/
-#define PWR_CMD_READ            0x00
-#define PWR_CMD_WRITE           0x01
-#define PWR_CMD_POLLING         0x02
-#define PWR_CMD_DELAY           0x03
-#define PWR_CMD_END             0x04
-
-/* define the base address of each block */
-#define PWR_BASEADDR_MAC        0x00
-#define PWR_BASEADDR_USB        0x01
-#define PWR_BASEADDR_PCIE       0x02
-#define PWR_BASEADDR_SDIO       0x03
-
-#define PWR_INTF_SDIO_MSK       BIT(0)
-#define PWR_INTF_USB_MSK        BIT(1)
-#define PWR_INTF_PCI_MSK        BIT(2)
-#define PWR_INTF_ALL_MSK        (BIT(0) | BIT(1) | BIT(2) | BIT(3))
-
-#define PWR_FAB_TSMC_MSK        BIT(0)
-#define PWR_FAB_UMC_MSK         BIT(1)
-#define PWR_FAB_ALL_MSK         (BIT(0) | BIT(1) | BIT(2) | BIT(3))
-
-#define PWR_CUT_TESTCHIP_MSK    BIT(0)
-#define PWR_CUT_A_MSK           BIT(1)
-#define PWR_CUT_B_MSK           BIT(2)
-#define PWR_CUT_C_MSK           BIT(3)
-#define PWR_CUT_D_MSK           BIT(4)
-#define PWR_CUT_E_MSK           BIT(5)
-#define PWR_CUT_F_MSK           BIT(6)
-#define PWR_CUT_G_MSK           BIT(7)
-#define PWR_CUT_ALL_MSK         0xFF
-
-
-enum pwrseq_delay_unit {
-        PWRSEQ_DELAY_US,
-        PWRSEQ_DELAY_MS,
-};
-
-struct wlan_pwr_cfg {
-        u16 offset;
-        u8 cut_msk;
-        u8 fab_msk:4;
-        u8 interface_msk:4;
-        u8 base:4;
-        u8 cmd:4;
-        u8 msk;
-        u8 value;
-
-};
-
-#define GET_PWR_CFG_OFFSET(__PWR_CMD)   __PWR_CMD.offset
-#define GET_PWR_CFG_CUT_MASK(__PWR_CMD) __PWR_CMD.cut_msk
-#define GET_PWR_CFG_FAB_MASK(__PWR_CMD) __PWR_CMD.fab_msk
-#define GET_PWR_CFG_INTF_MASK(__PWR_CMD)        __PWR_CMD.interface_msk
-#define GET_PWR_CFG_BASE(__PWR_CMD)     __PWR_CMD.base
-#define GET_PWR_CFG_CMD(__PWR_CMD)      __PWR_CMD.cmd
-#define GET_PWR_CFG_MASK(__PWR_CMD)     __PWR_CMD.msk
-#define GET_PWR_CFG_VALUE(__PWR_CMD)    __PWR_CMD.value
-
-bool rtlbe_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
-                                 u8 fab_version, u8 interface_type,
-                                 struct wlan_pwr_cfg pwrcfgcmd[]);
-
-#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/reg.h b/drivers/net/wireless/rtlwifi/rtl8723be/reg.h
index 3006849ed439..03581d2a5da0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/reg.h
@@ -78,11 +78,11 @@
 #define REG_WOL_EVENT                           0x0081
 #define REG_MCUTSTCFG                           0x0084
 
-
 #define REG_HIMR                                0x00B0
 #define REG_HISR                                0x00B4
 #define REG_HIMRE                               0x00B8
 #define REG_HISRE                               0x00BC
+#define REG_PMC_DBG_CTRL2                       0x00CC
 
 #define REG_EFUSE_ACCESS                        0x00CF
 
@@ -95,7 +95,8 @@
 #define REG_HPON_FSM                            0x00EC
 #define REG_SYS_CFG                             0x00F0
 #define REG_GPIO_OUTSTS                         0x00F4
-#define REG_SYS_CFG1                            0x00F0
+#define REG_MAC_PHY_CTRL_NORMAL                 0x00F8
+#define REG_SYS_CFG1                            0x00FC
 #define REG_ROM_VERSION                         0x00FD
 
 #define REG_CR                                  0x0100
@@ -170,8 +171,14 @@
 #define REG_BKQ_DESA                            0x0338
 #define REG_RX_DESA                             0x0340
 
-#define REG_DBI                                 0x0348
-#define REG_MDIO                                0x0354
+#define REG_DBI_WDATA                           0x0348
+#define REG_DBI_RDATA                           0x034C
+#define REG_DBI_CTRL                            0x0350
+#define REG_DBI_ADDR                            0x0350
+#define REG_DBI_FLAG                            0x0352
+#define REG_MDIO_WDATA                          0x0354
+#define REG_MDIO_RDATA                          0x0356
+#define REG_MDIO_CTL                            0x0358
 #define REG_DBG_SEL                             0x0360
 #define REG_PCIE_HRPWM                          0x0361
 #define REG_PCIE_HCPWM                          0x0363
@@ -180,7 +187,6 @@
 #define REG_UART_TX_DESA                        0x0370
 #define REG_UART_RX_DESA                        0x0378
 
-
 #define REG_HDAQ_DESA_NODEF                     0x0000
 #define REG_CMDQ_DESA_NODEF                     0x0000
 
@@ -193,7 +199,6 @@
 #define REG_BCNQ_INFORMATION                    0x0418
 #define REG_TXPKT_EMPTY                         0x041A
 
-
 #define REG_CPU_MGQ_INFORMATION                 0x041C
 #define REG_FWHW_TXQ_CTRL                       0x0420
 #define REG_HWSEQ_CTRL                          0x0423
@@ -207,9 +212,7 @@
 #define REG_RARFRC                              0x0438
 #define REG_RRSR                                0x0440
 #define REG_ARFR0                               0x0444
-#define REG_ARFR1                               0x0448
-#define REG_ARFR2                               0x044C
-#define REG_ARFR3                               0x0450
+#define REG_ARFR1                               0x044C
 #define REG_AMPDU_MAX_TIME                      0x0456
 #define REG_AGGLEN_LMT                          0x0458
 #define REG_AMPDU_MIN_SPACE                     0x045C
@@ -223,7 +226,10 @@
 #define REG_POWER_STAGE2                        0x04B8
 #define REG_PKT_LIFE_TIME                       0x04C0
 #define REG_STBC_SETTING                        0x04C4
+#define REG_HT_SINGLE_AMPDU                     0x04C7
+
 #define REG_PROT_MODE_CTRL                      0x04C8
+#define REG_MAX_AGGR_NUM                        0x04CA
 #define REG_BAR_MODE_CTRL                       0x04CC
 #define REG_RA_TRY_RATE_AGG_LMT                 0x04CF
 #define REG_EARLY_MODE_CONTROL                  0x04D0
@@ -303,6 +309,7 @@
 #define REG_EIFS                                0x0642
 
 #define REG_NAV_CTRL                            0x0650
+#define REG_NAV_UPPER                           0x0652
 #define REG_BACAMCMD                            0x0654
 #define REG_BACAMCONTENT                        0x0658
 #define REG_LBDLY                               0x0660
@@ -355,43 +362,43 @@
 #define REG_NORMAL_SIE_MAC_ADDR                 0xFE70
 #define REG_NORMAL_SIE_STRING                   0xFE80
 
-#define CR9346                                  REG_9346CR
-#define MSR                                     (REG_CR + 2)
-#define ISR                                     REG_HISR
-#define TSFR                                    REG_TSFTR
+#define CR9346                          REG_9346CR
+#define MSR                             (REG_CR + 2)
+#define ISR                             REG_HISR
+#define TSFR                            REG_TSFTR
 
-#define MACIDR0                                 REG_MACID
-#define MACIDR4                                 (REG_MACID + 4)
+#define MACIDR0                         REG_MACID
+#define MACIDR4                         (REG_MACID + 4)
 
-#define PBP                                     REG_PBP
+#define PBP                             REG_PBP
 
-#define IDR0                                    MACIDR0
-#define IDR4                                    MACIDR4
+#define IDR0                            MACIDR0
+#define IDR4                            MACIDR4
 
-#define UNUSED_REGISTER                         0x1BF
-#define DCAM                                    UNUSED_REGISTER
-#define PSR                                     UNUSED_REGISTER
-#define BBADDR                                  UNUSED_REGISTER
-#define PHYDATAR                                UNUSED_REGISTER
+#define UNUSED_REGISTER                 0x1BF
+#define DCAM                            UNUSED_REGISTER
+#define PSR                             UNUSED_REGISTER
+#define BBADDR                          UNUSED_REGISTER
+#define PHYDATAR                        UNUSED_REGISTER
 
-#define INVALID_BBRF_VALUE                      0x12345678
+#define INVALID_BBRF_VALUE              0x12345678
 
-#define MAX_MSS_DENSITY_2T                      0x13
-#define MAX_MSS_DENSITY_1T                      0x0A
+#define MAX_MSS_DENSITY_2T              0x13
+#define MAX_MSS_DENSITY_1T              0x0A
 
-#define CMDEEPROM_EN                            BIT(5)
-#define CMDEEPROM_SEL                           BIT(4)
-#define CMD9346CR_9356SEL                       BIT(4)
-#define AUTOLOAD_EEPROM                         (CMDEEPROM_EN | CMDEEPROM_SEL)
-#define AUTOLOAD_EFUSE                          CMDEEPROM_EN
+#define CMDEEPROM_EN                    BIT(5)
+#define CMDEEPROM_SEL                   BIT(4)
+#define CMD9346CR_9356SEL               BIT(4)
+#define AUTOLOAD_EEPROM                 (CMDEEPROM_EN | CMDEEPROM_SEL)
+#define AUTOLOAD_EFUSE                  CMDEEPROM_EN
 
-#define GPIOSEL_GPIO                            0
-#define GPIOSEL_ENBT                            BIT(5)
+#define GPIOSEL_GPIO                    0
+#define GPIOSEL_ENBT                    BIT(5)
 
-#define GPIO_IN                                 REG_GPIO_PIN_CTRL
-#define GPIO_OUT                                (REG_GPIO_PIN_CTRL + 1)
-#define GPIO_IO_SEL                             (REG_GPIO_PIN_CTRL + 2)
-#define GPIO_MOD                                (REG_GPIO_PIN_CTRL + 3)
+#define GPIO_IN                         REG_GPIO_PIN_CTRL
+#define GPIO_OUT                        (REG_GPIO_PIN_CTRL + 1)
+#define GPIO_IO_SEL                     (REG_GPIO_PIN_CTRL + 2)
+#define GPIO_MOD                        (REG_GPIO_PIN_CTRL + 3)
 
 /* 8723/8188E Host System Interrupt Mask Register (offset 0x58, 32 byte) */
 #define HSIMR_GPIO12_0_INT_EN                   BIT(0)
@@ -400,8 +407,7 @@
 #define HSIMR_PDN_INT_EN                        BIT(7)
 #define HSIMR_GPIO9_INT_EN                      BIT(25)
 
-/* 8723/8188E Host System Interrupt Status Register (offset 0x5C, 32 byte) */
-
+/*  8723/8188E Host System Interrupt Status Register (offset 0x5C, 32 byte) */
 #define HSISR_GPIO12_0_INT                      BIT(0)
 #define HSISR_SPS_OCP_INT                       BIT(5)
 #define HSISR_RON_INT_EN                        BIT(6)
@@ -412,7 +418,6 @@
 #define MSR_ADHOC                               0x01
 #define MSR_INFRA                               0x02
 #define MSR_AP                                  0x03
-#define MSR_MASK                                0x03
 
 #define RRSR_RSC_OFFSET                         21
 #define RRSR_SHORT_OFFSET                       23
@@ -542,7 +547,8 @@
 
 /*********************************************
 *       8723BE IMR/ISR bits
-**********************************************/
+*********************************************
+*/
 #define IMR_DISABLED                            0x0
 /* IMR DW0(0x0060-0063) Bit 0-31 */
 #define IMR_TXCCK               BIT(30) /* TXRPT interrupt when
@@ -644,7 +650,7 @@
 #define RF_OPTION1                              0x79
 #define RF_OPTION2                              0x7A
 #define RF_OPTION3                              0x7B
-#define RF_OPTION4                              0xC3
+#define EEPROM_RF_BT_SETTING_8723B              0xC3
 
 #define EEPROM_DEFAULT_PID                      0x1234
 #define EEPROM_DEFAULT_VID                      0x5678
@@ -678,14 +684,11 @@
 #define EEPROM_CLK                              0x06
 #define EEPROM_TESTR                            0x08
 
-
 #define EEPROM_TXPOWERCCK                       0x10
 #define EEPROM_TXPOWERHT40_1S                   0x16
 #define EEPROM_TXPOWERHT20DIFF                  0x1B
 #define EEPROM_TXPOWER_OFDMDIFF                 0x1B
 
-
-
 #define EEPROM_TX_PWR_INX                       0x10
 
 #define EEPROM_CHANNELPLAN                      0xB8
@@ -1198,7 +1201,7 @@
 #define APP_MIC                                 BIT(30)
 #define APP_FCS                                 BIT(31)
 
-#define _MIN_SPACE(x)                   ((x) & 0x7)
+#define _MIN_SPACE(x)                           ((x) & 0x7)
 #define _SHORT_GI_PADDING(x)            (((x) & 0x1F) << 3)
 
 #define RXERR_TYPE_OFDM_PPDU            0
@@ -1216,105 +1219,105 @@
 #define RXERR_TYPE_HT_MPDU_FAIL         12
 #define RXERR_TYPE_RX_FULL_DROP         15
 
-#define RXERR_COUNTER_MASK              0xFFFFF
-#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_TXBCUSEDK                   BIT(6)
-#define SCR_RXBCUSEDK                   BIT(7)
-
-#define XCLK_VLD                        BIT(0)
-#define ACLK_VLD                        BIT(1)
-#define UCLK_VLD                        BIT(2)
-#define PCLK_VLD                        BIT(3)
-#define PCIRSTB                         BIT(4)
-#define V15_VLD                         BIT(5)
-#define TRP_B15V_EN                     BIT(7)
-#define SIC_IDLE                        BIT(8)
-#define BD_MAC2                         BIT(9)
-#define BD_MAC1                         BIT(10)
-#define IC_MACPHY_MODE                  BIT(11)
-#define BT_FUNC                         BIT(16)
-#define VENDOR_ID                       BIT(19)
-#define PAD_HWPD_IDN                    BIT(22)
-#define TRP_VAUX_EN                     BIT(23)
-#define TRP_BT_EN                       BIT(24)
-#define BD_PKG_SEL                      BIT(25)
-#define BD_HCI_SEL                      BIT(26)
-#define TYPE_ID                         BIT(27)
-
-#define USB_IS_HIGH_SPEED               0
-#define USB_IS_FULL_SPEED               1
-#define USB_SPEED_MASK                  BIT(5)
-
-#define USB_NORMAL_SIE_EP_MASK          0xF
-#define USB_NORMAL_SIE_EP_SHIFT         4
-
-#define USB_TEST_EP_MASK                0x30
-#define USB_TEST_EP_SHIFT               4
-
-#define USB_AGG_EN                      BIT(3)
-
-#define MAC_ADDR_LEN                    6
-#define LAST_ENTRY_OF_TX_PKT_BUFFER     175/*255    88e*/
-
-#define POLLING_LLT_THRESHOLD           20
-#define POLLING_READY_TIMEOUT_COUNT     3000
+#define RXERR_COUNTER_MASK                      0xFFFFF
+#define RXERR_RPT_RST                           BIT(27)
+#define _RXERR_RPT_SEL(type)                    ((type) << 28)
 
-#define MAX_MSS_DENSITY_2T              0x13
-#define MAX_MSS_DENSITY_1T              0x0A
+#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)
+
+#define XCLK_VLD                                BIT(0)
+#define ACLK_VLD                                BIT(1)
+#define UCLK_VLD                                BIT(2)
+#define PCLK_VLD                                BIT(3)
+#define PCIRSTB                                 BIT(4)
+#define V15_VLD                                 BIT(5)
+#define TRP_B15V_EN                             BIT(7)
+#define SIC_IDLE                                BIT(8)
+#define BD_MAC2                                 BIT(9)
+#define BD_MAC1                                 BIT(10)
+#define IC_MACPHY_MODE                          BIT(11)
+#define BT_FUNC                                 BIT(16)
+#define VENDOR_ID                               BIT(19)
+#define PAD_HWPD_IDN                            BIT(22)
+#define TRP_VAUX_EN                             BIT(23)
+#define TRP_BT_EN                               BIT(24)
+#define BD_PKG_SEL                              BIT(25)
+#define BD_HCI_SEL                              BIT(26)
+#define TYPE_ID                                 BIT(27)
+
+#define USB_IS_HIGH_SPEED                       0
+#define USB_IS_FULL_SPEED                       1
+#define USB_SPEED_MASK                          BIT(5)
+
+#define USB_NORMAL_SIE_EP_MASK                  0xF
+#define USB_NORMAL_SIE_EP_SHIFT                 4
+
+#define USB_TEST_EP_MASK                        0x30
+#define USB_TEST_EP_SHIFT                       4
+
+#define USB_AGG_EN                              BIT(3)
+
+#define MAC_ADDR_LEN                            6
+#define LAST_ENTRY_OF_TX_PKT_BUFFER             175/*255    88e*/
+
+#define POLLING_LLT_THRESHOLD                   20
+#define POLLING_READY_TIMEOUT_COUNT             3000
+
+#define MAX_MSS_DENSITY_2T                      0x13
+#define MAX_MSS_DENSITY_1T                      0x0A
 
 #define EPROM_CMD_OPERATING_MODE_MASK   ((1<<7)|(1<<6))
-#define EPROM_CMD_CONFIG                0x3
-#define EPROM_CMD_LOAD                  1
-
-#define HWSET_MAX_SIZE_92S              HWSET_MAX_SIZE
-
-#define HAL_8192C_HW_GPIO_WPS_BIT       BIT(2)
-
-#define RPMAC_RESET                     0x100
-#define RPMAC_TXSTART                   0x104
-#define RPMAC_TXLEGACYSIG               0x108
-#define RPMAC_TXHTSIG1                  0x10c
-#define RPMAC_TXHTSIG2                  0x110
-#define RPMAC_PHYDEBUG                  0x114
-#define RPMAC_TXPACKETNUM               0x118
-#define RPMAC_TXIDLE                    0x11c
-#define RPMAC_TXMACHEADER0              0x120
-#define RPMAC_TXMACHEADER1              0x124
-#define RPMAC_TXMACHEADER2              0x128
-#define RPMAC_TXMACHEADER3              0x12c
-#define RPMAC_TXMACHEADER4              0x130
-#define RPMAC_TXMACHEADER5              0x134
-#define RPMAC_TXDADATYPE                0x138
-#define RPMAC_TXRANDOMSEED              0x13c
-#define RPMAC_CCKPLCPPREAMBLE           0x140
-#define RPMAC_CCKPLCPHEADER             0x144
-#define RPMAC_CCKCRC16                  0x148
-#define RPMAC_OFDMRXCRC32OK             0x170
-#define RPMAC_OFDMRXCRC32ER             0x174
-#define RPMAC_OFDMRXPARITYER            0x178
-#define RPMAC_OFDMRXCRC8ER              0x17c
-#define RPMAC_CCKCRXRC16ER              0x180
-#define RPMAC_CCKCRXRC32ER              0x184
-#define RPMAC_CCKCRXRC32OK              0x188
-#define RPMAC_TXSTATUS                  0x18c
-
-#define RFPGA0_RFMOD                    0x800
-
-#define RFPGA0_TXINFO                   0x804
-#define RFPGA0_PSDFUNCTION              0x808
-
-#define RFPGA0_TXGAINSTAGE              0x80c
-
-#define RFPGA0_RFTIMING1                0x810
-#define RFPGA0_RFTIMING2                0x814
+#define EPROM_CMD_CONFIG                        0x3
+#define EPROM_CMD_LOAD                          1
+
+#define HWSET_MAX_SIZE_92S                      HWSET_MAX_SIZE
+
+#define HAL_8192C_HW_GPIO_WPS_BIT               BIT(2)
+
+#define RPMAC_RESET                             0x100
+#define RPMAC_TXSTART                           0x104
+#define RPMAC_TXLEGACYSIG                       0x108
+#define RPMAC_TXHTSIG1                          0x10c
+#define RPMAC_TXHTSIG2                          0x110
+#define RPMAC_PHYDEBUG                          0x114
+#define RPMAC_TXPACKETNUM                       0x118
+#define RPMAC_TXIDLE                            0x11c
+#define RPMAC_TXMACHEADER0                      0x120
+#define RPMAC_TXMACHEADER1                      0x124
+#define RPMAC_TXMACHEADER2                      0x128
+#define RPMAC_TXMACHEADER3                      0x12c
+#define RPMAC_TXMACHEADER4                      0x130
+#define RPMAC_TXMACHEADER5                      0x134
+#define RPMAC_TXDADATYPE                        0x138
+#define RPMAC_TXRANDOMSEED                      0x13c
+#define RPMAC_CCKPLCPPREAMBLE                   0x140
+#define RPMAC_CCKPLCPHEADER                     0x144
+#define RPMAC_CCKCRC16                          0x148
+#define RPMAC_OFDMRXCRC32OK                     0x170
+#define RPMAC_OFDMRXCRC32ER                     0x174
+#define RPMAC_OFDMRXPARITYER                    0x178
+#define RPMAC_OFDMRXCRC8ER                      0x17c
+#define RPMAC_CCKCRXRC16ER                      0x180
+#define RPMAC_CCKCRXRC32ER                      0x184
+#define RPMAC_CCKCRXRC32OK                      0x188
+#define RPMAC_TXSTATUS                          0x18c
+
+#define RFPGA0_RFMOD                            0x800
+
+#define RFPGA0_TXINFO                           0x804
+#define RFPGA0_PSDFUNCTION                      0x808
+
+#define RFPGA0_TXGAINSTAGE                      0x80c
+
+#define RFPGA0_RFTIMING1                        0x810
+#define RFPGA0_RFTIMING2                        0x814
 
 #define RFPGA0_XA_HSSIPARAMETER1        0x820
 #define RFPGA0_XA_HSSIPARAMETER2        0x824
@@ -1385,7 +1388,6 @@
 #define RCCK0_FACOUNTERUPPER            0xa58
 #define RCCK0_CCA_CNT                   0xa60
 
-
 /* PageB(0xB00) */
 #define RPDP_ANTA                       0xb00
 #define RPDP_ANTA_4                     0xb04
@@ -1399,7 +1401,7 @@
 #define RPDP_ANTA_24                    0xb24
 
 #define RCONFIG_PMPD_ANTA               0xb28
-#define CONFIG_RAM64X16                 0xb2c
+#define RCONFIG_ram64x16                0xb2c
 
 #define RBNDA                           0xb30
 #define RHSSIPAR                        0xb34
@@ -1494,7 +1496,6 @@
 #define ROFDM0_FRAMESYNC                0xcf0
 #define ROFDM0_DFSREPORT                0xcf4
 
-
 #define ROFDM1_LSTF                     0xd00
 #define ROFDM1_TRXPATHENABLE            0xd04
 
@@ -1593,144 +1594,144 @@
 #define RSLEEP                          0xee0
 #define RPMPD_ANAEN                     0xeec
 
-#define RZEBRA1_HSSIENABLE              0x0
-#define RZEBRA1_TRXENABLE1              0x1
-#define RZEBRA1_TRXENABLE2              0x2
-#define RZEBRA1_AGC                     0x4
-#define RZEBRA1_CHARGEPUMP              0x5
-#define RZEBRA1_CHANNEL                 0x7
-
-#define RZEBRA1_TXGAIN                  0x8
-#define RZEBRA1_TXLPF                   0x9
-#define RZEBRA1_RXLPF                   0xb
-#define RZEBRA1_RXHPFCORNER             0xc
-
-#define RGLOBALCTRL                     0
-#define RRTL8256_TXLPF                  19
-#define RRTL8256_RXLPF                  11
-#define RRTL8258_TXLPF                  0x11
-#define RRTL8258_RXLPF                  0x13
-#define RRTL8258_RSSILPF                0xa
-
-#define RF_AC                           0x00
-
-#define RF_IQADJ_G1                     0x01
-#define RF_IQADJ_G2                     0x02
-#define RF_POW_TRSW                     0x05
-
-#define RF_GAIN_RX                      0x06
-#define RF_GAIN_TX                      0x07
-
-#define RF_TXM_IDAC                     0x08
-#define RF_BS_IQGEN                     0x0F
-
-#define RF_MODE1                        0x10
-#define RF_MODE2                        0x11
-
-#define RF_RX_AGC_HP                    0x12
-#define RF_TX_AGC                       0x13
-#define RF_BIAS                         0x14
-#define RF_IPA                          0x15
-#define RF_POW_ABILITY                  0x17
-#define RF_MODE_AG                      0x18
-#define RRFCHANNEL                      0x18
-#define RF_CHNLBW                       0x18
-#define RF_TOP                          0x19
-
-#define RF_RX_G1                        0x1A
-#define RF_RX_G2                        0x1B
-
-#define RF_RX_BB2                       0x1C
-#define RF_RX_BB1                       0x1D
-
-#define RF_RCK1                         0x1E
-#define RF_RCK2                         0x1F
-
-#define RF_TX_G1                        0x20
-#define RF_TX_G2                        0x21
-#define RF_TX_G3                        0x22
-
-#define RF_TX_BB1                       0x23
-#define RF_T_METER                      0x42
-
-#define RF_SYN_G1                       0x25
-#define RF_SYN_G2                       0x26
-#define RF_SYN_G3                       0x27
-#define RF_SYN_G4                       0x28
-#define RF_SYN_G5                       0x29
-#define RF_SYN_G6                       0x2A
-#define RF_SYN_G7                       0x2B
-#define RF_SYN_G8                       0x2C
-
-#define RF_RCK_OS                       0x30
-#define RF_TXPA_G1                      0x31
-#define RF_TXPA_G2                      0x32
-#define RF_TXPA_G3                      0x33
-
-#define RF_TX_BIAS_A                    0x35
-#define RF_TX_BIAS_D                    0x36
-#define RF_LOBF_9                       0x38
-#define RF_RXRF_A3                      0x3C
-#define RF_TRSW                         0x3F
-
-#define RF_TXRF_A2                      0x41
-#define RF_TXPA_G4                      0x46
-#define RF_TXPA_A4                      0x4B
-
-#define RF_WE_LUT                       0xEF
-
-#define BBBRESETB                       0x100
-#define BGLOBALRESETB                   0x200
-#define BOFDMTXSTART                    0x4
-#define BCCKTXSTART                     0x8
-#define BCRC32DEBUG                     0x100
-#define BPMACLOOPBACK                   0x10
-#define BTXLSIG                         0xffffff
-#define BOFDMTXRATE                     0xf
-#define BOFDMTXRESERVED                 0x10
-#define BOFDMTXLENGTH                   0x1ffe0
-#define BOFDMTXPARITY                   0x20000
-#define BTXHTSIG1                       0xffffff
-#define BTXHTMCSRATE                    0x7f
-#define BTXHTBW                         0x80
-#define BTXHTLENGTH                     0xffff00
-#define BTXHTSIG2                       0xffffff
-#define BTXHTSMOOTHING                  0x1
-#define BTXHTSOUNDING                   0x2
-#define BTXHTRESERVED                   0x4
-#define BTXHTAGGREATION                 0x8
-#define BTXHTSTBC                       0x30
-#define BTXHTADVANCECODING              0x40
-#define BTXHTSHORTGI                    0x80
-#define BTXHTNUMBERHT_LTF               0x300
-#define BTXHTCRC8                       0x3fc00
-#define BCOUNTERRESET                   0x10000
-#define BNUMOFOFDMTX                    0xffff
-#define BNUMOFCCKTX                     0xffff0000
-#define BTXIDLEINTERVAL                 0xffff
-#define BOFDMSERVICE                    0xffff0000
-#define BTXMACHEADER                    0xffffffff
-#define BTXDATAINIT                     0xff
-#define BTXHTMODE                       0x100
-#define BTXDATATYPE                     0x30000
-#define BTXRANDOMSEED                   0xffffffff
-#define BCCKTXPREAMBLE                  0x1
-#define BCCKTXSFD                       0xffff0000
-#define BCCKTXSIG                       0xff
-#define BCCKTXSERVICE                   0xff00
-#define BCCKLENGTHEXT                   0x8000
-#define BCCKTXLENGHT                    0xffff0000
-#define BCCKTXCRC16                     0xffff
-#define BCCKTXSTATUS                    0x1
-#define BOFDMTXSTATUS                   0x2
+#define RZEBRA1_HSSIENABLE                      0x0
+#define RZEBRA1_TRXENABLE1                      0x1
+#define RZEBRA1_TRXENABLE2                      0x2
+#define RZEBRA1_AGC                             0x4
+#define RZEBRA1_CHARGEPUMP                      0x5
+#define RZEBRA1_CHANNEL                         0x7
+
+#define RZEBRA1_TXGAIN                          0x8
+#define RZEBRA1_TXLPF                           0x9
+#define RZEBRA1_RXLPF                           0xb
+#define RZEBRA1_RXHPFCORNER                     0xc
+
+#define RGLOBALCTRL                             0
+#define RRTL8256_TXLPF                          19
+#define RRTL8256_RXLPF                          11
+#define RRTL8258_TXLPF                          0x11
+#define RRTL8258_RXLPF                          0x13
+#define RRTL8258_RSSILPF                        0xa
+
+#define RF_AC                                   0x00
+
+#define RF_IQADJ_G1                             0x01
+#define RF_IQADJ_G2                             0x02
+#define RF_POW_TRSW                             0x05
+
+#define RF_GAIN_RX                              0x06
+#define RF_GAIN_TX                              0x07
+
+#define RF_TXM_IDAC                             0x08
+#define RF_BS_IQGEN                             0x0F
+
+#define RF_MODE1                                0x10
+#define RF_MODE2                                0x11
+
+#define RF_RX_AGC_HP                            0x12
+#define RF_TX_AGC                               0x13
+#define RF_BIAS                                 0x14
+#define RF_IPA                                  0x15
+#define RF_POW_ABILITY                          0x17
+#define RF_MODE_AG                              0x18
+#define RRFCHANNEL                              0x18
+#define RF_CHNLBW                               0x18
+#define RF_TOP                                  0x19
+
+#define RF_RX_G1                                0x1A
+#define RF_RX_G2                                0x1B
+
+#define RF_RX_BB2                               0x1C
+#define RF_RX_BB1                               0x1D
+
+#define RF_RCK1                                 0x1E
+#define RF_RCK2                                 0x1F
+
+#define RF_TX_G1                                0x20
+#define RF_TX_G2                                0x21
+#define RF_TX_G3                                0x22
+
+#define RF_TX_BB1                               0x23
+#define RF_T_METER                              0x42
+
+#define RF_SYN_G1                               0x25
+#define RF_SYN_G2                               0x26
+#define RF_SYN_G3                               0x27
+#define RF_SYN_G4                               0x28
+#define RF_SYN_G5                               0x29
+#define RF_SYN_G6                               0x2A
+#define RF_SYN_G7                               0x2B
+#define RF_SYN_G8                               0x2C
+
+#define RF_RCK_OS                               0x30
+#define RF_TXPA_G1                              0x31
+#define RF_TXPA_G2                              0x32
+#define RF_TXPA_G3                              0x33
+
+#define RF_TX_BIAS_A                            0x35
+#define RF_TX_BIAS_D                            0x36
+#define RF_LOBF_9                               0x38
+#define RF_RXRF_A3                              0x3C
+#define RF_TRSW                                 0x3F
+
+#define RF_TXRF_A2                              0x41
+#define RF_TXPA_G4                              0x46
+#define RF_TXPA_A4                              0x4B
+
+#define RF_WE_LUT                               0xEF
+
+#define BBBRESETB                               0x100
+#define BGLOBALRESETB                           0x200
+#define BOFDMTXSTART                            0x4
+#define BCCKTXSTART                             0x8
+#define BCRC32DEBUG                             0x100
+#define BPMACLOOPBACK                           0x10
+#define BTXLSIG                                 0xffffff
+#define BOFDMTXRATE                             0xf
+#define BOFDMTXRESERVED                         0x10
+#define BOFDMTXLENGTH                           0x1ffe0
+#define BOFDMTXPARITY                           0x20000
+#define BTXHTSIG1                               0xffffff
+#define BTXHTMCSRATE                            0x7f
+#define BTXHTBW                                 0x80
+#define BTXHTLENGTH                             0xffff00
+#define BTXHTSIG2                               0xffffff
+#define BTXHTSMOOTHING                          0x1
+#define BTXHTSOUNDING                           0x2
+#define BTXHTRESERVED                           0x4
+#define BTXHTAGGREATION                         0x8
+#define BTXHTSTBC                               0x30
+#define BTXHTADVANCECODING                      0x40
+#define BTXHTSHORTGI                            0x80
+#define BTXHTNUMBERHT_LTF                       0x300
+#define BTXHTCRC8                               0x3fc00
+#define BCOUNTERRESET                           0x10000
+#define BNUMOFOFDMTX                            0xffff
+#define BNUMOFCCKTX                             0xffff0000
+#define BTXIDLEINTERVAL                         0xffff
+#define BOFDMSERVICE                            0xffff0000
+#define BTXMACHEADER                            0xffffffff
+#define BTXDATAINIT                             0xff
+#define BTXHTMODE                               0x100
+#define BTXDATATYPE                             0x30000
+#define BTXRANDOMSEED                           0xffffffff
+#define BCCKTXPREAMBLE                          0x1
+#define BCCKTXSFD                               0xffff0000
+#define BCCKTXSIG                               0xff
+#define BCCKTXSERVICE                           0xff00
+#define BCCKLENGTHEXT                           0x8000
+#define BCCKTXLENGHT                            0xffff0000
+#define BCCKTXCRC16                             0xffff
+#define BCCKTXSTATUS                            0x1
+#define BOFDMTXSTATUS                           0x2
 #define IS_BB_REG_OFFSET_92S(_offset)   \
         ((_offset >= 0x800) && (_offset <= 0xfff))
 
-#define BRFMOD                          0x1
-#define BJAPANMODE                      0x2
-#define BCCKTXSC                        0x30
-#define BCCKEN                          0x1000000
-#define BOFDMEN                         0x2000000
+#define BRFMOD                                  0x1
+#define BJAPANMODE                              0x2
+#define BCCKTXSC                                0x30
+#define BCCKEN                                  0x1000000
+#define BOFDMEN                                 0x2000000
 
 #define BOFDMRXADCPHASE                 0x10000
 #define BOFDMTXDACPHASE                 0x40000
@@ -1824,13 +1825,13 @@
 #define BDA6SWING                       0x380000
 
 #define BADCLKPHASE                     0x4000000
-#define B80MCLKDELAY    0x18000000
-#define BAFEWATCHDOGENABLE      0x20000000
+#define B80MCLKDELAY                    0x18000000
+#define BAFEWATCHDOGENABLE              0x20000000
 
-#define BXTALCAP01      0xc0000000
-#define BXTALCAP23      0x3
+#define BXTALCAP01                      0xc0000000
+#define BXTALCAP23                      0x3
 #define BXTALCAP92X                     0x0f000000
-#define BXTALCAP        0x0f000000
+#define BXTALCAP                        0x0f000000
 
 #define BINTDIFCLKENABLE                0x400
 #define BEXTSIGCLKENABLE                0x800
@@ -1857,7 +1858,7 @@
 #define BCCKRX_AGC_FORMAT               0x200
 #define BPSDFFT_SAMPLE_POINT            0xc000
 #define BPSD_AVERAGE_NUM                0x3000
-#define BIQPATH_CONTROL 0xc00
+#define BIQPATH_CONTROL                 0xc00
 #define BPSD_FREQ                       0x3ff
 #define BPSD_ANTENNA_PATH               0x30
 #define BPSD_IQ_SWITCH                  0x40
@@ -1957,300 +1958,316 @@
 #define BCCK_DEFAULT_RXPATH             0xc000000
 #define BCCK_OPTION_RXPATH              0x3000000
 
-#define BNUM_OFSTF      0x3
-#define BSHIFT_L        0xc0
-#define BGI_TH  0xc
-#define BRXPATH_A       0x1
-#define BRXPATH_B       0x2
-#define BRXPATH_C       0x4
-#define BRXPATH_D       0x8
-#define BTXPATH_A       0x1
-#define BTXPATH_B       0x2
-#define BTXPATH_C       0x4
-#define BTXPATH_D       0x8
-#define BTRSSI_FREQ     0x200
-#define BADC_BACKOFF    0x3000
-#define BDFIR_BACKOFF   0xc000
-#define BTRSSI_LATCH_PHASE      0x10000
-#define BRX_LDC_OFFSET  0xff
-#define BRX_QDC_OFFSET  0xff00
-#define BRX_DFIR_MODE   0x1800000
-#define BRX_DCNF_TYPE   0xe000000
-#define BRXIQIMB_A      0x3ff
-#define BRXIQIMB_B      0xfc00
-#define BRXIQIMB_C      0x3f0000
-#define BRXIQIMB_D      0xffc00000
-#define BDC_DC_NOTCH    0x60000
-#define BRXNB_NOTCH     0x1f000000
-#define BPD_TH  0xf
-#define BPD_TH_OPT2     0xc000
-#define BPWED_TH        0x700
-#define BIFMF_WIN_L     0x800
-#define BPD_OPTION      0x1000
-#define BMF_WIN_L       0xe000
-#define BBW_SEARCH_L    0x30000
-#define BWIN_ENH_L      0xc0000
-#define BBW_TH  0x700000
-#define BED_TH2 0x3800000
-#define BBW_OPTION      0x4000000
-#define BRADIO_TH       0x18000000
-#define BWINDOW_L       0xe0000000
-#define BSBD_OPTION     0x1
-#define BFRAME_TH       0x1c
-#define BFS_OPTION      0x60
-#define BDC_SLOPE_CHECK 0x80
-#define BFGUARD_COUNTER_DC_L    0xe00
-#define BFRAME_WEIGHT_SHORT     0x7000
-#define BSUB_TUNE       0xe00000
-#define BFRAME_DC_LENGTH        0xe000000
-#define BSBD_START_OFFSET       0x30000000
-#define BFRAME_TH_2     0x7
-#define BFRAME_GI2_TH   0x38
-#define BGI2_SYNC_EN    0x40
-#define BSARCH_SHORT_EARLY      0x300
-#define BSARCH_SHORT_LATE       0xc00
-#define BSARCH_GI2_LATE 0x70000
-#define BCFOANTSUM      0x1
-#define BCFOACC 0x2
-#define BCFOSTARTOFFSET 0xc
-#define BCFOLOOPBACK    0x70
-#define BCFOSUMWEIGHT   0x80
-#define BDAGCENABLE     0x10000
-#define BTXIQIMB_A      0x3ff
-#define BTXIQIMB_b      0xfc00
-#define BTXIQIMB_C      0x3f0000
-#define BTXIQIMB_D      0xffc00000
-#define BTXIDCOFFSET    0xff
-#define BTXIQDCOFFSET   0xff00
-#define BTXDFIRMODE     0x10000
-#define BTXPESUDO_NOISEON       0x4000000
-#define BTXPESUDO_NOISE_A       0xff
-#define BTXPESUDO_NOISE_B       0xff00
-#define BTXPESUDO_NOISE_C       0xff0000
-#define BTXPESUDO_NOISE_D       0xff000000
-#define BCCA_DROPOPTION 0x20000
-#define BCCA_DROPTHRES  0xfff00000
-#define BEDCCA_H        0xf
-#define BEDCCA_L        0xf0
-#define BLAMBDA_ED      0x300
-#define BRX_INITIALGAIN 0x7f
-#define BRX_ANTDIV_EN   0x80
+#define BNUM_OFSTF                      0x3
+#define BSHIFT_L                        0xc0
+#define BGI_TH                          0xc
+#define BRXPATH_A                       0x1
+#define BRXPATH_B                       0x2
+#define BRXPATH_C                       0x4
+#define BRXPATH_D                       0x8
+#define BTXPATH_A                       0x1
+#define BTXPATH_B                       0x2
+#define BTXPATH_C                       0x4
+#define BTXPATH_D                       0x8
+#define BTRSSI_FREQ                     0x200
+#define BADC_BACKOFF                    0x3000
+#define BDFIR_BACKOFF                   0xc000
+#define BTRSSI_LATCH_PHASE              0x10000
+#define BRX_LDC_OFFSET                  0xff
+#define BRX_QDC_OFFSET                  0xff00
+#define BRX_DFIR_MODE                   0x1800000
+#define BRX_DCNF_TYPE                   0xe000000
+#define BRXIQIMB_A                      0x3ff
+#define BRXIQIMB_B                      0xfc00
+#define BRXIQIMB_C                      0x3f0000
+#define BRXIQIMB_D                      0xffc00000
+#define BDC_DC_NOTCH                    0x60000
+#define BRXNB_NOTCH                     0x1f000000
+#define BPD_TH                          0xf
+#define BPD_TH_OPT2                     0xc000
+#define BPWED_TH                        0x700
+#define BIFMF_WIN_L                     0x800
+#define BPD_OPTION                      0x1000
+#define BMF_WIN_L                       0xe000
+#define BBW_SEARCH_L                    0x30000
+#define BWIN_ENH_L                      0xc0000
+#define BBW_TH                          0x700000
+#define BED_TH2                         0x3800000
+#define BBW_OPTION                      0x4000000
+#define BRADIO_TH                       0x18000000
+#define BWINDOW_L                       0xe0000000
+#define BSBD_OPTION                     0x1
+#define BFRAME_TH                       0x1c
+#define BFS_OPTION                      0x60
+#define BDC_SLOPE_CHECK                 0x80
+#define BFGUARD_COUNTER_DC_L            0xe00
+#define BFRAME_WEIGHT_SHORT             0x7000
+#define BSUB_TUNE                       0xe00000
+#define BFRAME_DC_LENGTH                0xe000000
+#define BSBD_START_OFFSET               0x30000000
+#define BFRAME_TH_2                     0x7
+#define BFRAME_GI2_TH                   0x38
+#define BGI2_SYNC_EN                    0x40
+#define BSARCH_SHORT_EARLY              0x300
+#define BSARCH_SHORT_LATE               0xc00
+#define BSARCH_GI2_LATE                 0x70000
+#define BCFOANTSUM                      0x1
+#define BCFOACC                         0x2
+#define BCFOSTARTOFFSET                 0xc
+#define BCFOLOOPBACK                    0x70
+#define BCFOSUMWEIGHT                   0x80
+#define BDAGCENABLE                     0x10000
+#define BTXIQIMB_A                      0x3ff
+#define BTXIQIMB_b                      0xfc00
+#define BTXIQIMB_C                      0x3f0000
+#define BTXIQIMB_D                      0xffc00000
+#define BTXIDCOFFSET                    0xff
+#define BTXIQDCOFFSET                   0xff00
+#define BTXDFIRMODE                     0x10000
+#define BTXPESUDO_NOISEON               0x4000000
+#define BTXPESUDO_NOISE_A               0xff
+#define BTXPESUDO_NOISE_B               0xff00
+#define BTXPESUDO_NOISE_C               0xff0000
+#define BTXPESUDO_NOISE_D               0xff000000
+#define BCCA_DROPOPTION                 0x20000
+#define BCCA_DROPTHRES                  0xfff00000
+#define BEDCCA_H                        0xf
+#define BEDCCA_L                        0xf0
+#define BLAMBDA_ED                      0x300
+#define BRX_INITIALGAIN                 0x7f
+#define BRX_ANTDIV_EN                   0x80
 #define BRX_AGC_ADDRESS_FOR_LNA         0x7f00
-#define BRX_HIGHPOWER_FLOW      0x8000
+#define BRX_HIGHPOWER_FLOW              0x8000
 #define BRX_AGC_FREEZE_THRES            0xc0000
-#define BRX_FREEZESTEP_AGC1     0x300000
-#define BRX_FREEZESTEP_AGC2     0xc00000
-#define BRX_FREEZESTEP_AGC3     0x3000000
-#define BRX_FREEZESTEP_AGC0     0xc000000
-#define BRXRSSI_CMP_EN  0x10000000
-#define BRXQUICK_AGCEN  0x20000000
+#define BRX_FREEZESTEP_AGC1             0x300000
+#define BRX_FREEZESTEP_AGC2             0xc00000
+#define BRX_FREEZESTEP_AGC3             0x3000000
+#define BRX_FREEZESTEP_AGC0             0xc000000
+#define BRXRSSI_CMP_EN                  0x10000000
+#define BRXQUICK_AGCEN                  0x20000000
 #define BRXAGC_FREEZE_THRES_MODE        0x40000000
-#define BRX_OVERFLOW_CHECKTYPE  0x80000000
-#define BRX_AGCSHIFT    0x7f
-#define BTRSW_TRI_ONLY  0x80
-#define BPOWER_THRES    0x300
-#define BRXAGC_EN       0x1
-#define BRXAGC_TOGETHER_EN      0x2
-#define BRXAGC_MIN      0x4
-#define BRXHP_INI       0x7
-#define BRXHP_TRLNA     0x70
-#define BRXHP_RSSI      0x700
-#define BRXHP_BBP1      0x7000
-#define BRXHP_BBP2      0x70000
-#define BRXHP_BBP3      0x700000
-#define BRSSI_H 0x7f0000
-#define BRSSI_GEN       0x7f000000
-#define BRXSETTLE_TRSW  0x7
-#define BRXSETTLE_LNA   0x38
-#define BRXSETTLE_RSSI  0x1c0
-#define BRXSETTLE_BBP   0xe00
-#define BRXSETTLE_RXHP  0x7000
-#define BRXSETTLE_ANTSW_RSSI    0x38000
-#define BRXSETTLE_ANTSW 0xc0000
-#define BRXPROCESS_TIME_DAGC    0x300000
-#define BRXSETTLE_HSSI  0x400000
-#define BRXPROCESS_TIME_BBPPW   0x800000
-#define BRXANTENNA_POWER_SHIFT  0x3000000
-#define BRSSI_TABLE_SELECT      0xc000000
-#define BRXHP_FINAL     0x7000000
-#define BRXHPSETTLE_BBP 0x7
-#define BRXHTSETTLE_HSSI        0x8
-#define BRXHTSETTLE_RXHP        0x70
-#define BRXHTSETTLE_BBPPW       0x80
-#define BRXHTSETTLE_IDLE        0x300
-#define BRXHTSETTLE_RESERVED    0x1c00
-#define BRXHT_RXHP_EN   0x8000
-#define BRXAGC_FREEZE_THRES     0x30000
-#define BRXAGC_TOGETHEREN       0x40000
-#define BRXHTAGC_MIN    0x80000
-#define BRXHTAGC_EN     0x100000
-#define BRXHTDAGC_EN    0x200000
-#define BRXHT_RXHP_BBP  0x1c00000
-#define BRXHT_RXHP_FINAL        0xe0000000
-#define BRXPW_RADIO_TH  0x3
-#define BRXPW_RADIO_EN  0x4
-#define BRXMF_HOLD      0x3800
-#define BRXPD_DELAY_TH1 0x38
-#define BRXPD_DELAY_TH2 0x1c0
-#define BRXPD_DC_COUNT_MAX      0x600
-#define BRXPD_DELAY_TH  0x8000
-#define BRXPROCESS_DELAY        0xf0000
+#define BRX_OVERFLOW_CHECKTYPE          0x80000000
+#define BRX_AGCSHIFT                    0x7f
+#define BTRSW_TRI_ONLY                  0x80
+#define BPOWER_THRES                    0x300
+#define BRXAGC_EN                       0x1
+#define BRXAGC_TOGETHER_EN              0x2
+#define BRXAGC_MIN                      0x4
+#define BRXHP_INI                       0x7
+#define BRXHP_TRLNA                     0x70
+#define BRXHP_RSSI                      0x700
+#define BRXHP_BBP1                      0x7000
+#define BRXHP_BBP2                      0x70000
+#define BRXHP_BBP3                      0x700000
+#define BRSSI_H                         0x7f0000
+#define BRSSI_GEN                       0x7f000000
+#define BRXSETTLE_TRSW                  0x7
+#define BRXSETTLE_LNA                   0x38
+#define BRXSETTLE_RSSI                  0x1c0
+#define BRXSETTLE_BBP                   0xe00
+#define BRXSETTLE_RXHP                  0x7000
+#define BRXSETTLE_ANTSW_RSSI            0x38000
+#define BRXSETTLE_ANTSW                 0xc0000
+#define BRXPROCESS_TIME_DAGC            0x300000
+#define BRXSETTLE_HSSI                  0x400000
+#define BRXPROCESS_TIME_BBPPW           0x800000
+#define BRXANTENNA_POWER_SHIFT          0x3000000
+#define BRSSI_TABLE_SELECT              0xc000000
+#define BRXHP_FINAL                     0x7000000
+#define BRXHPSETTLE_BBP                 0x7
+#define BRXHTSETTLE_HSSI                0x8
+#define BRXHTSETTLE_RXHP                0x70
+#define BRXHTSETTLE_BBPPW               0x80
+#define BRXHTSETTLE_IDLE                0x300
+#define BRXHTSETTLE_RESERVED            0x1c00
+#define BRXHT_RXHP_EN                   0x8000
+#define BRXAGC_FREEZE_THRES             0x30000
+#define BRXAGC_TOGETHEREN               0x40000
+#define BRXHTAGC_MIN                    0x80000
+#define BRXHTAGC_EN                     0x100000
+#define BRXHTDAGC_EN                    0x200000
+#define BRXHT_RXHP_BBP                  0x1c00000
+#define BRXHT_RXHP_FINAL                0xe0000000
+#define BRXPW_RADIO_TH                  0x3
+#define BRXPW_RADIO_EN                  0x4
+#define BRXMF_HOLD                      0x3800
+#define BRXPD_DELAY_TH1                 0x38
+#define BRXPD_DELAY_TH2                 0x1c0
+#define BRXPD_DC_COUNT_MAX              0x600
+#define BRXPD_DELAY_TH                  0x8000
+#define BRXPROCESS_DELAY                0xf0000
 #define BRXSEARCHRANGE_GI2_EARLY        0x700000
 #define BRXFRAME_FUARD_COUNTER_L        0x3800000
-#define BRXSGI_GUARD_L  0xc000000
-#define BRXSGI_SEARCH_L 0x30000000
-#define BRXSGI_TH       0xc0000000
-#define BDFSCNT0        0xff
-#define BDFSCNT1        0xff00
-#define BDFSFLAG        0xf0000
-#define BMF_WEIGHT_SUM  0x300000
-#define BMINIDX_TH      0x7f000000
-#define BDAFORMAT       0x40000
-#define BTXCH_EMU_ENABLE        0x01000000
-#define BTRSW_ISOLATION_A       0x7f
-#define BTRSW_ISOLATION_B       0x7f00
-#define BTRSW_ISOLATION_C       0x7f0000
-#define BTRSW_ISOLATION_D       0x7f000000
-#define BEXT_LNA_GAIN   0x7c00
-
-#define BSTBC_EN        0x4
-#define BANTENNA_MAPPING        0x10
-#define BNSS    0x20
+#define BRXSGI_GUARD_L                  0xc000000
+#define BRXSGI_SEARCH_L                 0x30000000
+#define BRXSGI_TH                       0xc0000000
+#define BDFSCNT0                        0xff
+#define BDFSCNT1                        0xff00
+#define BDFSFLAG                        0xf0000
+#define BMF_WEIGHT_SUM                  0x300000
+#define BMINIDX_TH                      0x7f000000
+#define BDAFORMAT                       0x40000
+#define BTXCH_EMU_ENABLE                0x01000000
+#define BTRSW_ISOLATION_A               0x7f
+#define BTRSW_ISOLATION_B               0x7f00
+#define BTRSW_ISOLATION_C               0x7f0000
+#define BTRSW_ISOLATION_D               0x7f000000
+#define BEXT_LNA_GAIN                   0x7c00
+
+#define BSTBC_EN                        0x4
+#define BANTENNA_MAPPING                0x10
+#define BNSS                            0x20
 #define BCFO_ANTSUM_ID                  0x200
-#define BPHY_COUNTER_RESET      0x8000000
-#define BCFO_REPORT_GET 0x4000000
-#define BOFDM_CONTINUE_TX       0x10000000
-#define BOFDM_SINGLE_CARRIER    0x20000000
-#define BOFDM_SINGLE_TONE       0x40000000
-#define BHT_DETECT      0x100
-#define BCFOEN  0x10000
-#define BCFOVALUE       0xfff00000
-#define BSIGTONE_RE     0x3f
-#define BSIGTONE_IM     0x7f00
-#define BCOUNTER_CCA    0xffff
-#define BCOUNTER_PARITYFAIL     0xffff0000
-#define BCOUNTER_RATEILLEGAL    0xffff
-#define BCOUNTER_CRC8FAIL       0xffff0000
-#define BCOUNTER_MCSNOSUPPORT   0xffff
-#define BCOUNTER_FASTSYNC       0xffff
-#define BSHORTCFO       0xfff
-#define BSHORTCFOT_LENGTH       12
-#define BSHORTCFOF_LENGTH       11
-#define BLONGCFO        0x7ff
-#define BLONGCFOT_LENGTH        11
-#define BLONGCFOF_LENGTH        11
-#define BTAILCFO        0x1fff
-#define BTAILCFOT_LENGTH        13
-#define BTAILCFOF_LENGTH        12
-#define BNOISE_EN_PWDB  0xffff
-#define BCC_POWER_DB    0xffff0000
-#define BMOISE_PWDB     0xffff
-#define BPOWERMEAST_LENGTH      10
-#define BPOWERMEASF_LENGTH      3
-#define BRX_HT_BW       0x1
-#define BRXSC   0x6
-#define BRX_HT  0x8
-#define BNB_INTF_DET_ON 0x1
-#define BINTF_WIN_LEN_CFG       0x30
-#define BNB_INTF_TH_CFG 0x1c0
-#define BRFGAIN 0x3f
-#define BTABLESEL       0x40
-#define BTRSW   0x80
-#define BRXSNR_A        0xff
-#define BRXSNR_B        0xff00
-#define BRXSNR_C        0xff0000
-#define BRXSNR_D        0xff000000
-#define BSNR_EVMT_LENGTH        8
-#define BSNR_EVMF_LENGTH        1
-#define BCSI1ST 0xff
-#define BCSI2ND 0xff00
-#define BRXEVM1ST       0xff0000
-#define BRXEVM2ND       0xff000000
-#define BSIGEVM 0xff
-#define BPWDB   0xff00
-#define BSGIEN  0x10000
-
-#define BSFACTOR_QMA1   0xf
-#define BSFACTOR_QMA2   0xf0
-#define BSFACTOR_QMA3   0xf00
-#define BSFACTOR_QMA4   0xf000
-#define BSFACTOR_QMA5   0xf0000
-#define BSFACTOR_QMA6   0xf0000
-#define BSFACTOR_QMA7   0xf00000
-#define BSFACTOR_QMA8   0xf000000
-#define BSFACTOR_QMA9   0xf0000000
-#define BCSI_SCHEME     0x100000
+#define BPHY_COUNTER_RESET              0x8000000
+#define BCFO_REPORT_GET                 0x4000000
+#define BOFDM_CONTINUE_TX               0x10000000
+#define BOFDM_SINGLE_CARRIER            0x20000000
+#define BOFDM_SINGLE_TONE               0x40000000
+#define BHT_DETECT                      0x100
+#define BCFOEN                          0x10000
+#define BCFOVALUE                       0xfff00000
+#define BSIGTONE_RE                     0x3f
+#define BSIGTONE_IM                     0x7f00
+#define BCOUNTER_CCA                    0xffff
+#define BCOUNTER_PARITYFAIL             0xffff0000
+#define BCOUNTER_RATEILLEGAL            0xffff
+#define BCOUNTER_CRC8FAIL               0xffff0000
+#define BCOUNTER_MCSNOSUPPORT           0xffff
+#define BCOUNTER_FASTSYNC               0xffff
+#define BSHORTCFO                       0xfff
+#define BSHORTCFOT_LENGTH               12
+#define BSHORTCFOF_LENGTH               11
+#define BLONGCFO                        0x7ff
+#define BLONGCFOT_LENGTH                11
+#define BLONGCFOF_LENGTH                11
+#define BTAILCFO                        0x1fff
+#define BTAILCFOT_LENGTH                13
+#define BTAILCFOF_LENGTH                12
+#define BNOISE_EN_PWDB                  0xffff
+#define BCC_POWER_DB                    0xffff0000
+#define BMOISE_PWDB                     0xffff
+#define BPOWERMEAST_LENGTH              10
+#define BPOWERMEASF_LENGTH              3
+#define BRX_HT_BW                       0x1
+#define BRXSC                           0x6
+#define BRX_HT                          0x8
+#define BNB_INTF_DET_ON                 0x1
+#define BINTF_WIN_LEN_CFG               0x30
+#define BNB_INTF_TH_CFG                 0x1c0
+#define BRFGAIN                         0x3f
+#define BTABLESEL                       0x40
+#define BTRSW                           0x80
+#define BRXSNR_A                        0xff
+#define BRXSNR_B                        0xff00
+#define BRXSNR_C                        0xff0000
+#define BRXSNR_D                        0xff000000
+#define BSNR_EVMT_LENGTH                8
+#define BSNR_EVMF_LENGTH                1
+#define BCSI1ST                         0xff
+#define BCSI2ND                         0xff00
+#define BRXEVM1ST                       0xff0000
+#define BRXEVM2ND                       0xff000000
+#define BSIGEVM                         0xff
+#define BPWDB                           0xff00
+#define BSGIEN                          0x10000
+
+#define BSFACTOR_QMA1                   0xf
+#define BSFACTOR_QMA2                   0xf0
+#define BSFACTOR_QMA3                   0xf00
+#define BSFACTOR_QMA4                   0xf000
+#define BSFACTOR_QMA5                   0xf0000
+#define BSFACTOR_QMA6                   0xf0000
+#define BSFACTOR_QMA7                   0xf00000
+#define BSFACTOR_QMA8                   0xf000000
+#define BSFACTOR_QMA9                   0xf0000000
+#define BCSI_SCHEME                     0x100000
 
 #define BNOISE_LVL_TOP_SET              0x3
-#define BCHSMOOTH       0x4
-#define BCHSMOOTH_CFG1  0x38
-#define BCHSMOOTH_CFG2  0x1c0
-#define BCHSMOOTH_CFG3  0xe00
-#define BCHSMOOTH_CFG4  0x7000
-#define BMRCMODE        0x800000
-#define BTHEVMCFG       0x7000000
-
-#define BLOOP_FIT_TYPE  0x1
-#define BUPD_CFO        0x40
-#define BUPD_CFO_OFFDATA        0x80
-#define BADV_UPD_CFO    0x100
-#define BADV_TIME_CTRL  0x800
-#define BUPD_CLKO       0x1000
-#define BFC     0x6000
-#define BTRACKING_MODE  0x8000
-#define BPHCMP_ENABLE   0x10000
-#define BUPD_CLKO_LTF   0x20000
-#define BCOM_CH_CFO     0x40000
-#define BCSI_ESTI_MODE  0x80000
-#define BADV_UPD_EQZ    0x100000
-#define BUCHCFG 0x7000000
-#define BUPDEQZ 0x8000000
+#define BCHSMOOTH                       0x4
+#define BCHSMOOTH_CFG1                  0x38
+#define BCHSMOOTH_CFG2                  0x1c0
+#define BCHSMOOTH_CFG3                  0xe00
+#define BCHSMOOTH_CFG4                  0x7000
+#define BMRCMODE                        0x800000
+#define BTHEVMCFG                       0x7000000
+
+#define BLOOP_FIT_TYPE                  0x1
+#define BUPD_CFO                        0x40
+#define BUPD_CFO_OFFDATA                0x80
+#define BADV_UPD_CFO                    0x100
+#define BADV_TIME_CTRL                  0x800
+#define BUPD_CLKO                       0x1000
+#define BFC                             0x6000
+#define BTRACKING_MODE                  0x8000
+#define BPHCMP_ENABLE                   0x10000
+#define BUPD_CLKO_LTF                   0x20000
+#define BCOM_CH_CFO                     0x40000
+#define BCSI_ESTI_MODE                  0x80000
+#define BADV_UPD_EQZ                    0x100000
+#define BUCHCFG                         0x7000000
+#define BUPDEQZ                         0x8000000
 
 #define BRX_PESUDO_NOISE_ON             0x20000000
-#define BRX_PESUDO_NOISE_A      0xff
-#define BRX_PESUDO_NOISE_B      0xff00
-#define BRX_PESUDO_NOISE_C      0xff0000
-#define BRX_PESUDO_NOISE_D      0xff000000
+#define BRX_PESUDO_NOISE_A              0xff
+#define BRX_PESUDO_NOISE_B              0xff00
+#define BRX_PESUDO_NOISE_C              0xff0000
+#define BRX_PESUDO_NOISE_D              0xff000000
 #define BRX_PESUDO_NOISESTATE_A         0xffff
 #define BRX_PESUDO_NOISESTATE_B         0xffff0000
 #define BRX_PESUDO_NOISESTATE_C         0xffff
 #define BRX_PESUDO_NOISESTATE_D         0xffff0000
 
-#define BZEBRA1_HSSIENABLE      0x8
-#define BZEBRA1_TRXCONTROL      0xc00
-#define BZEBRA1_TRXGAINSETTING  0x07f
-#define BZEBRA1_RXCOUNTER       0xc00
-#define BZEBRA1_TXCHANGEPUMP    0x38
-#define BZEBRA1_RXCHANGEPUMP    0x7
-#define BZEBRA1_CHANNEL_NUM     0xf80
-#define BZEBRA1_TXLPFBW 0x400
-#define BZEBRA1_RXLPFBW 0x600
+#define BZEBRA1_HSSIENABLE              0x8
+#define BZEBRA1_TRXCONTROL              0xc00
+#define BZEBRA1_TRXGAINSETTING          0x07f
+#define BZEBRA1_RXCOUNTER               0xc00
+#define BZEBRA1_TXCHANGEPUMP            0x38
+#define BZEBRA1_RXCHANGEPUMP            0x7
+#define BZEBRA1_CHANNEL_NUM             0xf80
+#define BZEBRA1_TXLPFBW                 0x400
+#define BZEBRA1_RXLPFBW                 0x600
 
 #define BRTL8256REG_MODE_CTRL1          0x100
 #define BRTL8256REG_MODE_CTRL0          0x40
 #define BRTL8256REG_TXLPFBW             0x18
 #define BRTL8256REG_RXLPFBW             0x600
 
-#define BRTL8258_TXLPFBW        0xc
-#define BRTL8258_RXLPFBW        0xc00
-#define BRTL8258_RSSILPFBW      0xc0
-
-#define BBYTE0  0x1
-#define BBYTE1  0x2
-#define BBYTE2  0x4
-#define BBYTE3  0x8
-#define BWORD0  0x3
-#define BWORD1  0xc
-#define BWORD   0xf
-
-#define BENABLE 0x1
-#define BDISABLE        0x0
-
-#define LEFT_ANTENNA    0x0
-#define RIGHT_ANTENNA   0x1
-
-#define TCHECK_TXSTATUS 500
-#define TUPDATE_RXCOUNTER       100
+#define BRTL8258_TXLPFBW                0xc
+#define BRTL8258_RXLPFBW                0xc00
+#define BRTL8258_RSSILPFBW              0xc0
+
+#define BBYTE0                          0x1
+#define BBYTE1                          0x2
+#define BBYTE2                          0x4
+#define BBYTE3                          0x8
+#define BWORD0                          0x3
+#define BWORD1                          0xc
+#define BWORD                           0xf
+
+#define MASKBYTE0                       0xff
+#define MASKBYTE1                       0xff00
+#define MASKBYTE2                       0xff0000
+#define MASKBYTE3                       0xff000000
+#define MASKHWORD                       0xffff0000
+#define MASKLWORD                       0x0000ffff
+#define MASKDWORD                       0xffffffff
+#define MASK12BITS                      0xfff
+#define MASKH4BITS                      0xf0000000
+#define MASKOFDM_D                      0xffc00000
+#define MASKCCK                         0x3f3f3f3f
+
+#define MASK4BITS                       0x0f
+#define MASK20BITS                      0xfffff
+#define RFREG_OFFSET_MASK               0xfffff
+
+#define BENABLE                         0x1
+#define BDISABLE                        0x0
+
+#define LEFT_ANTENNA                    0x0
+#define RIGHT_ANTENNA                   0x1
+
+#define TCHECK_TXSTATUS                 500
+#define TUPDATE_RXCOUNTER               100
 
 #define REG_UN_used_register            0x01bf
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/rf.c b/drivers/net/wireless/rtlwifi/rtl8723be/rf.c
index 486294930a7b..5ed4492d3c80 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/rf.c
@@ -51,7 +51,7 @@ void rtl8723be_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                               rtlphy->rfreg_chnlval[0]);
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
@@ -93,18 +93,20 @@ void rtl8723be_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
                                        (ppowerlevel[idx1] << 16) |
                                        (ppowerlevel[idx1] << 24);
                 }
+
                 if (rtlefuse->eeprom_regulatory == 0) {
                         tmpval =
-                            (rtlphy->mcs_offset[0][6]) +
-                            (rtlphy->mcs_offset[0][7] << 8);
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][6]) +
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][7] << 8);
                         tx_agc[RF90_PATH_A] += tmpval;
 
-                        tmpval = (rtlphy->mcs_offset[0][14]) +
-                                 (rtlphy->mcs_offset[0][15] <<
+                        tmpval = (rtlphy->mcs_txpwrlevel_origoffset[0][14]) +
+                                 (rtlphy->mcs_txpwrlevel_origoffset[0][15] <<
                                   24);
                         tx_agc[RF90_PATH_B] += tmpval;
                 }
         }
+
         for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
                 ptr = (u8 *)(&(tx_agc[idx1]));
                 for (idx2 = 0; idx2 < 4; idx2++) {
@@ -124,30 +126,32 @@ void rtl8723be_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         tmpval = tx_agc[RF90_PATH_A] & 0xff;
         rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
                  RTXAGC_A_CCK1_MCS32);
 
         tmpval = tx_agc[RF90_PATH_A] >> 8;
 
+        /*tmpval = tmpval & 0xff00ffff;*/
+
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
                  RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
                  RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
                  RTXAGC_B_CCK1_55_MCS32);
 }
 
@@ -169,8 +173,8 @@ static void rtl8723be_phy_get_power_base(struct ieee80211_hw *hw,
                 powerbase0 = (powerbase0 << 24) | (powerbase0 << 16) |
                     (powerbase0 << 8) | powerbase0;
                 *(ofdmbase + i) = powerbase0;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         " [OFDM power base index rf(%c) = 0x%x]\n",
+                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
                          ((i == 0) ? 'A' : 'B'), *(ofdmbase + i));
         }
 
@@ -179,27 +183,30 @@ static void rtl8723be_phy_get_power_base(struct ieee80211_hw *hw,
                         powerlevel[i] = ppowerlevel_bw20[i];
                 else
                         powerlevel[i] = ppowerlevel_bw40[i];
+
                 powerbase1 = powerlevel[i];
                 powerbase1 = (powerbase1 << 24) | (powerbase1 << 16) |
                              (powerbase1 << 8) | powerbase1;
 
                 *(mcsbase + i) = powerbase1;
 
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                         " [MCS power base index rf(%c) = 0x%x]\n",
-                        ((i == 0) ? 'A' : 'B'), *(mcsbase + i));
+                         ((i == 0) ? 'A' : 'B'), *(mcsbase + i));
         }
 }
 
-static void txpwr_by_regulatory(struct ieee80211_hw *hw, u8 channel, u8 index,
-                                u32 *powerbase0, u32 *powerbase1,
-                                u32 *p_outwriteval)
+static void _rtl8723be_get_txpower_writeval_by_regulatory(
+                                                        struct ieee80211_hw *hw,
+                                                        u8 channel, u8 index,
+                                                        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];
-        u8 pwr_diff = 0, customer_pwr_diff;
+        u8 i, chnlgroup = 0, pwr_diff_limit[4], pwr_diff = 0, customer_pwr_diff;
         u32 writeval, customer_limit, rf;
 
         for (rf = 0; rf < 2; rf++) {
@@ -208,13 +215,13 @@ static void txpwr_by_regulatory(struct ieee80211_hw *hw, u8 channel, u8 index,
                         chnlgroup = 0;
 
                         writeval =
-                            rtlphy->mcs_offset[chnlgroup][index + (rf ? 8 : 0)]
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup][index +
+                                                                (rf ? 8 : 0)]
                             + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
 
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 "RTK better performance, "
-                                 "writeval(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, writeval(%c) = 0x%x\n",
+                                ((rf == 0) ? 'A' : 'B'), writeval);
                         break;
                 case 1:
                         if (rtlphy->pwrgroup_cnt == 1) {
@@ -233,43 +240,41 @@ static void txpwr_by_regulatory(struct ieee80211_hw *hw, u8 channel, u8 index,
                                 else if (channel == 14)
                                         chnlgroup = 5;
                         }
-                        writeval = rtlphy->mcs_offset[chnlgroup]
+
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
                             [index + (rf ? 8 : 0)] + ((index < 2) ?
                                                       powerbase0[rf] :
                                                       powerbase1[rf]);
 
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 "Realtek regulatory, 20MHz, "
-                                 "writeval(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
+                                ((rf == 0) ? 'A' : 'B'), writeval);
 
                         break;
                 case 2:
                         writeval =
                             ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
 
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 "Better regulatory, "
-                                 "writeval(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Better regulatory, writeval(%c) = 0x%x\n",
+                                ((rf == 0) ? 'A' : 'B'), writeval);
                         break;
                 case 3:
                         chnlgroup = 0;
 
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                         "customer's limit, 40MHz "
-                                         "rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht40[rf]
-                                         [channel-1]);
+                                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
+                                        ((rf == 0) ? 'A' : 'B'),
+                                        rtlefuse->pwrgroup_ht40
+                                        [rf][channel - 1]);
                         } else {
-                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                         "customer's limit, 20MHz "
-                                         "rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht20[rf]
-                                         [channel-1]);
+                                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                        ((rf == 0) ? 'A' : 'B'),
+                                        rtlefuse->pwrgroup_ht20
+                                        [rf][channel - 1]);
                         }
 
                         if (index < 2)
@@ -294,9 +299,9 @@ static void txpwr_by_regulatory(struct ieee80211_hw *hw, u8 channel, u8 index,
 
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
-                                    (u8)((rtlphy->mcs_offset
-                                          [chnlgroup][index + (rf ? 8 : 0)] &
-                                          (0x7f << (i * 8))) >> (i * 8));
+                                    (u8)((rtlphy->mcs_txpwrlevel_origoffset
+                                           [chnlgroup][index + (rf ? 8 : 0)] &
+                                              (0x7f << (i * 8))) >> (i * 8));
 
                                         if (pwr_diff_limit[i] > pwr_diff)
                                                 pwr_diff_limit[i] = pwr_diff;
@@ -307,29 +312,28 @@ static void txpwr_by_regulatory(struct ieee80211_hw *hw, u8 channel, u8 index,
                                          (pwr_diff_limit[1] << 8) |
                                          (pwr_diff_limit[0]);
 
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                 "Customer's limit rf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), customer_limit);
+                                 ((rf == 0) ? 'A' : 'B'), customer_limit);
 
                         writeval = customer_limit + ((index < 2) ?
                                                       powerbase0[rf] :
                                                       powerbase1[rf]);
 
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 "Customer, writeval rf(%c)= 0x%x\n",
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Customer, writeval rf(%c)= 0x%x\n",
                                  ((rf == 0) ? 'A' : 'B'), writeval);
                         break;
                 default:
                         chnlgroup = 0;
                         writeval =
-                            rtlphy->mcs_offset[chnlgroup]
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
                             [index + (rf ? 8 : 0)]
                             + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
 
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 "RTK better performance, writeval "
-                                 "rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, writeval rf(%c) = 0x%x\n",
+                                ((rf == 0) ? 'A' : 'B'), writeval);
                         break;
                 }
 
@@ -343,7 +347,7 @@ static void txpwr_by_regulatory(struct ieee80211_hw *hw, u8 channel, u8 index,
 }
 
 static void _rtl8723be_write_ofdm_power_reg(struct ieee80211_hw *hw,
-                                         u8 index, u32 *value)
+                                         u8 index, u32 *pvalue)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u16 regoffset_a[6] = {
@@ -361,9 +365,9 @@ static void _rtl8723be_write_ofdm_power_reg(struct ieee80211_hw *hw,
         u16 regoffset;
 
         for (rf = 0; rf < 2; rf++) {
-                writeval = value[rf];
+                writeval = pvalue[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)
@@ -378,8 +382,8 @@ static void _rtl8723be_write_ofdm_power_reg(struct ieee80211_hw *hw,
                         regoffset = regoffset_b[index];
                 rtl_set_bbreg(hw, regoffset, MASKDWORD, writeval);
 
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         "Set 0x%x = %08x\n", regoffset, writeval);
+                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                        "Set 0x%x = %08x\n", regoffset, writeval);
         }
 }
 
@@ -400,8 +404,11 @@ void rtl8723be_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
         rtl8723be_dm_txpower_track_adjust(hw, 1, &direction, &pwrtrac_value);
 
         for (index = 0; index < 6; index++) {
-                txpwr_by_regulatory(hw, channel, index, &powerbase0[0],
-                                    &powerbase1[0], &writeval[0]);
+                _rtl8723be_get_txpower_writeval_by_regulatory(hw,
+                                                              channel, index,
+                                                              &powerbase0[0],
+                                                              &powerbase1[0],
+                                                              &writeval[0]);
                 if (direction == 1) {
                         writeval[0] += pwrtrac_value;
                         writeval[1] += pwrtrac_value;
@@ -424,16 +431,17 @@ bool rtl8723be_phy_rf6052_config(struct ieee80211_hw *hw)
                 rtlphy->num_total_rfpath = 2;
 
         return _rtl8723be_phy_rf6052_config_parafile(hw);
+
 }
 
 static bool _rtl8723be_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct bb_reg_def *pphyreg;
         u32 u4_regvalue = 0;
         u8 rfpath;
         bool rtstatus = true;
+        struct bb_reg_def *pphyreg;
 
         for (rfpath = 0; rfpath < rtlphy->num_total_rfpath; rfpath++) {
                 pphyreg = &rtlphy->phyreg_def[rfpath];
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/rtlwifi/rtl8723be/sw.c
index 532913c6622a..223eb42992bd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/sw.c
@@ -31,6 +31,7 @@
 #include "phy.h"
 #include "../rtl8723com/phy_common.h"
 #include "dm.h"
+#include "../rtl8723com/dm_common.h"
 #include "hw.h"
 #include "fw.h"
 #include "../rtl8723com/fw_common.h"
@@ -101,6 +102,8 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->dm.thermalvalue = 0;
         rtlpci->transmit_config = CFENDFORM | BIT(15) | BIT(24) | BIT(25);
 
+        rtlpriv->phy.lck_inprogress = false;
+
         mac->ht_enable = true;
 
         /* compatible 5G band 88ce just 2.4G band & smsp */
@@ -137,12 +140,19 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
 
         rtlpci->irq_mask[1] = (u32)(IMR_RXFOVW | 0);
 
+        rtlpci->sys_irq_mask = (u32)(HSIMR_PDN_INT_EN   |
+                                     HSIMR_RON_INT_EN   |
+                                     0);
+
         /* for debug level */
         rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
         /* for LPS & IPS */
         rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
+        rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
+        if (rtlpriv->cfg->mod_params->disable_watchdog)
+                pr_info("watchdog disabled\n");
         rtlpriv->psc.reg_fwctrl_lps = 3;
         rtlpriv->psc.reg_max_lps_awakeintvl = 5;
         /* for ASPM, you can close aspm through
@@ -157,6 +167,11 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
         else if (rtlpriv->psc.reg_fwctrl_lps == 3)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
+        /*low power: Disable 32k */
+        rtlpriv->psc.low_power_enable = false;
+
+        rtlpriv->rtlhal.earlymode_enable = false;
+
         /* for firmware buf */
         rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
         if (!rtlpriv->rtlhal.pfirmware) {
@@ -182,8 +197,6 @@ void rtl8723be_deinit_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        if (rtlpriv->cfg->ops->get_btc_status())
-                rtlpriv->btcoexist.btc_ops->btc_halt_notify();
         if (rtlpriv->rtlhal.pfirmware) {
                 vfree(rtlpriv->rtlhal.pfirmware);
                 rtlpriv->rtlhal.pfirmware = NULL;
@@ -196,7 +209,7 @@ bool rtl8723be_get_btc_status(void)
         return true;
 }
 
-static bool is_fw_header(struct rtl92c_firmware_header *hdr)
+static bool is_fw_header(struct rtl8723e_firmware_header *hdr)
 {
         return (hdr->signature & 0xfff0) == 0x5300;
 }
@@ -245,6 +258,7 @@ static struct rtl_hal_ops rtl8723be_hal_ops = {
         .set_rfreg = rtl8723be_phy_set_rf_reg,
         .fill_h2c_cmd = rtl8723be_fill_h2c_cmd,
         .get_btc_status = rtl8723be_get_btc_status,
+        .rx_command_packet = rtl8723be_rx_command_packet,
         .is_fw_header = is_fw_header,
 };
 
@@ -253,8 +267,6 @@ static struct rtl_mod_params rtl8723be_mod_params = {
         .inactiveps = true,
         .swctrl_lps = false,
         .fwctrl_lps = true,
-        .msi_support = false,
-        .debug = DBG_EMERG,
 };
 
 static struct rtl_hal_cfg rtl8723be_hal_cfg = {
@@ -272,6 +284,9 @@ static struct rtl_hal_cfg rtl8723be_hal_cfg = {
         .maps[MAC_RCR_ACRC32] = ACRC32,
         .maps[MAC_RCR_ACF] = ACF,
         .maps[MAC_RCR_AAP] = AAP,
+        .maps[MAC_HIMR] = REG_HIMR,
+        .maps[MAC_HIMRE] = REG_HIMRE,
+        .maps[MAC_HSISR] = REG_HSISR,
 
         .maps[EFUSE_ACCESS] = REG_EFUSE_ACCESS,
 
@@ -305,6 +320,7 @@ static struct rtl_hal_cfg rtl8723be_hal_cfg = {
         .maps[RTL_IMR_BCNDMAINT3] = IMR_BCNDMAINT3,
         .maps[RTL_IMR_BCNDMAINT2] = IMR_BCNDMAINT2,
         .maps[RTL_IMR_BCNDMAINT1] = IMR_BCNDMAINT1,
+/*      .maps[RTL_IMR_BCNDOK8] = IMR_BCNDOK8,     */   /*need check*/
         .maps[RTL_IMR_BCNDOK7] = IMR_BCNDOK7,
         .maps[RTL_IMR_BCNDOK6] = IMR_BCNDOK6,
         .maps[RTL_IMR_BCNDOK5] = IMR_BCNDOK5,
@@ -312,6 +328,8 @@ static struct rtl_hal_cfg rtl8723be_hal_cfg = {
         .maps[RTL_IMR_BCNDOK3] = IMR_BCNDOK3,
         .maps[RTL_IMR_BCNDOK2] = IMR_BCNDOK2,
         .maps[RTL_IMR_BCNDOK1] = IMR_BCNDOK1,
+/*      .maps[RTL_IMR_TIMEOUT2] = IMR_TIMEOUT2,*/
+/*      .maps[RTL_IMR_TIMEOUT1] = IMR_TIMEOUT1,*/
 
         .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
         .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
@@ -329,6 +347,7 @@ static struct rtl_hal_cfg rtl8723be_hal_cfg = {
         .maps[RTL_IMR_VIDOK] = IMR_VIDOK,
         .maps[RTL_IMR_VODOK] = IMR_VODOK,
         .maps[RTL_IMR_ROK] = IMR_ROK,
+        .maps[RTL_IMR_HSISR_IND] = IMR_HSISR_IND_ON_INT,
         .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNDMAINT0 | IMR_TBDOK | IMR_TBDER),
 
         .maps[RTL_RC_CCK_RATE1M] = DESC92C_RATE1M,
@@ -348,12 +367,12 @@ static struct rtl_hal_cfg rtl8723be_hal_cfg = {
         .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15,
 };
 
-static const struct pci_device_id rtl8723be_pci_id[] = {
-        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xb723, rtl8723be_hal_cfg)},
+static struct pci_device_id rtl8723be_pci_ids[] = {
+        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xB723, rtl8723be_hal_cfg)},
         {},
 };
 
-MODULE_DEVICE_TABLE(pci, rtl8723be_pci_id);
+MODULE_DEVICE_TABLE(pci, rtl8723be_pci_ids);
 
 MODULE_AUTHOR("PageHe   <page_he@realsil.com.cn>");
 MODULE_AUTHOR("Realtek WlanFAE  <wlanfae@realtek.com>");
@@ -366,21 +385,22 @@ module_param_named(debug, rtl8723be_mod_params.debug, int, 0444);
 module_param_named(ips, rtl8723be_mod_params.inactiveps, bool, 0444);
 module_param_named(swlps, rtl8723be_mod_params.swctrl_lps, bool, 0444);
 module_param_named(fwlps, rtl8723be_mod_params.fwctrl_lps, bool, 0444);
-module_param_named(msi, rtl8723be_mod_params.msi_support, bool, 0444);
+module_param_named(disable_watchdog, rtl8723be_mod_params.disable_watchdog,
+                   bool, 0444);
 MODULE_PARM_DESC(swenc, "using hardware crypto (default 0 [hardware])\n");
 MODULE_PARM_DESC(ips, "using no link power save (default 1 is open)\n");
 MODULE_PARM_DESC(fwlps, "using linked fw control power save (default 1 is open)\n");
 MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 0)\n");
 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");
 
 static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
 
 static struct pci_driver rtl8723be_driver = {
         .name = KBUILD_MODNAME,
-        .id_table = rtl8723be_pci_id,
+        .id_table = rtl8723be_pci_ids,
         .probe = rtl_pci_probe,
         .remove = rtl_pci_disconnect,
-
         .driver.pm = &rtlwifi_pm_ops,
 };
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/table.c b/drivers/net/wireless/rtlwifi/rtl8723be/table.c
index 4b283cde042e..a180761e8810 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/table.c
@@ -27,200 +27,201 @@
 
 #include "table.h"
 u32 RTL8723BEPHY_REG_1TARRAY[] = {
-        0x800, 0x80040000,
-        0x804, 0x00000003,
-        0x808, 0x0000FC00,
-        0x80C, 0x0000000A,
-        0x810, 0x10001331,
-        0x814, 0x020C3D10,
-        0x818, 0x02200385,
-        0x81C, 0x00000000,
-        0x820, 0x01000100,
-        0x824, 0x00390204,
-        0x828, 0x00000000,
-        0x82C, 0x00000000,
-        0x830, 0x00000000,
-        0x834, 0x00000000,
-        0x838, 0x00000000,
-        0x83C, 0x00000000,
-        0x840, 0x00010000,
-        0x844, 0x00000000,
-        0x848, 0x00000000,
-        0x84C, 0x00000000,
-        0x850, 0x00000000,
-        0x854, 0x00000000,
-        0x858, 0x569A11A9,
-        0x85C, 0x01000014,
-        0x860, 0x66F60110,
-        0x864, 0x061F0649,
-        0x868, 0x00000000,
-        0x86C, 0x27272700,
-        0x870, 0x07000760,
-        0x874, 0x25004000,
-        0x878, 0x00000808,
-        0x87C, 0x00000000,
-        0x880, 0xB0000C1C,
-        0x884, 0x00000001,
-        0x888, 0x00000000,
-        0x88C, 0xCCC000C0,
-        0x890, 0x00000800,
-        0x894, 0xFFFFFFFE,
-        0x898, 0x40302010,
-        0x89C, 0x00706050,
-        0x900, 0x00000000,
-        0x904, 0x00000023,
-        0x908, 0x00000000,
-        0x90C, 0x81121111,
-        0x910, 0x00000002,
-        0x914, 0x00000201,
-        0x948, 0x00000000,
-        0xA00, 0x00D047C8,
-        0xA04, 0x80FF000C,
-        0xA08, 0x8C838300,
-        0xA0C, 0x2E7F120F,
-        0xA10, 0x9500BB78,
-        0xA14, 0x1114D028,
-        0xA18, 0x00881117,
-        0xA1C, 0x89140F00,
-        0xA20, 0x1A1B0000,
-        0xA24, 0x090E1317,
-        0xA28, 0x00000204,
-        0xA2C, 0x00D30000,
-        0xA70, 0x101FBF00,
-        0xA74, 0x00000007,
-        0xA78, 0x00000900,
-        0xA7C, 0x225B0606,
-        0xA80, 0x21806490,
-        0xB2C, 0x00000000,
-        0xC00, 0x48071D40,
-        0xC04, 0x03A05611,
-        0xC08, 0x000000E4,
-        0xC0C, 0x6C6C6C6C,
-        0xC10, 0x08800000,
-        0xC14, 0x40000100,
-        0xC18, 0x08800000,
-        0xC1C, 0x40000100,
-        0xC20, 0x00000000,
-        0xC24, 0x00000000,
-        0xC28, 0x00000000,
-        0xC2C, 0x00000000,
-        0xC30, 0x69E9AC44,
-        0xC34, 0x469652AF,
-        0xC38, 0x49795994,
-        0xC3C, 0x0A97971C,
-        0xC40, 0x1F7C403F,
-        0xC44, 0x000100B7,
-        0xC48, 0xEC020107,
-        0xC4C, 0x007F037F,
-        0xC50, 0x69553420,
-        0xC54, 0x43BC0094,
-        0xC58, 0x00023169,
-        0xC5C, 0x00250492,
-        0xC60, 0x00000000,
-        0xC64, 0x7112848B,
-        0xC68, 0x47C00BFF,
-        0xC6C, 0x00000036,
-        0xC70, 0x2C7F000D,
-        0xC74, 0x020610DB,
-        0xC78, 0x0000001F,
-        0xC7C, 0x00B91612,
-        0xC80, 0x390000E4,
-        0xC84, 0x20F60000,
-        0xC88, 0x40000100,
-        0xC8C, 0x20200000,
-        0xC90, 0x00020E1A,
-        0xC94, 0x00000000,
-        0xC98, 0x00020E1A,
-        0xC9C, 0x00007F7F,
-        0xCA0, 0x00000000,
-        0xCA4, 0x000300A0,
-        0xCA8, 0x00000000,
-        0xCAC, 0x00000000,
-        0xCB0, 0x00000000,
-        0xCB4, 0x00000000,
-        0xCB8, 0x00000000,
-        0xCBC, 0x28000000,
-        0xCC0, 0x00000000,
-        0xCC4, 0x00000000,
-        0xCC8, 0x00000000,
-        0xCCC, 0x00000000,
-        0xCD0, 0x00000000,
-        0xCD4, 0x00000000,
-        0xCD8, 0x64B22427,
-        0xCDC, 0x00766932,
-        0xCE0, 0x00222222,
-        0xCE4, 0x00000000,
-        0xCE8, 0x37644302,
-        0xCEC, 0x2F97D40C,
-        0xD00, 0x00000740,
-        0xD04, 0x40020401,
-        0xD08, 0x0000907F,
-        0xD0C, 0x20010201,
-        0xD10, 0xA0633333,
-        0xD14, 0x3333BC53,
-        0xD18, 0x7A8F5B6F,
-        0xD2C, 0xCC979975,
-        0xD30, 0x00000000,
-        0xD34, 0x80608000,
-        0xD38, 0x00000000,
-        0xD3C, 0x00127353,
-        0xD40, 0x00000000,
-        0xD44, 0x00000000,
-        0xD48, 0x00000000,
-        0xD4C, 0x00000000,
-        0xD50, 0x6437140A,
-        0xD54, 0x00000000,
-        0xD58, 0x00000282,
-        0xD5C, 0x30032064,
-        0xD60, 0x4653DE68,
-        0xD64, 0x04518A3C,
-        0xD68, 0x00002101,
-        0xD6C, 0x2A201C16,
-        0xD70, 0x1812362E,
-        0xD74, 0x322C2220,
-        0xD78, 0x000E3C24,
-        0xE00, 0x2D2D2D2D,
-        0xE04, 0x2D2D2D2D,
-        0xE08, 0x0390272D,
-        0xE10, 0x2D2D2D2D,
-        0xE14, 0x2D2D2D2D,
-        0xE18, 0x2D2D2D2D,
-        0xE1C, 0x2D2D2D2D,
-        0xE28, 0x00000000,
-        0xE30, 0x1000DC1F,
-        0xE34, 0x10008C1F,
-        0xE38, 0x02140102,
-        0xE3C, 0x681604C2,
-        0xE40, 0x01007C00,
-        0xE44, 0x01004800,
-        0xE48, 0xFB000000,
-        0xE4C, 0x000028D1,
-        0xE50, 0x1000DC1F,
-        0xE54, 0x10008C1F,
-        0xE58, 0x02140102,
-        0xE5C, 0x28160D05,
-        0xE60, 0x00000008,
-        0xE68, 0x001B2556,
-        0xE6C, 0x00C00096,
-        0xE70, 0x00C00096,
-        0xE74, 0x01000056,
-        0xE78, 0x01000014,
-        0xE7C, 0x01000056,
-        0xE80, 0x01000014,
-        0xE84, 0x00C00096,
-        0xE88, 0x01000056,
-        0xE8C, 0x00C00096,
-        0xED0, 0x00C00096,
-        0xED4, 0x00C00096,
-        0xED8, 0x00C00096,
-        0xEDC, 0x000000D6,
-        0xEE0, 0x000000D6,
-        0xEEC, 0x01C00016,
-        0xF14, 0x00000003,
-        0xF4C, 0x00000000,
-        0xF00, 0x00000300,
-        0x820, 0x01000100,
-        0x800, 0x83040000,
+                0x800, 0x80040000,
+                0x804, 0x00000003,
+                0x808, 0x0000FC00,
+                0x80C, 0x0000000A,
+                0x810, 0x10001331,
+                0x814, 0x020C3D10,
+                0x818, 0x02200385,
+                0x81C, 0x00000000,
+                0x820, 0x01000100,
+                0x824, 0x00390204,
+                0x828, 0x00000000,
+                0x82C, 0x00000000,
+                0x830, 0x00000000,
+                0x834, 0x00000000,
+                0x838, 0x00000000,
+                0x83C, 0x00000000,
+                0x840, 0x00010000,
+                0x844, 0x00000000,
+                0x848, 0x00000000,
+                0x84C, 0x00000000,
+                0x850, 0x00000000,
+                0x854, 0x00000000,
+                0x858, 0x569A11A9,
+                0x85C, 0x01000014,
+                0x860, 0x66F60110,
+                0x864, 0x061F0649,
+                0x868, 0x00000000,
+                0x86C, 0x27272700,
+                0x870, 0x07000760,
+                0x874, 0x25004000,
+                0x878, 0x00000808,
+                0x87C, 0x00000000,
+                0x880, 0xB0000C1C,
+                0x884, 0x00000001,
+                0x888, 0x00000000,
+                0x88C, 0xCCC000C0,
+                0x890, 0x00000800,
+                0x894, 0xFFFFFFFE,
+                0x898, 0x40302010,
+                0x89C, 0x00706050,
+                0x900, 0x00000000,
+                0x904, 0x00000023,
+                0x908, 0x00000000,
+                0x90C, 0x81121111,
+                0x910, 0x00000002,
+                0x914, 0x00000201,
+                0x948, 0x00000280,
+                0xA00, 0x00D047C8,
+                0xA04, 0x80FF000C,
+                0xA08, 0x8C838300,
+                0xA0C, 0x2E7F120F,
+                0xA10, 0x9500BB78,
+                0xA14, 0x1114D028,
+                0xA18, 0x00881117,
+                0xA1C, 0x89140F00,
+                0xA20, 0x1A1B0000,
+                0xA24, 0x090E1317,
+                0xA28, 0x00000204,
+                0xA2C, 0x00D30000,
+                0xA70, 0x101FBF00,
+                0xA74, 0x00000007,
+                0xA78, 0x00000900,
+                0xA7C, 0x225B0606,
+                0xA80, 0x21806490,
+                0xB2C, 0x00000000,
+                0xC00, 0x48071D40,
+                0xC04, 0x03A05611,
+                0xC08, 0x000000E4,
+                0xC0C, 0x6C6C6C6C,
+                0xC10, 0x08800000,
+                0xC14, 0x40000100,
+                0xC18, 0x08800000,
+                0xC1C, 0x40000100,
+                0xC20, 0x00000000,
+                0xC24, 0x00000000,
+                0xC28, 0x00000000,
+                0xC2C, 0x00000000,
+                0xC30, 0x69E9AC44,
+                0xC34, 0x469652AF,
+                0xC38, 0x49795994,
+                0xC3C, 0x0A97971C,
+                0xC40, 0x1F7C403F,
+                0xC44, 0x000100B7,
+                0xC48, 0xEC020107,
+                0xC4C, 0x007F037F,
+                0xC50, 0x69553420,
+                0xC54, 0x43BC0094,
+                0xC58, 0x00023169,
+                0xC5C, 0x00250492,
+                0xC60, 0x00000000,
+                0xC64, 0x7112848B,
+                0xC68, 0x47C00BFF,
+                0xC6C, 0x00000036,
+                0xC70, 0x2C7F000D,
+                0xC74, 0x020610DB,
+                0xC78, 0x0000001F,
+                0xC7C, 0x00B91612,
+                0xC80, 0x390000E4,
+                0xC84, 0x20F60000,
+                0xC88, 0x40000100,
+                0xC8C, 0x20200000,
+                0xC90, 0x00020E1A,
+                0xC94, 0x00000000,
+                0xC98, 0x00020E1A,
+                0xC9C, 0x00007F7F,
+                0xCA0, 0x00000000,
+                0xCA4, 0x000300A0,
+                0xCA8, 0x00000000,
+                0xCAC, 0x00000000,
+                0xCB0, 0x00000000,
+                0xCB4, 0x00000000,
+                0xCB8, 0x00000000,
+                0xCBC, 0x28000000,
+                0xCC0, 0x00000000,
+                0xCC4, 0x00000000,
+                0xCC8, 0x00000000,
+                0xCCC, 0x00000000,
+                0xCD0, 0x00000000,
+                0xCD4, 0x00000000,
+                0xCD8, 0x64B22427,
+                0xCDC, 0x00766932,
+                0xCE0, 0x00222222,
+                0xCE4, 0x00000000,
+                0xCE8, 0x37644302,
+                0xCEC, 0x2F97D40C,
+                0xD00, 0x00000740,
+                0xD04, 0x40020401,
+                0xD08, 0x0000907F,
+                0xD0C, 0x20010201,
+                0xD10, 0xA0633333,
+                0xD14, 0x3333BC53,
+                0xD18, 0x7A8F5B6F,
+                0xD2C, 0xCC979975,
+                0xD30, 0x00000000,
+                0xD34, 0x80608000,
+                0xD38, 0x00000000,
+                0xD3C, 0x00127353,
+                0xD40, 0x00000000,
+                0xD44, 0x00000000,
+                0xD48, 0x00000000,
+                0xD4C, 0x00000000,
+                0xD50, 0x6437140A,
+                0xD54, 0x00000000,
+                0xD58, 0x00000282,
+                0xD5C, 0x30032064,
+                0xD60, 0x4653DE68,
+                0xD64, 0x04518A3C,
+                0xD68, 0x00002101,
+                0xD6C, 0x2A201C16,
+                0xD70, 0x1812362E,
+                0xD74, 0x322C2220,
+                0xD78, 0x000E3C24,
+                0xE00, 0x2D2D2D2D,
+                0xE04, 0x2D2D2D2D,
+                0xE08, 0x0390272D,
+                0xE10, 0x2D2D2D2D,
+                0xE14, 0x2D2D2D2D,
+                0xE18, 0x2D2D2D2D,
+                0xE1C, 0x2D2D2D2D,
+                0xE28, 0x00000000,
+                0xE30, 0x1000DC1F,
+                0xE34, 0x10008C1F,
+                0xE38, 0x02140102,
+                0xE3C, 0x681604C2,
+                0xE40, 0x01007C00,
+                0xE44, 0x01004800,
+                0xE48, 0xFB000000,
+                0xE4C, 0x000028D1,
+                0xE50, 0x1000DC1F,
+                0xE54, 0x10008C1F,
+                0xE58, 0x02140102,
+                0xE5C, 0x28160D05,
+                0xE60, 0x00000008,
+                0xE68, 0x001B2556,
+                0xE6C, 0x00C00096,
+                0xE70, 0x00C00096,
+                0xE74, 0x01000056,
+                0xE78, 0x01000014,
+                0xE7C, 0x01000056,
+                0xE80, 0x01000014,
+                0xE84, 0x00C00096,
+                0xE88, 0x01000056,
+                0xE8C, 0x00C00096,
+                0xED0, 0x00C00096,
+                0xED4, 0x00C00096,
+                0xED8, 0x00C00096,
+                0xEDC, 0x000000D6,
+                0xEE0, 0x000000D6,
+                0xEEC, 0x01C00016,
+                0xF14, 0x00000003,
+                0xF4C, 0x00000000,
+                0xF00, 0x00000300,
+                0x820, 0x01000100,
+                0x800, 0x83040000,
+
 };
 
 u32 RTL8723BEPHY_REG_ARRAY_PG[] = {
@@ -233,340 +234,344 @@ u32 RTL8723BEPHY_REG_ARRAY_PG[] = {
 };
 
 u32 RTL8723BE_RADIOA_1TARRAY[] = {
-        0x000, 0x00010000,
-        0x0B0, 0x000DFFE0,
-        0x0FE, 0x00000000,
-        0x0FE, 0x00000000,
-        0x0FE, 0x00000000,
-        0x0B1, 0x00000018,
-        0x0FE, 0x00000000,
-        0x0FE, 0x00000000,
-        0x0FE, 0x00000000,
-        0x0B2, 0x00084C00,
-        0x0B5, 0x0000D2CC,
-        0x0B6, 0x000925AA,
-        0x0B7, 0x00000010,
-        0x0B8, 0x0000907F,
-        0x05C, 0x00000002,
-        0x07C, 0x00000002,
-        0x07E, 0x00000005,
-        0x08B, 0x0006FC00,
-        0x0B0, 0x000FF9F0,
-        0x01C, 0x000739D2,
-        0x01E, 0x00000000,
-        0x0DF, 0x00000780,
-        0x050, 0x00067435,
-        0x051, 0x0006B04E,
-        0x052, 0x000007D2,
-        0x053, 0x00000000,
-        0x054, 0x00050400,
-        0x055, 0x0004026E,
-        0x0DD, 0x0000004C,
-        0x070, 0x00067435,
-        0x071, 0x0006B04E,
-        0x072, 0x000007D2,
-        0x073, 0x00000000,
-        0x074, 0x00050400,
-        0x075, 0x0004026E,
-        0x0EF, 0x00000100,
-        0x034, 0x0000ADD7,
-        0x035, 0x00005C00,
-        0x034, 0x00009DD4,
-        0x035, 0x00005000,
-        0x034, 0x00008DD1,
-        0x035, 0x00004400,
-        0x034, 0x00007DCE,
-        0x035, 0x00003800,
-        0x034, 0x00006CD1,
-        0x035, 0x00004400,
-        0x034, 0x00005CCE,
-        0x035, 0x00003800,
-        0x034, 0x000048CE,
-        0x035, 0x00004400,
-        0x034, 0x000034CE,
-        0x035, 0x00003800,
-        0x034, 0x00002451,
-        0x035, 0x00004400,
-        0x034, 0x0000144E,
-        0x035, 0x00003800,
-        0x034, 0x00000051,
-        0x035, 0x00004400,
-        0x0EF, 0x00000000,
-        0x0EF, 0x00000100,
-        0x0ED, 0x00000010,
-        0x044, 0x0000ADD7,
-        0x044, 0x00009DD4,
-        0x044, 0x00008DD1,
-        0x044, 0x00007DCE,
-        0x044, 0x00006CC1,
-        0x044, 0x00005CCE,
-        0x044, 0x000044D1,
-        0x044, 0x000034CE,
-        0x044, 0x00002451,
-        0x044, 0x0000144E,
-        0x044, 0x00000051,
-        0x0EF, 0x00000000,
-        0x0ED, 0x00000000,
-        0x0EF, 0x00002000,
-        0x03B, 0x000380EF,
-        0x03B, 0x000302FE,
-        0x03B, 0x00028CE6,
-        0x03B, 0x000200BC,
-        0x03B, 0x000188A5,
-        0x03B, 0x00010FBC,
-        0x03B, 0x00008F71,
-        0x03B, 0x00000900,
-        0x0EF, 0x00000000,
-        0x0ED, 0x00000001,
-        0x040, 0x000380EF,
-        0x040, 0x000302FE,
-        0x040, 0x00028CE6,
-        0x040, 0x000200BC,
-        0x040, 0x000188A5,
-        0x040, 0x00010FBC,
-        0x040, 0x00008F71,
-        0x040, 0x00000900,
-        0x0ED, 0x00000000,
-        0x082, 0x00080000,
-        0x083, 0x00008000,
-        0x084, 0x00048D80,
-        0x085, 0x00068000,
-        0x0A2, 0x00080000,
-        0x0A3, 0x00008000,
-        0x0A4, 0x00048D80,
-        0x0A5, 0x00068000,
-        0x000, 0x00033D80,
+                0x000, 0x00010000,
+                0x0B0, 0x000DFFE0,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0B1, 0x00000018,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0B2, 0x00084C00,
+                0x0B5, 0x0000D2CC,
+                0x0B6, 0x000925AA,
+                0x0B7, 0x00000010,
+                0x0B8, 0x0000907F,
+                0x05C, 0x00000002,
+                0x07C, 0x00000002,
+                0x07E, 0x00000005,
+                0x08B, 0x0006FC00,
+                0x0B0, 0x000FF9F0,
+                0x01C, 0x000739D2,
+                0x01E, 0x00000000,
+                0x0DF, 0x00000780,
+                0x050, 0x00067435,
+                0x051, 0x0006B04E,
+                0x052, 0x000007D2,
+                0x053, 0x00000000,
+                0x054, 0x00050400,
+                0x055, 0x0004026E,
+                0x0DD, 0x0000004C,
+                0x070, 0x00067435,
+                0x071, 0x0006B04E,
+                0x072, 0x000007D2,
+                0x073, 0x00000000,
+                0x074, 0x00050400,
+                0x075, 0x0004026E,
+                0x0EF, 0x00000100,
+                0x034, 0x0000ADD7,
+                0x035, 0x00005C00,
+                0x034, 0x00009DD4,
+                0x035, 0x00005000,
+                0x034, 0x00008DD1,
+                0x035, 0x00004400,
+                0x034, 0x00007DCE,
+                0x035, 0x00003800,
+                0x034, 0x00006CD1,
+                0x035, 0x00004400,
+                0x034, 0x00005CCE,
+                0x035, 0x00003800,
+                0x034, 0x000048CE,
+                0x035, 0x00004400,
+                0x034, 0x000034CE,
+                0x035, 0x00003800,
+                0x034, 0x00002451,
+                0x035, 0x00004400,
+                0x034, 0x0000144E,
+                0x035, 0x00003800,
+                0x034, 0x00000051,
+                0x035, 0x00004400,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00000100,
+                0x0ED, 0x00000010,
+                0x044, 0x0000ADD7,
+                0x044, 0x00009DD4,
+                0x044, 0x00008DD1,
+                0x044, 0x00007DCE,
+                0x044, 0x00006CC1,
+                0x044, 0x00005CCE,
+                0x044, 0x000044D1,
+                0x044, 0x000034CE,
+                0x044, 0x00002451,
+                0x044, 0x0000144E,
+                0x044, 0x00000051,
+                0x0EF, 0x00000000,
+                0x0ED, 0x00000000,
+                0x0EF, 0x00002000,
+                0x03B, 0x000380EF,
+                0x03B, 0x000302FE,
+                0x03B, 0x00028CE6,
+                0x03B, 0x000200BC,
+                0x03B, 0x000188A5,
+                0x03B, 0x00010FBC,
+                0x03B, 0x00008F71,
+                0x03B, 0x00000900,
+                0x0EF, 0x00000000,
+                0x0ED, 0x00000001,
+                0x040, 0x000380EF,
+                0x040, 0x000302FE,
+                0x040, 0x00028CE6,
+                0x040, 0x000200BC,
+                0x040, 0x000188A5,
+                0x040, 0x00010FBC,
+                0x040, 0x00008F71,
+                0x040, 0x00000900,
+                0x0ED, 0x00000000,
+                0x082, 0x00080000,
+                0x083, 0x00008000,
+                0x084, 0x00048D80,
+                0x085, 0x00068000,
+                0x0A2, 0x00080000,
+                0x0A3, 0x00008000,
+                0x0A4, 0x00048D80,
+                0x0A5, 0x00068000,
+                0x000, 0x00033D80,
+
 };
 
 u32 RTL8723BEMAC_1T_ARRAY[] = {
-        0x02F, 0x00000030,
-        0x035, 0x00000000,
-        0x428, 0x0000000A,
-        0x429, 0x00000010,
-        0x430, 0x00000000,
-        0x431, 0x00000000,
-        0x432, 0x00000000,
-        0x433, 0x00000001,
-        0x434, 0x00000004,
-        0x435, 0x00000005,
-        0x436, 0x00000007,
-        0x437, 0x00000008,
-        0x43C, 0x00000004,
-        0x43D, 0x00000005,
-        0x43E, 0x00000007,
-        0x43F, 0x00000008,
-        0x440, 0x0000005D,
-        0x441, 0x00000001,
-        0x442, 0x00000000,
-        0x444, 0x00000010,
-        0x445, 0x00000000,
-        0x446, 0x00000000,
-        0x447, 0x00000000,
-        0x448, 0x00000000,
-        0x449, 0x000000F0,
-        0x44A, 0x0000000F,
-        0x44B, 0x0000003E,
-        0x44C, 0x00000010,
-        0x44D, 0x00000000,
-        0x44E, 0x00000000,
-        0x44F, 0x00000000,
-        0x450, 0x00000000,
-        0x451, 0x000000F0,
-        0x452, 0x0000000F,
-        0x453, 0x00000000,
-        0x456, 0x0000005E,
-        0x460, 0x00000066,
-        0x461, 0x00000066,
-        0x4C8, 0x000000FF,
-        0x4C9, 0x00000008,
-        0x4CC, 0x000000FF,
-        0x4CD, 0x000000FF,
-        0x4CE, 0x00000001,
-        0x500, 0x00000026,
-        0x501, 0x000000A2,
-        0x502, 0x0000002F,
-        0x503, 0x00000000,
-        0x504, 0x00000028,
-        0x505, 0x000000A3,
-        0x506, 0x0000005E,
-        0x507, 0x00000000,
-        0x508, 0x0000002B,
-        0x509, 0x000000A4,
-        0x50A, 0x0000005E,
-        0x50B, 0x00000000,
-        0x50C, 0x0000004F,
-        0x50D, 0x000000A4,
-        0x50E, 0x00000000,
-        0x50F, 0x00000000,
-        0x512, 0x0000001C,
-        0x514, 0x0000000A,
-        0x516, 0x0000000A,
-        0x525, 0x0000004F,
-        0x550, 0x00000010,
-        0x551, 0x00000010,
-        0x559, 0x00000002,
-        0x55C, 0x00000050,
-        0x55D, 0x000000FF,
-        0x605, 0x00000030,
-        0x608, 0x0000000E,
-        0x609, 0x0000002A,
-        0x620, 0x000000FF,
-        0x621, 0x000000FF,
-        0x622, 0x000000FF,
-        0x623, 0x000000FF,
-        0x624, 0x000000FF,
-        0x625, 0x000000FF,
-        0x626, 0x000000FF,
-        0x627, 0x000000FF,
-        0x638, 0x00000050,
-        0x63C, 0x0000000A,
-        0x63D, 0x0000000A,
-        0x63E, 0x0000000E,
-        0x63F, 0x0000000E,
-        0x640, 0x00000040,
-        0x642, 0x00000040,
-        0x643, 0x00000000,
-        0x652, 0x000000C8,
-        0x66E, 0x00000005,
-        0x700, 0x00000021,
-        0x701, 0x00000043,
-        0x702, 0x00000065,
-        0x703, 0x00000087,
-        0x708, 0x00000021,
-        0x709, 0x00000043,
-        0x70A, 0x00000065,
-        0x70B, 0x00000087,
+                0x02F, 0x00000030,
+                0x035, 0x00000000,
+                0x067, 0x00000020,
+                0x428, 0x0000000A,
+                0x429, 0x00000010,
+                0x430, 0x00000000,
+                0x431, 0x00000000,
+                0x432, 0x00000000,
+                0x433, 0x00000001,
+                0x434, 0x00000004,
+                0x435, 0x00000005,
+                0x436, 0x00000007,
+                0x437, 0x00000008,
+                0x43C, 0x00000004,
+                0x43D, 0x00000005,
+                0x43E, 0x00000007,
+                0x43F, 0x00000008,
+                0x440, 0x0000005D,
+                0x441, 0x00000001,
+                0x442, 0x00000000,
+                0x444, 0x00000010,
+                0x445, 0x00000000,
+                0x446, 0x00000000,
+                0x447, 0x00000000,
+                0x448, 0x00000000,
+                0x449, 0x000000F0,
+                0x44A, 0x0000000F,
+                0x44B, 0x0000003E,
+                0x44C, 0x00000010,
+                0x44D, 0x00000000,
+                0x44E, 0x00000000,
+                0x44F, 0x00000000,
+                0x450, 0x00000000,
+                0x451, 0x000000F0,
+                0x452, 0x0000000F,
+                0x453, 0x00000000,
+                0x456, 0x0000005E,
+                0x460, 0x00000066,
+                0x461, 0x00000066,
+                0x4C8, 0x000000FF,
+                0x4C9, 0x00000008,
+                0x4CC, 0x000000FF,
+                0x4CD, 0x000000FF,
+                0x4CE, 0x00000001,
+                0x500, 0x00000026,
+                0x501, 0x000000A2,
+                0x502, 0x0000002F,
+                0x503, 0x00000000,
+                0x504, 0x00000028,
+                0x505, 0x000000A3,
+                0x506, 0x0000005E,
+                0x507, 0x00000000,
+                0x508, 0x0000002B,
+                0x509, 0x000000A4,
+                0x50A, 0x0000005E,
+                0x50B, 0x00000000,
+                0x50C, 0x0000004F,
+                0x50D, 0x000000A4,
+                0x50E, 0x00000000,
+                0x50F, 0x00000000,
+                0x512, 0x0000001C,
+                0x514, 0x0000000A,
+                0x516, 0x0000000A,
+                0x525, 0x0000004F,
+                0x550, 0x00000010,
+                0x551, 0x00000010,
+                0x559, 0x00000002,
+                0x55C, 0x00000050,
+                0x55D, 0x000000FF,
+                0x605, 0x00000030,
+                0x608, 0x0000000E,
+                0x609, 0x0000002A,
+                0x620, 0x000000FF,
+                0x621, 0x000000FF,
+                0x622, 0x000000FF,
+                0x623, 0x000000FF,
+                0x624, 0x000000FF,
+                0x625, 0x000000FF,
+                0x626, 0x000000FF,
+                0x627, 0x000000FF,
+                0x638, 0x00000050,
+                0x63C, 0x0000000A,
+                0x63D, 0x0000000A,
+                0x63E, 0x0000000E,
+                0x63F, 0x0000000E,
+                0x640, 0x00000040,
+                0x642, 0x00000040,
+                0x643, 0x00000000,
+                0x652, 0x000000C8,
+                0x66E, 0x00000005,
+                0x700, 0x00000021,
+                0x701, 0x00000043,
+                0x702, 0x00000065,
+                0x703, 0x00000087,
+                0x708, 0x00000021,
+                0x709, 0x00000043,
+                0x70A, 0x00000065,
+                0x70B, 0x00000087,
+
 };
 
 u32 RTL8723BEAGCTAB_1TARRAY[] = {
-        0xC78, 0xFD000001,
-        0xC78, 0xFC010001,
-        0xC78, 0xFB020001,
-        0xC78, 0xFA030001,
-        0xC78, 0xF9040001,
-        0xC78, 0xF8050001,
-        0xC78, 0xF7060001,
-        0xC78, 0xF6070001,
-        0xC78, 0xF5080001,
-        0xC78, 0xF4090001,
-        0xC78, 0xF30A0001,
-        0xC78, 0xF20B0001,
-        0xC78, 0xF10C0001,
-        0xC78, 0xF00D0001,
-        0xC78, 0xEF0E0001,
-        0xC78, 0xEE0F0001,
-        0xC78, 0xED100001,
-        0xC78, 0xEC110001,
-        0xC78, 0xEB120001,
-        0xC78, 0xEA130001,
-        0xC78, 0xE9140001,
-        0xC78, 0xE8150001,
-        0xC78, 0xE7160001,
-        0xC78, 0xAA170001,
-        0xC78, 0xA9180001,
-        0xC78, 0xA8190001,
-        0xC78, 0xA71A0001,
-        0xC78, 0xA61B0001,
-        0xC78, 0xA51C0001,
-        0xC78, 0xA41D0001,
-        0xC78, 0xA31E0001,
-        0xC78, 0x671F0001,
-        0xC78, 0x66200001,
-        0xC78, 0x65210001,
-        0xC78, 0x64220001,
-        0xC78, 0x63230001,
-        0xC78, 0x62240001,
-        0xC78, 0x61250001,
-        0xC78, 0x47260001,
-        0xC78, 0x46270001,
-        0xC78, 0x45280001,
-        0xC78, 0x44290001,
-        0xC78, 0x432A0001,
-        0xC78, 0x422B0001,
-        0xC78, 0x292C0001,
-        0xC78, 0x282D0001,
-        0xC78, 0x272E0001,
-        0xC78, 0x262F0001,
-        0xC78, 0x25300001,
-        0xC78, 0x24310001,
-        0xC78, 0x09320001,
-        0xC78, 0x08330001,
-        0xC78, 0x07340001,
-        0xC78, 0x06350001,
-        0xC78, 0x05360001,
-        0xC78, 0x04370001,
-        0xC78, 0x03380001,
-        0xC78, 0x02390001,
-        0xC78, 0x013A0001,
-        0xC78, 0x003B0001,
-        0xC78, 0x003C0001,
-        0xC78, 0x003D0001,
-        0xC78, 0x003E0001,
-        0xC78, 0x003F0001,
-        0xC78, 0xFC400001,
-        0xC78, 0xFB410001,
-        0xC78, 0xFA420001,
-        0xC78, 0xF9430001,
-        0xC78, 0xF8440001,
-        0xC78, 0xF7450001,
-        0xC78, 0xF6460001,
-        0xC78, 0xF5470001,
-        0xC78, 0xF4480001,
-        0xC78, 0xF3490001,
-        0xC78, 0xF24A0001,
-        0xC78, 0xF14B0001,
-        0xC78, 0xF04C0001,
-        0xC78, 0xEF4D0001,
-        0xC78, 0xEE4E0001,
-        0xC78, 0xED4F0001,
-        0xC78, 0xEC500001,
-        0xC78, 0xEB510001,
-        0xC78, 0xEA520001,
-        0xC78, 0xE9530001,
-        0xC78, 0xE8540001,
-        0xC78, 0xE7550001,
-        0xC78, 0xE6560001,
-        0xC78, 0xE5570001,
-        0xC78, 0xAA580001,
-        0xC78, 0xA9590001,
-        0xC78, 0xA85A0001,
-        0xC78, 0xA75B0001,
-        0xC78, 0xA65C0001,
-        0xC78, 0xA55D0001,
-        0xC78, 0xA45E0001,
-        0xC78, 0x675F0001,
-        0xC78, 0x66600001,
-        0xC78, 0x65610001,
-        0xC78, 0x64620001,
-        0xC78, 0x63630001,
-        0xC78, 0x62640001,
-        0xC78, 0x61650001,
-        0xC78, 0x47660001,
-        0xC78, 0x46670001,
-        0xC78, 0x45680001,
-        0xC78, 0x44690001,
-        0xC78, 0x436A0001,
-        0xC78, 0x426B0001,
-        0xC78, 0x296C0001,
-        0xC78, 0x286D0001,
-        0xC78, 0x276E0001,
-        0xC78, 0x266F0001,
-        0xC78, 0x25700001,
-        0xC78, 0x24710001,
-        0xC78, 0x09720001,
-        0xC78, 0x08730001,
-        0xC78, 0x07740001,
-        0xC78, 0x06750001,
-        0xC78, 0x05760001,
-        0xC78, 0x04770001,
-        0xC78, 0x03780001,
-        0xC78, 0x02790001,
-        0xC78, 0x017A0001,
-        0xC78, 0x007B0001,
-        0xC78, 0x007C0001,
-        0xC78, 0x007D0001,
-        0xC78, 0x007E0001,
-        0xC78, 0x007F0001,
-        0xC50, 0x69553422,
-        0xC50, 0x69553420,
+                0xC78, 0xFD000001,
+                0xC78, 0xFC010001,
+                0xC78, 0xFB020001,
+                0xC78, 0xFA030001,
+                0xC78, 0xF9040001,
+                0xC78, 0xF8050001,
+                0xC78, 0xF7060001,
+                0xC78, 0xF6070001,
+                0xC78, 0xF5080001,
+                0xC78, 0xF4090001,
+                0xC78, 0xF30A0001,
+                0xC78, 0xF20B0001,
+                0xC78, 0xF10C0001,
+                0xC78, 0xF00D0001,
+                0xC78, 0xEF0E0001,
+                0xC78, 0xEE0F0001,
+                0xC78, 0xED100001,
+                0xC78, 0xEC110001,
+                0xC78, 0xEB120001,
+                0xC78, 0xEA130001,
+                0xC78, 0xE9140001,
+                0xC78, 0xE8150001,
+                0xC78, 0xE7160001,
+                0xC78, 0xAA170001,
+                0xC78, 0xA9180001,
+                0xC78, 0xA8190001,
+                0xC78, 0xA71A0001,
+                0xC78, 0xA61B0001,
+                0xC78, 0xA51C0001,
+                0xC78, 0xA41D0001,
+                0xC78, 0xA31E0001,
+                0xC78, 0x671F0001,
+                0xC78, 0x66200001,
+                0xC78, 0x65210001,
+                0xC78, 0x64220001,
+                0xC78, 0x63230001,
+                0xC78, 0x62240001,
+                0xC78, 0x61250001,
+                0xC78, 0x47260001,
+                0xC78, 0x46270001,
+                0xC78, 0x45280001,
+                0xC78, 0x44290001,
+                0xC78, 0x432A0001,
+                0xC78, 0x422B0001,
+                0xC78, 0x292C0001,
+                0xC78, 0x282D0001,
+                0xC78, 0x272E0001,
+                0xC78, 0x262F0001,
+                0xC78, 0x25300001,
+                0xC78, 0x24310001,
+                0xC78, 0x09320001,
+                0xC78, 0x08330001,
+                0xC78, 0x07340001,
+                0xC78, 0x06350001,
+                0xC78, 0x05360001,
+                0xC78, 0x04370001,
+                0xC78, 0x03380001,
+                0xC78, 0x02390001,
+                0xC78, 0x013A0001,
+                0xC78, 0x003B0001,
+                0xC78, 0x003C0001,
+                0xC78, 0x003D0001,
+                0xC78, 0x003E0001,
+                0xC78, 0x003F0001,
+                0xC78, 0xFC400001,
+                0xC78, 0xFB410001,
+                0xC78, 0xFA420001,
+                0xC78, 0xF9430001,
+                0xC78, 0xF8440001,
+                0xC78, 0xF7450001,
+                0xC78, 0xF6460001,
+                0xC78, 0xF5470001,
+                0xC78, 0xF4480001,
+                0xC78, 0xF3490001,
+                0xC78, 0xF24A0001,
+                0xC78, 0xF14B0001,
+                0xC78, 0xF04C0001,
+                0xC78, 0xEF4D0001,
+                0xC78, 0xEE4E0001,
+                0xC78, 0xED4F0001,
+                0xC78, 0xEC500001,
+                0xC78, 0xEB510001,
+                0xC78, 0xEA520001,
+                0xC78, 0xE9530001,
+                0xC78, 0xE8540001,
+                0xC78, 0xE7550001,
+                0xC78, 0xE6560001,
+                0xC78, 0xE5570001,
+                0xC78, 0xAA580001,
+                0xC78, 0xA9590001,
+                0xC78, 0xA85A0001,
+                0xC78, 0xA75B0001,
+                0xC78, 0xA65C0001,
+                0xC78, 0xA55D0001,
+                0xC78, 0xA45E0001,
+                0xC78, 0x675F0001,
+                0xC78, 0x66600001,
+                0xC78, 0x65610001,
+                0xC78, 0x64620001,
+                0xC78, 0x63630001,
+                0xC78, 0x62640001,
+                0xC78, 0x61650001,
+                0xC78, 0x47660001,
+                0xC78, 0x46670001,
+                0xC78, 0x45680001,
+                0xC78, 0x44690001,
+                0xC78, 0x436A0001,
+                0xC78, 0x426B0001,
+                0xC78, 0x296C0001,
+                0xC78, 0x286D0001,
+                0xC78, 0x276E0001,
+                0xC78, 0x266F0001,
+                0xC78, 0x25700001,
+                0xC78, 0x24710001,
+                0xC78, 0x09720001,
+                0xC78, 0x08730001,
+                0xC78, 0x07740001,
+                0xC78, 0x06750001,
+                0xC78, 0x05760001,
+                0xC78, 0x04770001,
+                0xC78, 0x03780001,
+                0xC78, 0x02790001,
+                0xC78, 0x017A0001,
+                0xC78, 0x007B0001,
+                0xC78, 0x007C0001,
+                0xC78, 0x007D0001,
+                0xC78, 0x007E0001,
+                0xC78, 0x007F0001,
+                0xC50, 0x69553422,
+                0xC50, 0x69553420,
+
 };
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/table.h b/drivers/net/wireless/rtlwifi/rtl8723be/table.h
index 932760a84827..dc17001632f7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/table.h
@@ -35,7 +35,7 @@ extern u32 RTL8723BEPHY_REG_1TARRAY[];
 extern u32 RTL8723BEPHY_REG_ARRAY_PG[];
 #define RTL8723BE_RADIOA_1TARRAYLEN     206
 extern u32 RTL8723BE_RADIOA_1TARRAY[];
-#define RTL8723BEMAC_1T_ARRAYLEN        194
+#define RTL8723BEMAC_1T_ARRAYLEN        196
 extern u32 RTL8723BEMAC_1T_ARRAY[];
 #define RTL8723BEAGCTAB_1TARRAYLEN      260
 extern u32 RTL8723BEAGCTAB_1TARRAY[];
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/rtlwifi/rtl8723be/trx.c
index 969eaea5eddd..d6a1c70cb657 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/trx.c
@@ -33,6 +33,7 @@
 #include "trx.h"
 #include "led.h"
 #include "dm.h"
+#include "fw.h"
 
 static u8 _rtl8723be_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
 {
@@ -207,196 +208,150 @@ static int _rtl8723be_rate_mapping(struct ieee80211_hw *hw,
 static void _rtl8723be_query_rxphystatus(struct ieee80211_hw *hw,
                                          struct rtl_stats *pstatus, u8 *pdesc,
                                          struct rx_fwinfo_8723be *p_drvinfo,
-                                         bool packet_match_bssid,
-                                         bool packet_toself,
+                                         bool bpacket_match_bssid,
+                                         bool bpacket_toself,
                                          bool packet_beacon)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
-        struct phy_sts_cck_8723e_t *cck_buf;
         struct phy_status_rpt *p_phystrpt = (struct phy_status_rpt *)p_drvinfo;
-        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
         char rx_pwr_all = 0, rx_pwr[4];
-        u8 rf_rx_num = 0, evm, pwdb_all;
+        u8 rf_rx_num = 0, evm, pwdb_all, pwdb_all_bt = 0;
         u8 i, max_spatial_stream;
         u32 rssi, total_rssi = 0;
         bool is_cck = pstatus->is_cck;
         u8 lan_idx, vga_idx;
 
         /* Record it for next packet processing */
-        pstatus->packet_matchbssid = packet_match_bssid;
-        pstatus->packet_toself = packet_toself;
+        pstatus->packet_matchbssid = bpacket_match_bssid;
+        pstatus->packet_toself = bpacket_toself;
         pstatus->packet_beacon = packet_beacon;
-        pstatus->rx_mimo_sig_qual[0] = -1;
-        pstatus->rx_mimo_sig_qual[1] = -1;
+        pstatus->rx_mimo_signalquality[0] = -1;
+        pstatus->rx_mimo_signalquality[1] = -1;
 
         if (is_cck) {
                 u8 cck_highpwr;
                 u8 cck_agc_rpt;
-                /* CCK Driver info Structure is not the same as OFDM packet. */
-                cck_buf = (struct phy_sts_cck_8723e_t *)p_drvinfo;
-                cck_agc_rpt = cck_buf->cck_agc_rpt;
 
-                /* (1)Hardware does not provide RSSI for CCK
-                 * (2)PWDB, Average PWDB cacluated by
+                cck_agc_rpt = p_phystrpt->cck_agc_rpt_ofdm_cfosho_a;
+
+                /* (1)Hardware does not provide RSSI for CCK */
+                /* (2)PWDB, Average PWDB cacluated by
                  * hardware (for rate adaptive)
                  */
-                if (ppsc->rfpwr_state == ERFON)
-                        cck_highpwr = (u8) rtl_get_bbreg(hw,
-                                                       RFPGA0_XA_HSSIPARAMETER2,
-                                                       BIT(9));
-                else
-                        cck_highpwr = false;
+                cck_highpwr = (u8)rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2,
+                                                 BIT(9));
 
                 lan_idx = ((cck_agc_rpt & 0xE0) >> 5);
                 vga_idx = (cck_agc_rpt & 0x1f);
+
                 switch (lan_idx) {
-                case 7:
-                        if (vga_idx <= 27)/*VGA_idx = 27~2*/
-                                rx_pwr_all = -100 + 2 * (27 - vga_idx);
-                        else
-                                rx_pwr_all = -100;
+                /* 46 53 73 95 201301231630 */
+                /* 46 53 77 99 201301241630 */
+                case 6:
+                        rx_pwr_all = -34 - (2 * vga_idx);
                         break;
-                case 6:/*VGA_idx = 2~0*/
-                        rx_pwr_all = -48 + 2 * (2 - vga_idx);
-                        break;
-                case 5:/*VGA_idx = 7~5*/
-                        rx_pwr_all = -42 + 2 * (7 - vga_idx);
-                        break;
-                case 4:/*VGA_idx = 7~4*/
-                        rx_pwr_all = -36 + 2 * (7 - vga_idx);
-                        break;
-                case 3:/*VGA_idx = 7~0*/
-                        rx_pwr_all = -24 + 2 * (7 - vga_idx);
-                        break;
-                case 2:
-                        if (cck_highpwr)/*VGA_idx = 5~0*/
-                                rx_pwr_all = -12 + 2 * (5 - vga_idx);
-                        else
-                                rx_pwr_all = -6 + 2 * (5 - vga_idx);
+                case 4:
+                        rx_pwr_all = -14 - (2 * vga_idx);
                         break;
                 case 1:
-                        rx_pwr_all = 8 - 2 * vga_idx;
+                        rx_pwr_all = 6 - (2 * vga_idx);
                         break;
                 case 0:
-                        rx_pwr_all = 14 - 2 * vga_idx;
+                        rx_pwr_all = 16 - (2 * vga_idx);
                         break;
                 default:
                         break;
                 }
-                rx_pwr_all += 6;
+
                 pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
-                /* CCK gain is smaller than OFDM/MCS gain,  */
-                /* so we add gain diff by experiences,
-                 * the val is 6
-                 */
-                pwdb_all += 6;
                 if (pwdb_all > 100)
                         pwdb_all = 100;
-                /* modify the offset to make the same gain index with OFDM. */
-                if (pwdb_all > 34 && pwdb_all <= 42)
-                        pwdb_all -= 2;
-                else if (pwdb_all > 26 && pwdb_all <= 34)
-                        pwdb_all -= 6;
-                else if (pwdb_all > 14 && pwdb_all <= 26)
-                        pwdb_all -= 8;
-                else if (pwdb_all > 4 && pwdb_all <= 14)
-                        pwdb_all -= 4;
-                if (!cck_highpwr) {
-                        if (pwdb_all >= 80)
-                                pwdb_all = ((pwdb_all - 80) << 1) +
-                                           ((pwdb_all - 80) >> 1) + 80;
-                        else if ((pwdb_all <= 78) && (pwdb_all >= 20))
-                                pwdb_all += 3;
-                        if (pwdb_all > 100)
-                                pwdb_all = 100;
-                }
 
                 pstatus->rx_pwdb_all = pwdb_all;
+                pstatus->bt_rx_rssi_percentage = pwdb_all;
                 pstatus->recvsignalpower = rx_pwr_all;
 
                 /* (3) Get Signal Quality (EVM) */
-                if (packet_match_bssid) {
-                        u8 sq;
-
+                if (bpacket_match_bssid) {
+                        u8 sq, sq_rpt;
                         if (pstatus->rx_pwdb_all > 40) {
                                 sq = 100;
                         } else {
-                                sq = cck_buf->sq_rpt;
-                                if (sq > 64)
+                                sq_rpt = p_phystrpt->cck_sig_qual_ofdm_pwdb_all;
+                                if (sq_rpt > 64)
                                         sq = 0;
-                                else if (sq < 20)
+                                else if (sq_rpt < 20)
                                         sq = 100;
                                 else
-                                        sq = ((64 - sq) * 100) / 44;
+                                        sq = ((64 - sq_rpt) * 100) / 44;
                         }
-
                         pstatus->signalquality = sq;
-                        pstatus->rx_mimo_sig_qual[0] = sq;
-                        pstatus->rx_mimo_sig_qual[1] = -1;
+                        pstatus->rx_mimo_signalquality[0] = sq;
+                        pstatus->rx_mimo_signalquality[1] = -1;
                 }
         } else {
-                rtlpriv->dm.rfpath_rxenable[0] = true;
-                rtlpriv->dm.rfpath_rxenable[1] = true;
-
                 /* (1)Get RSSI for HT rate */
                 for (i = RF90_PATH_A; i < RF6052_MAX_PATH; i++) {
                         /* we will judge RF RX path now. */
                         if (rtlpriv->dm.rfpath_rxenable[i])
                                 rf_rx_num++;
 
-                        rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f)*2) - 110;
+                        rx_pwr[i] = ((p_phystrpt->path_agc[i].gain & 0x3f) * 2)
+                                    - 110;
 
+                        pstatus->rx_pwr[i] = rx_pwr[i];
                         /* Translate DBM to percentage. */
                         rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
                         total_rssi += rssi;
 
-                        /* Get Rx snr value in DB */
-                        rtlpriv->stats.rx_snr_db[i] =
-                                        (long)(p_drvinfo->rxsnr[i] / 2);
-
-                        /* Record Signal Strength for next packet */
-                        if (packet_match_bssid)
-                                pstatus->rx_mimo_signalstrength[i] = (u8) rssi;
+                        pstatus->rx_mimo_signalstrength[i] = (u8)rssi;
                 }
 
-                /* (2)PWDB, Avg cacluated by hardware (for rate adaptive) */
-                rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
+                /* (2)PWDB, Average PWDB cacluated by
+                 * hardware (for rate adaptive)
+                 */
+                rx_pwr_all = ((p_phystrpt->cck_sig_qual_ofdm_pwdb_all >> 1) &
+                             0x7f) - 110;
 
                 pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+                pwdb_all_bt = pwdb_all;
                 pstatus->rx_pwdb_all = pwdb_all;
+                pstatus->bt_rx_rssi_percentage = pwdb_all_bt;
                 pstatus->rxpower = rx_pwr_all;
                 pstatus->recvsignalpower = rx_pwr_all;
 
                 /* (3)EVM of HT rate */
-                if (pstatus->is_ht && pstatus->rate >= DESC92C_RATEMCS8 &&
+                if (pstatus->rate >= DESC92C_RATEMCS8 &&
                     pstatus->rate <= DESC92C_RATEMCS15)
                         max_spatial_stream = 2;
                 else
                         max_spatial_stream = 1;
 
                 for (i = 0; i < max_spatial_stream; i++) {
-                        evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]);
+                        evm = rtl_evm_db_to_percentage(
+                                                p_phystrpt->stream_rxevm[i]);
 
-                        if (packet_match_bssid) {
+                        if (bpacket_match_bssid) {
                                 /* Fill value in RFD, Get the first
                                  * spatial stream only
                                  */
                                 if (i == 0)
                                         pstatus->signalquality =
-                                                        (u8) (evm & 0xff);
-                                pstatus->rx_mimo_sig_qual[i] =
-                                                        (u8) (evm & 0xff);
+                                                        (u8)(evm & 0xff);
+                                pstatus->rx_mimo_signalquality[i] =
+                                                        (u8)(evm & 0xff);
                         }
                 }
-                if (packet_match_bssid) {
+
+                if (bpacket_match_bssid) {
                         for (i = RF90_PATH_A; i <= RF90_PATH_B; i++)
                                 rtl_priv(hw)->dm.cfo_tail[i] =
-                                        (char)p_phystrpt->path_cfotail[i];
+                                        (int)p_phystrpt->path_cfotail[i];
 
-                        rtl_priv(hw)->dm.packet_count++;
                         if (rtl_priv(hw)->dm.packet_count == 0xffffffff)
                                 rtl_priv(hw)->dm.packet_count = 0;
+                        else
+                                rtl_priv(hw)->dm.packet_count++;
                 }
         }
 
@@ -409,10 +364,6 @@ static void _rtl8723be_query_rxphystatus(struct ieee80211_hw *hw,
         else if (rf_rx_num != 0)
                 pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
                                                 total_rssi /= rf_rx_num));
-        /*HW antenna diversity*/
-        rtldm->fat_table.antsel_rx_keep_0 = p_phystrpt->ant_sel;
-        rtldm->fat_table.antsel_rx_keep_1 = p_phystrpt->ant_sel_b;
-        rtldm->fat_table.antsel_rx_keep_2 = p_phystrpt->antsel_rx_keep_2;
 }
 
 static void _rtl8723be_translate_rx_signal_stuff(struct ieee80211_hw *hw,
@@ -440,14 +391,14 @@ static void _rtl8723be_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         memcpy(pstatus->psaddr, psaddr, ETH_ALEN);
 
         packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
-             (!ether_addr_equal(mac->bssid, (fc & IEEE80211_FCTL_TODS) ?
-                                hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ?
-                                hdr->addr2 : hdr->addr3)) &&
-                                (!pstatus->hwerror) &&
-                                (!pstatus->crc) && (!pstatus->icv));
+             (ether_addr_equal(mac->bssid, (fc & IEEE80211_FCTL_TODS) ?
+                                  hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ?
+                                  hdr->addr2 : hdr->addr3)) &&
+                                  (!pstatus->hwerror) &&
+                                  (!pstatus->crc) && (!pstatus->icv));
 
         packet_toself = packet_matchbssid &&
-            (!ether_addr_equal(praddr, rtlefuse->dev_addr));
+            (ether_addr_equal(praddr, rtlefuse->dev_addr));
 
         /* YP: packet_beacon is not initialized,
          * this assignment is neccesary,
@@ -531,30 +482,33 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
         struct ieee80211_hdr *hdr;
 
         u32 phystatus = GET_RX_DESC_PHYST(pdesc);
-        status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);
-        if (status->packet_report_type == TX_REPORT2)
-                status->length = (u16) GET_RX_RPT2_DESC_PKT_LEN(pdesc);
-        else
-                status->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
-        status->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
+
+        status->length = (u16)GET_RX_DESC_PKT_LEN(pdesc);
+        status->rx_drvinfo_size = (u8)GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
                                   RX_DRV_INFO_SIZE_UNIT;
-        status->rx_bufshift = (u8) (GET_RX_DESC_SHIFT(pdesc) & 0x03);
+        status->rx_bufshift = (u8)(GET_RX_DESC_SHIFT(pdesc) & 0x03);
         status->icv = (u16) GET_RX_DESC_ICV(pdesc);
         status->crc = (u16) GET_RX_DESC_CRC32(pdesc);
         status->hwerror = (status->crc | status->icv);
         status->decrypted = !GET_RX_DESC_SWDEC(pdesc);
-        status->rate = (u8) GET_RX_DESC_RXMCS(pdesc);
-        status->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);
-        status->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);
-        status->isfirst_ampdu = (bool) (GET_RX_DESC_PAGGR(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->rate = (u8)GET_RX_DESC_RXMCS(pdesc);
+        status->shortpreamble = (u16)GET_RX_DESC_SPLCP(pdesc);
+        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->bandwidth = (u8)GET_RX_DESC_BW(pdesc);
+        status->macid = GET_RX_DESC_MACID(pdesc);
         status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
 
-        status->is_cck = RTL8723E_RX_HAL_IS_CCK_RATE(status->rate);
+        status->is_cck = RX_HAL_IS_CCK_RATE(status->rate);
+
+        if (GET_RX_STATUS_DESC_RPT_SEL(pdesc))
+                status->packet_report_type = C2H_PACKET;
+        else
+                status->packet_report_type = NORMAL_RX;
+
 
-        status->macid = GET_RX_DESC_MACID(pdesc);
         if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
                 status->wake_match = BIT(2);
         else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
@@ -565,12 +519,11 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
                 status->wake_match = 0;
         if (status->wake_match)
                 RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,
-                         "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",
-                         status->wake_match);
+                "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",
+                status->wake_match);
         rx_status->freq = hw->conf.chandef.chan->center_freq;
         rx_status->band = hw->conf.chandef.chan->band;
 
-
         hdr = (struct ieee80211_hdr *)(skb->data + status->rx_drvinfo_size +
                                        status->rx_bufshift);
 
@@ -594,24 +547,16 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (status->decrypted) {
-                if (!hdr) {
-                        WARN_ON_ONCE(true);
-                        pr_err("decrypted is true but hdr NULL in skb %p\n",
-                               rtl_get_hdr(skb));
-                        return false;
-                }
-
-                if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
+                if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
-                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
-                else
                         rx_status->flag |= RX_FLAG_DECRYPTED;
+                else
+                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
         }
 
         /* rate_idx: index of data rate into band's
          * supported rates or MCS index if HT rates
          * are use (RX_FLAG_HT)
-         * Notice: this is diff with windows define
          */
         rx_status->rate_idx = _rtl8723be_rate_mapping(hw, status->is_ht,
                                                       status->rate);
@@ -624,21 +569,19 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
                 _rtl8723be_translate_rx_signal_stuff(hw, skb, status,
                                                      pdesc, p_drvinfo);
         }
-
-        /*rx_status->qual = status->signal; */
         rx_status->signal = status->recvsignalpower + 10;
         if (status->packet_report_type == TX_REPORT2) {
                 status->macid_valid_entry[0] =
-                         GET_RX_RPT2_DESC_MACID_VALID_1(pdesc);
+                  GET_RX_RPT2_DESC_MACID_VALID_1(pdesc);
                 status->macid_valid_entry[1] =
-                         GET_RX_RPT2_DESC_MACID_VALID_2(pdesc);
+                  GET_RX_RPT2_DESC_MACID_VALID_2(pdesc);
         }
         return true;
 }
 
 void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                             struct ieee80211_hdr *hdr, u8 *pdesc_tx,
-                            u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
+                            u8 *txbd, struct ieee80211_tx_info *info,
                             struct ieee80211_sta *sta, struct sk_buff *skb,
                             u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)
 {
@@ -646,16 +589,16 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        u8 *pdesc = pdesc_tx;
+        u8 *pdesc = (u8 *)pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         unsigned int buf_len = 0;
         unsigned int skb_len = skb->len;
         u8 fw_qsel = _rtl8723be_map_hwqueue_to_fwqueue(skb, hw_queue);
         bool firstseg = ((hdr->seq_ctrl &
-                          cpu_to_le16(IEEE80211_SCTL_FRAG)) == 0);
+                            cpu_to_le16(IEEE80211_SCTL_FRAG)) == 0);
         bool lastseg = ((hdr->frame_control &
-                         cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
+                           cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
         dma_addr_t mapping;
         u8 bw_40 = 0;
         u8 short_gi = 0;
@@ -732,11 +675,11 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                          (ptcb_desc->rts_use_shortpreamble ? 1 : 0) :
                          (ptcb_desc->rts_use_shortgi ? 1 : 0)));
 
-                if (ptcb_desc->btx_enable_sw_calc_duration)
+                if (ptcb_desc->tx_enable_sw_calc_duration)
                         SET_TX_DESC_NAV_USE_HDR(pdesc, 1);
 
                 if (bw_40) {
-                        if (ptcb_desc->packet_bw) {
+                        if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) {
                                 SET_TX_DESC_DATA_BW(pdesc, 1);
                                 SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);
                         } else {
@@ -776,9 +719,12 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
                 SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);
                 SET_TX_DESC_DISABLE_FB(pdesc, ptcb_desc->disable_ratefallback ?
-                                       1 : 0);
+                                              1 : 0);
                 SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
 
+                /* Set TxRate and RTSRate in TxDesc  */
+                /* This prevent Tx initial rate of new-coming packets */
+                /* from being overwritten by retried  packet rate.*/
                 if (ieee80211_is_data_qos(fc)) {
                         if (mac->rdg_en) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
@@ -793,9 +739,14 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
         SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
         SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) buf_len);
         SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
-        SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
-        SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
-
+        /* if (rtlpriv->dm.useramask) { */
+        if (1) {
+                SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
+        } else {
+                SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
+        }
         if (!ieee80211_is_data_qos(fc))  {
                 SET_TX_DESC_HWSEQ_EN(pdesc, 1);
                 SET_TX_DESC_HWSEQ_SEL(pdesc, 0);
@@ -805,11 +756,12 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
             is_broadcast_ether_addr(ieee80211_get_DA(hdr))) {
                 SET_TX_DESC_BMC(pdesc, 1);
         }
+
         RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
-                               bool b_firstseg, bool b_lastseg,
+                               bool firstseg, bool lastseg,
                                struct sk_buff *skb)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -849,16 +801,19 @@ void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
 
         SET_TX_DESC_OWN(pdesc, 1);
 
-        SET_TX_DESC_PKT_SIZE(pdesc, (u16)(skb->len));
+        SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
 
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
 
         SET_TX_DESC_USE_RATE(pdesc, 1);
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
+                      "H2C Tx Cmd Content\n", pdesc, TX_DESC_SIZE);
 }
 
-void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
-                        u8 desc_name, u8 *val)
+void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
+                        bool istx, u8 desc_name, u8 *val)
 {
         if (istx) {
                 switch (desc_name) {
@@ -870,7 +825,7 @@ void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
                         break;
                 default:
                         RT_ASSERT(false, "ERR txdesc :%d not process\n",
-                                  desc_name);
+                                          desc_name);
                         break;
                 }
         } else {
@@ -889,7 +844,7 @@ void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
                         break;
                 default:
                         RT_ASSERT(false, "ERR rxdesc :%d not process\n",
-                                  desc_name);
+                                          desc_name);
                         break;
                 }
         }
@@ -909,7 +864,7 @@ u32 rtl8723be_get_desc(u8 *pdesc, bool istx, u8 desc_name)
                         break;
                 default:
                         RT_ASSERT(false, "ERR txdesc :%d not process\n",
-                                  desc_name);
+                                          desc_name);
                         break;
                 }
         } else {
@@ -920,6 +875,9 @@ u32 rtl8723be_get_desc(u8 *pdesc, bool istx, u8 desc_name)
                 case HW_DESC_RXPKT_LEN:
                         ret = GET_RX_DESC_PKT_LEN(pdesc);
                         break;
+                case HW_DESC_RXBUFF_ADDR:
+                        ret = GET_RX_DESC_BUFF_ADDR(pdesc);
+                        break;
                 default:
                         RT_ASSERT(false, "ERR rxdesc :%d not process\n",
                                   desc_name);
@@ -935,16 +893,15 @@ bool rtl8723be_is_tx_desc_closed(struct ieee80211_hw *hw,
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue];
         u8 *entry = (u8 *)(&ring->desc[ring->idx]);
-        u8 own = (u8) rtl8723be_get_desc(entry, true, HW_DESC_OWN);
+        u8 own = (u8)rtl8723be_get_desc(entry, true, HW_DESC_OWN);
 
         /*beacon packet will only use the first
-         *descriptor by default, and the own may not
+         *descriptor defautly,and the own may not
          *be cleared by the hardware
          */
         if (own)
                 return false;
-        else
-                return true;
+        return true;
 }
 
 void rtl8723be_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
@@ -957,3 +914,28 @@ void rtl8723be_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
                                BIT(0) << (hw_queue));
         }
 }
+
+u32 rtl8723be_rx_command_packet(struct ieee80211_hw *hw,
+                                struct rtl_stats status,
+                                struct sk_buff *skb)
+{
+        u32 result = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        switch (status.packet_report_type) {
+        case NORMAL_RX:
+                        result = 0;
+                        break;
+        case C2H_PACKET:
+                        rtl8723be_c2h_packet_handler(hw, skb->data,
+                                                     (u8)skb->len);
+                        result = 1;
+                        break;
+        default:
+                        RT_TRACE(rtlpriv, COMP_RECV, DBG_TRACE,
+                                 "No this packet type!!\n");
+                        break;
+        }
+
+        return result;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/trx.h b/drivers/net/wireless/rtlwifi/rtl8723be/trx.h
index 102f33dcc988..45949ac4854c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/trx.h
@@ -415,21 +415,25 @@ struct phy_status_rpt {
 } __packed;
 
 struct rx_fwinfo_8723be {
-        u8 gain_trsw[4];
+        u8 gain_trsw[2];
+        u16 chl_num:10;
+        u16 sub_chnl:4;
+        u16 r_rfmod:2;
         u8 pwdb_all;
         u8 cfosho[4];
         u8 cfotail[4];
         char rxevm[2];
-        char rxsnr[4];
+        char rxsnr[2];
+        u8 pcts_msk_rpt[2];
         u8 pdsnr[2];
         u8 csi_current[2];
-        u8 csi_target[2];
+        u8 rx_gain_c;
+        u8 rx_gain_d;
         u8 sigevm;
-        u8 max_ex_pwr;
-        u8 ex_intf_flag:1;
-        u8 sgi_en:1;
-        u8 rxsc:2;
-        u8 reserve:4;
+        u8 resvd_0;
+        u8 antidx_anta:3;
+        u8 antidx_antb:3;
+        u8 resvd_1:2;
 } __packed;
 
 struct tx_desc_8723be {
@@ -597,21 +601,25 @@ struct rx_desc_8723be {
 } __packed;
 
 void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
-                            struct ieee80211_hdr *hdr, u8 *pdesc,
-                            u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
+                            struct ieee80211_hdr *hdr,
+                            u8 *pdesc_tx, u8 *txbd,
+                            struct ieee80211_tx_info *info,
                             struct ieee80211_sta *sta, struct sk_buff *skb,
                             u8 hw_queue, struct rtl_tcb_desc *ptcb_desc);
 bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
                              struct rtl_stats *status,
                              struct ieee80211_rx_status *rx_status,
                              u8 *pdesc, struct sk_buff *skb);
-void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
-                        u8 desc_name, u8 *val);
+void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
+                        bool istx, u8 desc_name, u8 *val);
 u32 rtl8723be_get_desc(u8 *pdesc, bool istx, u8 desc_name);
 bool rtl8723be_is_tx_desc_closed(struct ieee80211_hw *hw,
                                  u8 hw_queue, u16 index);
 void rtl8723be_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
 void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
-                               bool b_firstseg, bool b_lastseg,
+                               bool firstseg, bool lastseg,
                                struct sk_buff *skb);
+u32 rtl8723be_rx_command_packet(struct ieee80211_hw *hw,
+                                struct rtl_stats status,
+                                struct sk_buff *skb);
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723com/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8723com/dm_common.c
index 4e254b72bf45..064340641913 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723com/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723com/dm_common.c
@@ -44,7 +44,6 @@ EXPORT_SYMBOL_GPL(rtl8723_dm_init_dynamic_txpower);
 void rtl8723_dm_init_edca_turbo(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-
         rtlpriv->dm.current_turbo_edca = false;
         rtlpriv->dm.is_any_nonbepkts = false;
         rtlpriv->dm.is_cur_rdlstate = false;
@@ -54,12 +53,13 @@ EXPORT_SYMBOL_GPL(rtl8723_dm_init_edca_turbo);
 void rtl8723_dm_init_dynamic_bb_powersaving(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ps_t *dm_pstable = &rtlpriv->dm_pstable;
 
-        rtlpriv->dm_pstable.pre_ccastate = CCA_MAX;
-        rtlpriv->dm_pstable.cur_ccasate = CCA_MAX;
-        rtlpriv->dm_pstable.pre_rfstate = RF_MAX;
-        rtlpriv->dm_pstable.cur_rfstate = RF_MAX;
-        rtlpriv->dm_pstable.rssi_val_min = 0;
-        rtlpriv->dm_pstable.initialize = 0;
+        dm_pstable->pre_ccastate = CCA_MAX;
+        dm_pstable->cur_ccasate = CCA_MAX;
+        dm_pstable->pre_rfstate = RF_MAX;
+        dm_pstable->cur_rfstate = RF_MAX;
+        dm_pstable->rssi_val_min = 0;
+        dm_pstable->initialize = 0;
 }
 EXPORT_SYMBOL_GPL(rtl8723_dm_init_dynamic_bb_powersaving);
diff --git a/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c
index 540278ff462b..dd698e7e9ace 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c
@@ -36,7 +36,8 @@ void rtl8723_enable_fw_download(struct ieee80211_hw *hw, bool enable)
 
         if (enable) {
                 tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
-                rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, tmp | 0x04);
+                rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1,
+                               tmp | 0x04);
 
                 tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL);
                 rtl_write_byte(rtlpriv, REG_MCUFWDL, tmp | 0x01);
@@ -95,7 +96,7 @@ void rtl8723_fw_page_write(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL_GPL(rtl8723_fw_page_write);
 
-static void rtl8723_fill_dummy(u8 *pfwbuf, u32 *pfwlen)
+void rtl8723_fill_dummy(u8 *pfwbuf, u32 *pfwlen)
 {
         u32 fwlen = *pfwlen;
         u8 remain = (u8) (fwlen % 4);
@@ -109,60 +110,64 @@ static void rtl8723_fill_dummy(u8 *pfwbuf, u32 *pfwlen)
         }
         *pfwlen = fwlen;
 }
+EXPORT_SYMBOL(rtl8723_fill_dummy);
 
 void rtl8723_write_fw(struct ieee80211_hw *hw,
                       enum version_8723e version,
-                      u8 *buffer, u32 size)
+                      u8 *buffer, u32 size, u8 max_page)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 *bufferptr = buffer;
-        u32 pagenums, remainsize;
+        u32 page_nums, remain_size;
         u32 page, offset;
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "FW size is %d bytes,\n", size);
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size);
 
         rtl8723_fill_dummy(bufferptr, &size);
 
-        pagenums = size / FW_8192C_PAGE_SIZE;
-        remainsize = size % FW_8192C_PAGE_SIZE;
+        page_nums = size / FW_8192C_PAGE_SIZE;
+        remain_size = size % FW_8192C_PAGE_SIZE;
 
-        if (pagenums > 8) {
+        if (page_nums > max_page) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "Page numbers should not greater then 8\n");
+                         "Page numbers should not greater than %d\n", max_page);
         }
-        for (page = 0; page < pagenums; page++) {
+        for (page = 0; page < page_nums; page++) {
                 offset = page * FW_8192C_PAGE_SIZE;
                 rtl8723_fw_page_write(hw, page, (bufferptr + offset),
                                       FW_8192C_PAGE_SIZE);
         }
-        if (remainsize) {
-                offset = pagenums * FW_8192C_PAGE_SIZE;
-                page = pagenums;
+
+        if (remain_size) {
+                offset = page_nums * FW_8192C_PAGE_SIZE;
+                page = page_nums;
                 rtl8723_fw_page_write(hw, page, (bufferptr + offset),
-                                      remainsize);
+                                      remain_size);
         }
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW write done.\n");
 }
 EXPORT_SYMBOL_GPL(rtl8723_write_fw);
 
 void rtl8723ae_firmware_selfreset(struct ieee80211_hw *hw)
 {
-        u8 u1tmp;
+        u8 u1b_tmp;
         u8 delay = 100;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         rtl_write_byte(rtlpriv, REG_HMETFR + 3, 0x20);
-        u1tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
 
-        while (u1tmp & BIT(2)) {
+        while (u1b_tmp & BIT(2)) {
                 delay--;
                 if (delay == 0)
                         break;
                 udelay(50);
-                u1tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
         }
         if (delay == 0) {
-                u1tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
-                rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, u1tmp&(~BIT(2)));
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+                rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1,
+                               u1b_tmp&(~BIT(2)));
         }
 }
 EXPORT_SYMBOL_GPL(rtl8723ae_firmware_selfreset);
@@ -190,7 +195,8 @@ void rtl8723be_firmware_selfreset(struct ieee80211_hw *hw)
 }
 EXPORT_SYMBOL_GPL(rtl8723be_firmware_selfreset);
 
-int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be)
+int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be,
+                          int max_count)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         int err = -EIO;
@@ -199,10 +205,10 @@ int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be)
 
         do {
                 value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
-        } while ((counter++ < FW_8192C_POLLING_TIMEOUT_COUNT) &&
+        } while ((counter++ < max_count) &&
                  (!(value32 & FWDL_CHKSUM_RPT)));
 
-        if (counter >= FW_8192C_POLLING_TIMEOUT_COUNT) {
+        if (counter >= max_count) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "chksum report fail ! REG_MCUFWDL:0x%08x .\n",
                          value32);
@@ -223,15 +229,15 @@ int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be)
                 value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
                 if (value32 & WINTINI_RDY) {
                         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                                 "Polling FW ready success!! "
-                                 "REG_MCUFWDL:0x%08x .\n",
+                                 "Polling FW ready success!! REG_MCUFWDL:0x%08x .\n",
                                  value32);
                         err = 0;
                         goto exit;
                 }
-                udelay(FW_8192C_POLLING_DELAY);
 
-        } while (counter++ < FW_8192C_POLLING_TIMEOUT_COUNT);
+                mdelay(FW_8192C_POLLING_DELAY);
+
+        } while (counter++ < max_count);
 
         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                  "Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n",
@@ -243,51 +249,55 @@ exit:
 EXPORT_SYMBOL_GPL(rtl8723_fw_free_to_go);
 
 int rtl8723_download_fw(struct ieee80211_hw *hw,
-                        bool is_8723be)
+                        bool is_8723be, int max_count)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl92c_firmware_header *pfwheader;
+        struct rtl8723e_firmware_header *pfwheader;
         u8 *pfwdata;
         u32 fwsize;
         int err;
         enum version_8723e version = rtlhal->version;
+        int max_page;
 
         if (!rtlhal->pfirmware)
                 return 1;
 
-        pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
+        pfwheader = (struct rtl8723e_firmware_header *)rtlhal->pfirmware;
         pfwdata = rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
-        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                 "normal Firmware SIZE %d\n", fwsize);
 
+        if (!is_8723be)
+                max_page = 6;
+        else
+                max_page = 8;
         if (rtlpriv->cfg->ops->is_fw_header(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
                          "Firmware Version(%d), Signature(%#x), Size(%d)\n",
                          pfwheader->version, pfwheader->signature,
-                         (int)sizeof(struct rtl92c_firmware_header));
+                         (int)sizeof(struct rtl8723e_firmware_header));
 
-                pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
-                fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
+                pfwdata = pfwdata + sizeof(struct rtl8723e_firmware_header);
+                fwsize = fwsize - sizeof(struct rtl8723e_firmware_header);
         }
-        if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) {
-                rtl_write_byte(rtlpriv, REG_MCUFWDL, 0);
+
+        if (rtl_read_byte(rtlpriv, REG_MCUFWDL)&BIT(7)) {
                 if (is_8723be)
                         rtl8723be_firmware_selfreset(hw);
                 else
                         rtl8723ae_firmware_selfreset(hw);
+                rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
         }
         rtl8723_enable_fw_download(hw, true);
-        rtl8723_write_fw(hw, version, pfwdata, fwsize);
+        rtl8723_write_fw(hw, version, pfwdata, fwsize, max_page);
         rtl8723_enable_fw_download(hw, false);
 
-        err = rtl8723_fw_free_to_go(hw, is_8723be);
+        err = rtl8723_fw_free_to_go(hw, is_8723be, max_count);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Firmware is not ready to run!\n");
         } else {
-                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
                          "Firmware is ready to run!\n");
         }
         return 0;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.h b/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.h
index cf1cc5804d06..3ebafc80972f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.h
@@ -30,7 +30,8 @@
 #define REG_MCUFWDL                             0x0080
 #define FW_8192C_START_ADDRESS                  0x1000
 #define FW_8192C_PAGE_SIZE                      4096
-#define FW_8192C_POLLING_TIMEOUT_COUNT          6000
+#define FW_8723A_POLLING_TIMEOUT_COUNT          1000
+#define FW_8723B_POLLING_TIMEOUT_COUNT          6000
 #define FW_8192C_POLLING_DELAY                  5
 
 #define MCUFWDL_RDY                             BIT(1)
@@ -49,16 +50,23 @@ enum version_8723e {
         VERSION_UNKNOWN = 0xFF,
 };
 
-enum rtl8723ae_h2c_cmd {
-        H2C_AP_OFFLOAD = 0,
-        H2C_SETPWRMODE = 1,
-        H2C_JOINBSSRPT = 2,
-        H2C_RSVDPAGE = 3,
-        H2C_RSSI_REPORT = 4,
-        H2C_P2P_PS_CTW_CMD = 5,
-        H2C_P2P_PS_OFFLOAD = 6,
-        H2C_RA_MASK = 7,
-        MAX_H2CCMD
+struct rtl8723e_firmware_header {
+        u16 signature;
+        u8 category;
+        u8 function;
+        u16 version;
+        u8 subversion;
+        u8 rsvd1;
+        u8 month;
+        u8 date;
+        u8 hour;
+        u8 minute;
+        u16 ramcodesize;
+        u16 rsvd2;
+        u32 svnindex;
+        u32 rsvd3;
+        u32 rsvd4;
+        u32 rsvd5;
 };
 
 enum rtl8723be_cmd {
@@ -92,25 +100,6 @@ enum rtl8723be_cmd {
         MAX_8723BE_H2CCMD
 };
 
-struct rtl92c_firmware_header {
-        u16 signature;
-        u8 category;
-        u8 function;
-        u16 version;
-        u8 subversion;
-        u8 rsvd1;
-        u8 month;
-        u8 date;
-        u8 hour;
-        u8 minute;
-        u16 ramcodesize;
-        u16 rsvd2;
-        u32 svnindex;
-        u32 rsvd3;
-        u32 rsvd4;
-        u32 rsvd5;
-};
-
 void rtl8723ae_firmware_selfreset(struct ieee80211_hw *hw);
 void rtl8723be_firmware_selfreset(struct ieee80211_hw *hw);
 void rtl8723_enable_fw_download(struct ieee80211_hw *hw, bool enable);
@@ -120,7 +109,11 @@ void rtl8723_fw_page_write(struct ieee80211_hw *hw,
                            u32 page, const u8 *buffer, u32 size);
 void rtl8723_write_fw(struct ieee80211_hw *hw,
                       enum version_8723e version,
-                      u8 *buffer, u32 size);
-int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be);
-int rtl8723_download_fw(struct ieee80211_hw *hw, bool is_8723be);
+                      u8 *buffer, u32 size, u8 max_page);
+int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be, int count);
+int rtl8723_download_fw(struct ieee80211_hw *hw, bool is_8723be, int count);
+bool rtl8723_cmd_send_packet(struct ieee80211_hw *hw,
+                             struct sk_buff *skb);
+void rtl8723_fill_dummy(u8 *pfwbuf, u32 *pfwlen);
+
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8723com/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8723com/phy_common.c
index d73b659bd2b5..75cbd1509b52 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723com/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723com/phy_common.c
@@ -43,9 +43,8 @@ u32 rtl8723_phy_query_bb_reg(struct ieee80211_hw *hw,
         returnvalue = (originalvalue & bitmask) >> bitshift;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 "BBR MASK = 0x%x Addr[0x%x]= 0x%x\n",
-                  bitmask, regaddr, originalvalue);
-
+                 "BBR MASK=0x%x Addr[0x%x]=0x%x\n", bitmask,
+                 regaddr, originalvalue);
         return returnvalue;
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_query_bb_reg);
@@ -57,8 +56,8 @@ void rtl8723_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr,
         u32 originalvalue, bitshift;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
-                  regaddr, bitmask, data);
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n", regaddr, bitmask,
+                 data);
 
         if (bitmask != MASKDWORD) {
                 originalvalue = rtl_read_dword(rtlpriv, regaddr);
@@ -70,7 +69,7 @@ void rtl8723_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr,
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                  "regaddr(%#x), bitmask(%#x), data(%#x)\n",
-                  regaddr, bitmask, data);
+                 regaddr, bitmask, data);
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_set_bb_reg);
 
@@ -109,12 +108,15 @@ u32 rtl8723_phy_rf_serial_read(struct ieee80211_hw *hw,
         else
                 tmplong2 = rtl_get_bbreg(hw, pphyreg->rfhssi_para2, MASKDWORD);
         tmplong2 = (tmplong2 & (~BLSSIREADADDRESS)) |
-                   (newoffset << 23) | BLSSIREADEDGE;
+            (newoffset << 23) | BLSSIREADEDGE;
         rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
                       tmplong & (~BLSSIREADEDGE));
         mdelay(1);
         rtl_set_bbreg(hw, pphyreg->rfhssi_para2, MASKDWORD, tmplong2);
-        mdelay(2);
+        mdelay(1);
+        rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
+                      tmplong | BLSSIREADEDGE);
+        mdelay(1);
         if (rfpath == RF90_PATH_A)
                 rfpi_enable = (u8) rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
                                                  BIT(8));
@@ -128,8 +130,8 @@ u32 rtl8723_phy_rf_serial_read(struct ieee80211_hw *hw,
                 retvalue = rtl_get_bbreg(hw, pphyreg->rf_rb,
                                          BLSSIREADBACKDATA);
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 "RFR-%d Addr[0x%x]= 0x%x\n",
-                  rfpath, pphyreg->rf_rb, retvalue);
+                 "RFR-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf_rb, retvalue);
         return retvalue;
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_rf_serial_read);
@@ -153,8 +155,9 @@ void rtl8723_phy_rf_serial_write(struct ieee80211_hw *hw,
         data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
         rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 "RFW-%d Addr[0x%x]= 0x%x\n", rfpath,
-                   pphyreg->rf3wire_offset, data_and_addr);
+                 "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset,
+                 data_and_addr);
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_rf_serial_write);
 
@@ -171,6 +174,8 @@ long rtl8723_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
                 break;
         case WIRELESS_MODE_G:
         case WIRELESS_MODE_N_24G:
+                offset = -8;
+                break;
         default:
                 offset = -8;
                 break;
@@ -202,14 +207,14 @@ void rtl8723_phy_init_bb_rf_reg_def(struct ieee80211_hw *hw)
         rtlphy->phyreg_def[RF90_PATH_B].rfintfe = RFPGA0_XB_RFINTERFACEOE;
 
         rtlphy->phyreg_def[RF90_PATH_A].rf3wire_offset =
-                            RFPGA0_XA_LSSIPARAMETER;
+            RFPGA0_XA_LSSIPARAMETER;
         rtlphy->phyreg_def[RF90_PATH_B].rf3wire_offset =
-                            RFPGA0_XB_LSSIPARAMETER;
+            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;
@@ -264,6 +269,7 @@ void rtl8723_phy_init_bb_rf_reg_def(struct ieee80211_hw *hw)
 
         rtlphy->phyreg_def[RF90_PATH_A].rf_rbpi = TRANSCEIVEA_HSPI_READBACK;
         rtlphy->phyreg_def[RF90_PATH_B].rf_rbpi = TRANSCEIVEB_HSPI_READBACK;
+
 }
 EXPORT_SYMBOL_GPL(rtl8723_phy_init_bb_rf_reg_def);
 
@@ -384,14 +390,21 @@ EXPORT_SYMBOL_GPL(rtl8723_phy_reload_mac_registers);
 void rtl8723_phy_path_adda_on(struct ieee80211_hw *hw, u32 *addareg,
                               bool is_patha_on, bool is2t)
 {
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 pathon;
         u32 i;
 
-        pathon = is_patha_on ? 0x04db25a4 : 0x0b1b25a4;
-        if (!is2t) {
-                pathon = 0x0bdb25a0;
-                rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0b1b25a0);
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8723AE) {
+                pathon = is_patha_on ? 0x04db25a4 : 0x0b1b25a4;
+                if (!is2t) {
+                        pathon = 0x0bdb25a0;
+                        rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0b1b25a0);
+                } else {
+                        rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathon);
+                }
         } else {
+                /* rtl8723be */
+                pathon = 0x01c00014;
                 rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathon);
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/Makefile b/drivers/net/wireless/rtlwifi/rtl8821ae/Makefile
new file mode 100644
index 000000000000..87ad604a1eb3
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/Makefile
@@ -0,0 +1,19 @@
+obj-m := rtl8821ae.o
+
+
+rtl8821ae-objs :=               \
+                dm.o            \
+                fw.o            \
+                hw.o            \
+                led.o           \
+                phy.o           \
+                pwrseq.o        \
+                rf.o            \
+                sw.o            \
+                table.o         \
+                trx.o           \
+
+
+obj-$(CONFIG_RTL8821AE) += rtl8821ae.o
+
+ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/def.h b/drivers/net/wireless/rtlwifi/rtl8821ae/def.h
new file mode 100644
index 000000000000..a730985ae81d
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/def.h
@@ -0,0 +1,450 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_DEF_H__
+#define __RTL8821AE_DEF_H__
+
+/*--------------------------Define -------------------------------------------*/
+#define USE_SPECIFIC_FW_TO_SUPPORT_WOWLAN       1
+
+/* BIT 7 HT Rate*/
+/*TxHT = 0*/
+#define MGN_1M                          0x02
+#define MGN_2M                          0x04
+#define MGN_5_5M                        0x0b
+#define MGN_11M                         0x16
+
+#define MGN_6M                          0x0c
+#define MGN_9M                          0x12
+#define MGN_12M                         0x18
+#define MGN_18M                         0x24
+#define MGN_24M                         0x30
+#define MGN_36M                         0x48
+#define MGN_48M                         0x60
+#define MGN_54M                         0x6c
+
+/* TxHT = 1 */
+#define MGN_MCS0                        0x80
+#define MGN_MCS1                        0x81
+#define MGN_MCS2                        0x82
+#define MGN_MCS3                        0x83
+#define MGN_MCS4                        0x84
+#define MGN_MCS5                        0x85
+#define MGN_MCS6                        0x86
+#define MGN_MCS7                        0x87
+#define MGN_MCS8                        0x88
+#define MGN_MCS9                        0x89
+#define MGN_MCS10                       0x8a
+#define MGN_MCS11                       0x8b
+#define MGN_MCS12                       0x8c
+#define MGN_MCS13                       0x8d
+#define MGN_MCS14                       0x8e
+#define MGN_MCS15                       0x8f
+/* VHT rate */
+#define MGN_VHT1SS_MCS0         0x90
+#define MGN_VHT1SS_MCS1         0x91
+#define MGN_VHT1SS_MCS2         0x92
+#define MGN_VHT1SS_MCS3         0x93
+#define MGN_VHT1SS_MCS4         0x94
+#define MGN_VHT1SS_MCS5         0x95
+#define MGN_VHT1SS_MCS6         0x96
+#define MGN_VHT1SS_MCS7         0x97
+#define MGN_VHT1SS_MCS8         0x98
+#define MGN_VHT1SS_MCS9         0x99
+#define MGN_VHT2SS_MCS0         0x9a
+#define MGN_VHT2SS_MCS1         0x9b
+#define MGN_VHT2SS_MCS2         0x9c
+#define MGN_VHT2SS_MCS3         0x9d
+#define MGN_VHT2SS_MCS4         0x9e
+#define MGN_VHT2SS_MCS5         0x9f
+#define MGN_VHT2SS_MCS6         0xa0
+#define MGN_VHT2SS_MCS7         0xa1
+#define MGN_VHT2SS_MCS8         0xa2
+#define MGN_VHT2SS_MCS9         0xa3
+
+#define MGN_VHT3SS_MCS0         0xa4
+#define MGN_VHT3SS_MCS1         0xa5
+#define MGN_VHT3SS_MCS2         0xa6
+#define MGN_VHT3SS_MCS3         0xa7
+#define MGN_VHT3SS_MCS4         0xa8
+#define MGN_VHT3SS_MCS5         0xa9
+#define MGN_VHT3SS_MCS6         0xaa
+#define MGN_VHT3SS_MCS7         0xab
+#define MGN_VHT3SS_MCS8         0xac
+#define MGN_VHT3SS_MCS9         0xad
+
+#define MGN_MCS0_SG                     0xc0
+#define MGN_MCS1_SG                     0xc1
+#define MGN_MCS2_SG                     0xc2
+#define MGN_MCS3_SG                     0xc3
+#define MGN_MCS4_SG                     0xc4
+#define MGN_MCS5_SG                     0xc5
+#define MGN_MCS6_SG                     0xc6
+#define MGN_MCS7_SG                     0xc7
+#define MGN_MCS8_SG                     0xc8
+#define MGN_MCS9_SG                     0xc9
+#define MGN_MCS10_SG            0xca
+#define MGN_MCS11_SG            0xcb
+#define MGN_MCS12_SG            0xcc
+#define MGN_MCS13_SG            0xcd
+#define MGN_MCS14_SG            0xce
+#define MGN_MCS15_SG            0xcf
+
+#define MGN_UNKNOWN                     0xff
+
+/* 30 ms */
+#define WIFI_NAV_UPPER_US                               30000
+#define HAL_92C_NAV_UPPER_UNIT                  128
+
+#define HAL_RETRY_LIMIT_INFRA                           48
+#define HAL_RETRY_LIMIT_AP_ADHOC                        7
+
+#define RESET_DELAY_8185                                        20
+
+#define RT_IBSS_INT_MASKS       (IMR_BCNINT | IMR_TBDOK | IMR_TBDER)
+#define RT_AC_INT_MASKS         (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK)
+
+#define NUM_OF_FIRMWARE_QUEUE                           10
+#define NUM_OF_PAGES_IN_FW                                      0x100
+#define NUM_OF_PAGE_IN_FW_QUEUE_BK                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_BE                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_VI                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_VO                      0x07
+#define NUM_OF_PAGE_IN_FW_QUEUE_HCCA            0x0
+#define NUM_OF_PAGE_IN_FW_QUEUE_CMD                     0x0
+#define NUM_OF_PAGE_IN_FW_QUEUE_MGNT            0x02
+#define NUM_OF_PAGE_IN_FW_QUEUE_HIGH            0x02
+#define NUM_OF_PAGE_IN_FW_QUEUE_BCN                     0x2
+#define NUM_OF_PAGE_IN_FW_QUEUE_PUB                     0xA1
+
+#define NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM          0x026
+#define NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM          0x048
+#define NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM          0x048
+#define NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM          0x026
+#define NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM         0x00
+
+#define MAX_RX_DMA_BUFFER_SIZE                          0x3E80
+
+#define MAX_LINES_HWCONFIG_TXT                          1000
+#define MAX_BYTES_LINE_HWCONFIG_TXT                     256
+
+#define SW_THREE_WIRE                                           0
+#define HW_THREE_WIRE                                           2
+
+#define BT_DEMO_BOARD                                           0
+#define BT_QA_BOARD                                                     1
+#define BT_FPGA                                                         2
+
+#define HAL_PRIME_CHNL_OFFSET_DONT_CARE         0
+#define HAL_PRIME_CHNL_OFFSET_LOWER                     1
+#define HAL_PRIME_CHNL_OFFSET_UPPER                     2
+
+#define MAX_H2C_QUEUE_NUM                                       10
+
+#define RX_MPDU_QUEUE                                           0
+#define RX_CMD_QUEUE                                            1
+#define RX_MAX_QUEUE                                            2
+#define AC2QUEUEID(_AC)                                         (_AC)
+
+#define MAX_RX_DMA_BUFFER_SIZE_8812     0x3E80
+
+#define C2H_RX_CMD_HDR_LEN                                      8
+#define GET_C2H_CMD_CMD_LEN(__prxhdr)           \
+        LE_BITS_TO_4BYTE((__prxhdr), 0, 16)
+#define GET_C2H_CMD_ELEMENT_ID(__prxhdr)        \
+        LE_BITS_TO_4BYTE((__prxhdr), 16, 8)
+#define GET_C2H_CMD_CMD_SEQ(__prxhdr)           \
+        LE_BITS_TO_4BYTE((__prxhdr), 24, 7)
+#define GET_C2H_CMD_CONTINUE(__prxhdr)          \
+        LE_BITS_TO_4BYTE((__prxhdr), 31, 1)
+#define GET_C2H_CMD_CONTENT(__prxhdr)           \
+        ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN)
+
+#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID(__pcmdfbhdr)    \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8)
+#define GET_C2H_CMD_FEEDBACK_CCX_LEN(__pcmdfbhdr)               \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8)
+#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT(__pcmdfbhdr)   \
+        LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16)
+#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID(__pcmdfbhdr)    \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5)
+#define GET_C2H_CMD_FEEDBACK_CCX_VALID(__pcmdfbhdr)             \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1)
+#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT(__pcmdfbhdr) \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5)
+#define GET_C2H_CMD_FEEDBACK_CCX_TOK(__pcmdfbhdr)               \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1)
+#define GET_C2H_CMD_FEEDBACK_CCX_QSEL(__pcmdfbhdr)              \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)
+#define GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)               \
+        LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)
+
+#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
+
+#define CHIP_8812                               BIT(2)
+#define CHIP_8821                               (BIT(0)|BIT(2))
+
+#define CHIP_8821A                              (BIT(0)|BIT(2))
+#define NORMAL_CHIP                             BIT(3)
+#define RF_TYPE_1T1R                            (~(BIT(4)|BIT(5)|BIT(6)))
+#define RF_TYPE_1T2R                            BIT(4)
+#define RF_TYPE_2T2R                            BIT(5)
+#define CHIP_VENDOR_UMC                         BIT(7)
+#define B_CUT_VERSION                           BIT(12)
+#define C_CUT_VERSION                           BIT(13)
+#define D_CUT_VERSION                           ((BIT(12)|BIT(13)))
+#define E_CUT_VERSION                           BIT(14)
+#define RF_RL_ID                        (BIT(31)|BIT(30)|BIT(29)|BIT(28))
+
+enum version_8821ae {
+        VERSION_TEST_CHIP_1T1R_8812 = 0x0004,
+        VERSION_TEST_CHIP_2T2R_8812 = 0x0024,
+        VERSION_NORMAL_TSMC_CHIP_1T1R_8812 = 0x100c,
+        VERSION_NORMAL_TSMC_CHIP_2T2R_8812 = 0x102c,
+        VERSION_NORMAL_TSMC_CHIP_1T1R_8812_C_CUT = 0x200c,
+        VERSION_NORMAL_TSMC_CHIP_2T2R_8812_C_CUT = 0x202c,
+        VERSION_TEST_CHIP_8821 = 0x0005,
+        VERSION_NORMAL_TSMC_CHIP_8821 = 0x000d,
+        VERSION_NORMAL_TSMC_CHIP_8821_B_CUT = 0x100d,
+        VERSION_UNKNOWN = 0xFF,
+};
+
+enum vht_data_sc {
+        VHT_DATA_SC_DONOT_CARE = 0,
+        VHT_DATA_SC_20_UPPER_OF_80MHZ = 1,
+        VHT_DATA_SC_20_LOWER_OF_80MHZ = 2,
+        VHT_DATA_SC_20_UPPERST_OF_80MHZ = 3,
+        VHT_DATA_SC_20_LOWEST_OF_80MHZ = 4,
+        VHT_DATA_SC_20_RECV1 = 5,
+        VHT_DATA_SC_20_RECV2 = 6,
+        VHT_DATA_SC_20_RECV3 = 7,
+        VHT_DATA_SC_20_RECV4 = 8,
+        VHT_DATA_SC_40_UPPER_OF_80MHZ = 9,
+        VHT_DATA_SC_40_LOWER_OF_80MHZ = 10,
+};
+
+/* MASK */
+#define IC_TYPE_MASK                    (BIT(0)|BIT(1)|BIT(2))
+#define CHIP_TYPE_MASK                  BIT(3)
+#define RF_TYPE_MASK                    (BIT(4)|BIT(5)|BIT(6))
+#define MANUFACTUER_MASK                BIT(7)
+#define ROM_VERSION_MASK                (BIT(11)|BIT(10)|BIT(9)|BIT(8))
+#define CUT_VERSION_MASK                (BIT(15)|BIT(14)|BIT(13)|BIT(12))
+
+/* Get element */
+#define GET_CVID_IC_TYPE(version)       ((version) & IC_TYPE_MASK)
+#define GET_CVID_CHIP_TYPE(version)     ((version) & CHIP_TYPE_MASK)
+#define GET_CVID_RF_TYPE(version)       ((version) & RF_TYPE_MASK)
+#define GET_CVID_MANUFACTUER(version)   ((version) & MANUFACTUER_MASK)
+#define GET_CVID_ROM_VERSION(version)   ((version) & ROM_VERSION_MASK)
+#define GET_CVID_CUT_VERSION(version)   ((version) & CUT_VERSION_MASK)
+
+#define IS_1T1R(version)        ((GET_CVID_RF_TYPE(version)) ? false : true)
+#define IS_1T2R(version)        ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R)\
+                                                        ? true : false)
+#define IS_2T2R(version)        ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R)\
+                                                        ? true : false)
+
+#define IS_8812_SERIES(version) ((GET_CVID_IC_TYPE(version) == CHIP_8812) ? \
+                                                                true : false)
+#define IS_8821_SERIES(version) ((GET_CVID_IC_TYPE(version) == CHIP_8821) ? \
+                                                                true : false)
+
+#define IS_VENDOR_8812A_TEST_CHIP(version)      ((IS_8812_SERIES(version)) ? \
+                                        ((IS_NORMAL_CHIP(version)) ? \
+                                                false : true) : false)
+#define IS_VENDOR_8812A_MP_CHIP(version)        ((IS_8812_SERIES(version)) ? \
+                                        ((IS_NORMAL_CHIP(version)) ? \
+                                                true : false) : false)
+#define IS_VENDOR_8812A_C_CUT(version)          ((IS_8812_SERIES(version)) ? \
+                                        ((GET_CVID_CUT_VERSION(version) == \
+                                        C_CUT_VERSION) ? \
+                                        true : false) : false)
+
+#define IS_VENDOR_8821A_TEST_CHIP(version)      ((IS_8821_SERIES(version)) ? \
+                                        ((IS_NORMAL_CHIP(version)) ? \
+                                        false : true) : false)
+#define IS_VENDOR_8821A_MP_CHIP(version)        ((IS_8821_SERIES(version)) ? \
+                                        ((IS_NORMAL_CHIP(version)) ? \
+                                                true : false) : false)
+#define IS_VENDOR_8821A_B_CUT(version)          ((IS_8821_SERIES(version)) ? \
+                                        ((GET_CVID_CUT_VERSION(version) == \
+                                        B_CUT_VERSION) ? \
+                                        true : false) : false)
+enum board_type {
+        ODM_BOARD_DEFAULT = 0,    /* The DEFAULT case. */
+        ODM_BOARD_MINICARD = BIT(0), /* 0 = non-mini card, 1 = mini card. */
+        ODM_BOARD_SLIM = BIT(1), /* 0 = non-slim card, 1 = slim card */
+        ODM_BOARD_BT = BIT(2), /* 0 = without BT card, 1 = with BT */
+        ODM_BOARD_EXT_PA = BIT(3), /* 1 = existing 2G ext-PA */
+        ODM_BOARD_EXT_LNA = BIT(4), /* 1 = existing 2G ext-LNA */
+        ODM_BOARD_EXT_TRSW = BIT(5), /* 1 = existing ext-TRSW */
+        ODM_BOARD_EXT_PA_5G = BIT(6), /* 1 = existing 5G ext-PA */
+        ODM_BOARD_EXT_LNA_5G = BIT(7), /* 1 = existing 5G ext-LNA */
+};
+
+enum rf_optype {
+        RF_OP_BY_SW_3WIRE = 0,
+        RF_OP_BY_FW,
+        RF_OP_MAX
+};
+
+enum rf_power_state {
+        RF_ON,
+        RF_OFF,
+        RF_SLEEP,
+        RF_SHUT_DOWN,
+};
+
+enum power_save_mode {
+        POWER_SAVE_MODE_ACTIVE,
+        POWER_SAVE_MODE_SAVE,
+};
+
+enum power_polocy_config {
+        POWERCFG_MAX_POWER_SAVINGS,
+        POWERCFG_GLOBAL_POWER_SAVINGS,
+        POWERCFG_LOCAL_POWER_SAVINGS,
+        POWERCFG_LENOVO,
+};
+
+enum interface_select_pci {
+        INTF_SEL1_MINICARD = 0,
+        INTF_SEL0_PCIE = 1,
+        INTF_SEL2_RSV = 2,
+        INTF_SEL3_RSV = 3,
+};
+
+enum hal_fw_c2h_cmd_id {
+        HAL_FW_C2H_CMD_READ_MACREG = 0,
+        HAL_FW_C2H_CMD_READ_BBREG = 1,
+        HAL_FW_C2H_CMD_READ_RFREG = 2,
+        HAL_FW_C2H_CMD_READ_EEPROM = 3,
+        HAL_FW_C2H_CMD_READ_EFUSE = 4,
+        HAL_FW_C2H_CMD_READ_CAM = 5,
+        HAL_FW_C2H_CMD_GET_BASICRATE = 6,
+        HAL_FW_C2H_CMD_GET_DATARATE = 7,
+        HAL_FW_C2H_CMD_SURVEY = 8,
+        HAL_FW_C2H_CMD_SURVEYDONE = 9,
+        HAL_FW_C2H_CMD_JOINBSS = 10,
+        HAL_FW_C2H_CMD_ADDSTA = 11,
+        HAL_FW_C2H_CMD_DELSTA = 12,
+        HAL_FW_C2H_CMD_ATIMDONE = 13,
+        HAL_FW_C2H_CMD_TX_REPORT = 14,
+        HAL_FW_C2H_CMD_CCX_REPORT = 15,
+        HAL_FW_C2H_CMD_DTM_REPORT = 16,
+        HAL_FW_C2H_CMD_TX_RATE_STATISTICS = 17,
+        HAL_FW_C2H_CMD_C2HLBK = 18,
+        HAL_FW_C2H_CMD_C2HDBG = 19,
+        HAL_FW_C2H_CMD_C2HFEEDBACK = 20,
+        HAL_FW_C2H_CMD_MAX
+};
+
+enum rtl_desc_qsel {
+        QSLT_BK = 0x2,
+        QSLT_BE = 0x0,
+        QSLT_VI = 0x5,
+        QSLT_VO = 0x7,
+        QSLT_BEACON = 0x10,
+        QSLT_HIGH = 0x11,
+        QSLT_MGNT = 0x12,
+        QSLT_CMD = 0x13,
+};
+
+enum rtl_desc8821ae_rate {
+        DESC_RATE1M = 0x00,
+        DESC_RATE2M = 0x01,
+        DESC_RATE5_5M = 0x02,
+        DESC_RATE11M = 0x03,
+
+        DESC_RATE6M = 0x04,
+        DESC_RATE9M = 0x05,
+        DESC_RATE12M = 0x06,
+        DESC_RATE18M = 0x07,
+        DESC_RATE24M = 0x08,
+        DESC_RATE36M = 0x09,
+        DESC_RATE48M = 0x0a,
+        DESC_RATE54M = 0x0b,
+
+        DESC_RATEMCS0 = 0x0c,
+        DESC_RATEMCS1 = 0x0d,
+        DESC_RATEMCS2 = 0x0e,
+        DESC_RATEMCS3 = 0x0f,
+        DESC_RATEMCS4 = 0x10,
+        DESC_RATEMCS5 = 0x11,
+        DESC_RATEMCS6 = 0x12,
+        DESC_RATEMCS7 = 0x13,
+        DESC_RATEMCS8 = 0x14,
+        DESC_RATEMCS9 = 0x15,
+        DESC_RATEMCS10 = 0x16,
+        DESC_RATEMCS11 = 0x17,
+        DESC_RATEMCS12 = 0x18,
+        DESC_RATEMCS13 = 0x19,
+        DESC_RATEMCS14 = 0x1a,
+        DESC_RATEMCS15 = 0x1b,
+
+        DESC_RATEVHT1SS_MCS0 = 0x2c,
+        DESC_RATEVHT1SS_MCS1 = 0x2d,
+        DESC_RATEVHT1SS_MCS2 = 0x2e,
+        DESC_RATEVHT1SS_MCS3 = 0x2f,
+        DESC_RATEVHT1SS_MCS4 = 0x30,
+        DESC_RATEVHT1SS_MCS5 = 0x31,
+        DESC_RATEVHT1SS_MCS6 = 0x32,
+        DESC_RATEVHT1SS_MCS7 = 0x33,
+        DESC_RATEVHT1SS_MCS8 = 0x34,
+        DESC_RATEVHT1SS_MCS9 = 0x35,
+        DESC_RATEVHT2SS_MCS0 = 0x36,
+        DESC_RATEVHT2SS_MCS1 = 0x37,
+        DESC_RATEVHT2SS_MCS2 = 0x38,
+        DESC_RATEVHT2SS_MCS3 = 0x39,
+        DESC_RATEVHT2SS_MCS4 = 0x3a,
+        DESC_RATEVHT2SS_MCS5 = 0x3b,
+        DESC_RATEVHT2SS_MCS6 = 0x3c,
+        DESC_RATEVHT2SS_MCS7 = 0x3d,
+        DESC_RATEVHT2SS_MCS8 = 0x3e,
+        DESC_RATEVHT2SS_MCS9 = 0x3f,
+};
+
+enum rx_packet_type {
+        NORMAL_RX,
+        TX_REPORT1,
+        TX_REPORT2,
+        HIS_REPORT,
+        C2H_PACKET,
+};
+
+struct phy_sts_cck_8821ae_t {
+        u8 adc_pwdb_X[4];
+        u8 sq_rpt;
+        u8 cck_agc_rpt;
+};
+
+struct h2c_cmd_8821ae {
+        u8 element_id;
+        u32 cmd_len;
+        u8 *p_cmdbuffer;
+};
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
new file mode 100644
index 000000000000..9be106109921
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
@@ -0,0 +1,3019 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../base.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "fw.h"
+#include "trx.h"
+#include "../btcoexist/rtl_btc.h"
+
+static const u32 txscaling_tbl[TXSCALE_TABLE_SIZE] = {
+        0x081, /* 0, -12.0dB */
+        0x088, /* 1, -11.5dB */
+        0x090, /* 2, -11.0dB */
+        0x099, /* 3, -10.5dB */
+        0x0A2, /* 4, -10.0dB */
+        0x0AC, /* 5, -9.5dB */
+        0x0B6, /* 6, -9.0dB */
+        0x0C0, /* 7, -8.5dB */
+        0x0CC, /* 8, -8.0dB */
+        0x0D8, /* 9, -7.5dB */
+        0x0E5, /* 10, -7.0dB */
+        0x0F2, /* 11, -6.5dB */
+        0x101, /* 12, -6.0dB */
+        0x110, /* 13, -5.5dB */
+        0x120, /* 14, -5.0dB */
+        0x131, /* 15, -4.5dB */
+        0x143, /* 16, -4.0dB */
+        0x156, /* 17, -3.5dB */
+        0x16A, /* 18, -3.0dB */
+        0x180, /* 19, -2.5dB */
+        0x197, /* 20, -2.0dB */
+        0x1AF, /* 21, -1.5dB */
+        0x1C8, /* 22, -1.0dB */
+        0x1E3, /* 23, -0.5dB */
+        0x200, /* 24, +0  dB */
+        0x21E, /* 25, +0.5dB */
+        0x23E, /* 26, +1.0dB */
+        0x261, /* 27, +1.5dB */
+        0x285, /* 28, +2.0dB */
+        0x2AB, /* 29, +2.5dB */
+        0x2D3, /* 30, +3.0dB */
+        0x2FE, /* 31, +3.5dB */
+        0x32B, /* 32, +4.0dB */
+        0x35C, /* 33, +4.5dB */
+        0x38E, /* 34, +5.0dB */
+        0x3C4, /* 35, +5.5dB */
+        0x3FE  /* 36, +6.0dB */
+};
+
+static const u32 rtl8821ae_txscaling_table[TXSCALE_TABLE_SIZE] = {
+        0x081, /* 0, -12.0dB */
+        0x088, /* 1, -11.5dB */
+        0x090, /* 2, -11.0dB */
+        0x099, /* 3, -10.5dB */
+        0x0A2, /* 4, -10.0dB */
+        0x0AC, /* 5, -9.5dB */
+        0x0B6, /* 6, -9.0dB */
+        0x0C0, /* 7, -8.5dB */
+        0x0CC, /* 8, -8.0dB */
+        0x0D8, /* 9, -7.5dB */
+        0x0E5, /* 10, -7.0dB */
+        0x0F2, /* 11, -6.5dB */
+        0x101, /* 12, -6.0dB */
+        0x110, /* 13, -5.5dB */
+        0x120, /* 14, -5.0dB */
+        0x131, /* 15, -4.5dB */
+        0x143, /* 16, -4.0dB */
+        0x156, /* 17, -3.5dB */
+        0x16A, /* 18, -3.0dB */
+        0x180, /* 19, -2.5dB */
+        0x197, /* 20, -2.0dB */
+        0x1AF, /* 21, -1.5dB */
+        0x1C8, /* 22, -1.0dB */
+        0x1E3, /* 23, -0.5dB */
+        0x200, /* 24, +0  dB */
+        0x21E, /* 25, +0.5dB */
+        0x23E, /* 26, +1.0dB */
+        0x261, /* 27, +1.5dB */
+        0x285, /* 28, +2.0dB */
+        0x2AB, /* 29, +2.5dB */
+        0x2D3, /* 30, +3.0dB */
+        0x2FE, /* 31, +3.5dB */
+        0x32B, /* 32, +4.0dB */
+        0x35C, /* 33, +4.5dB */
+        0x38E, /* 34, +5.0dB */
+        0x3C4, /* 35, +5.5dB */
+        0x3FE  /* 36, +6.0dB */
+};
+
+static const u32 ofdmswing_table[] = {
+        0x0b40002d, /* 0, -15.0dB */
+        0x0c000030, /* 1, -14.5dB */
+        0x0cc00033, /* 2, -14.0dB */
+        0x0d800036, /* 3, -13.5dB */
+        0x0e400039, /* 4, -13.0dB */
+        0x0f00003c, /* 5, -12.5dB */
+        0x10000040, /* 6, -12.0dB */
+        0x11000044, /* 7, -11.5dB */
+        0x12000048, /* 8, -11.0dB */
+        0x1300004c, /* 9, -10.5dB */
+        0x14400051, /* 10, -10.0dB */
+        0x15800056, /* 11, -9.5dB */
+        0x16c0005b, /* 12, -9.0dB */
+        0x18000060, /* 13, -8.5dB */
+        0x19800066, /* 14, -8.0dB */
+        0x1b00006c, /* 15, -7.5dB */
+        0x1c800072, /* 16, -7.0dB */
+        0x1e400079, /* 17, -6.5dB */
+        0x20000080, /* 18, -6.0dB */
+        0x22000088, /* 19, -5.5dB */
+        0x24000090, /* 20, -5.0dB */
+        0x26000098, /* 21, -4.5dB */
+        0x288000a2, /* 22, -4.0dB */
+        0x2ac000ab, /* 23, -3.5dB */
+        0x2d4000b5, /* 24, -3.0dB */
+        0x300000c0, /* 25, -2.5dB */
+        0x32c000cb, /* 26, -2.0dB */
+        0x35c000d7, /* 27, -1.5dB */
+        0x390000e4, /* 28, -1.0dB */
+        0x3c8000f2, /* 29, -0.5dB */
+        0x40000100, /* 30, +0dB */
+        0x43c0010f, /* 31, +0.5dB */
+        0x47c0011f, /* 32, +1.0dB */
+        0x4c000130, /* 33, +1.5dB */
+        0x50800142, /* 34, +2.0dB */
+        0x55400155, /* 35, +2.5dB */
+        0x5a400169, /* 36, +3.0dB */
+        0x5fc0017f, /* 37, +3.5dB */
+        0x65400195, /* 38, +4.0dB */
+        0x6b8001ae, /* 39, +4.5dB */
+        0x71c001c7, /* 40, +5.0dB */
+        0x788001e2, /* 41, +5.5dB */
+        0x7f8001fe  /* 42, +6.0dB */
+};
+
+static const u8 cckswing_table_ch1ch13[CCK_TABLE_SIZE][8] = {
+        {0x09, 0x08, 0x07, 0x06, 0x04, 0x03, 0x01, 0x01}, /* 0, -16.0dB */
+        {0x09, 0x09, 0x08, 0x06, 0x05, 0x03, 0x01, 0x01}, /* 1, -15.5dB */
+        {0x0a, 0x09, 0x08, 0x07, 0x05, 0x03, 0x02, 0x01}, /* 2, -15.0dB */
+        {0x0a, 0x0a, 0x09, 0x07, 0x05, 0x03, 0x02, 0x01}, /* 3, -14.5dB */
+        {0x0b, 0x0a, 0x09, 0x08, 0x06, 0x04, 0x02, 0x01}, /* 4, -14.0dB */
+        {0x0b, 0x0b, 0x0a, 0x08, 0x06, 0x04, 0x02, 0x01}, /* 5, -13.5dB */
+        {0x0c, 0x0c, 0x0a, 0x09, 0x06, 0x04, 0x02, 0x01}, /* 6, -13.0dB */
+        {0x0d, 0x0c, 0x0b, 0x09, 0x07, 0x04, 0x02, 0x01}, /* 7, -12.5dB */
+        {0x0d, 0x0d, 0x0c, 0x0a, 0x07, 0x05, 0x02, 0x01}, /* 8, -12.0dB */
+        {0x0e, 0x0e, 0x0c, 0x0a, 0x08, 0x05, 0x02, 0x01}, /* 9, -11.5dB */
+        {0x0f, 0x0f, 0x0d, 0x0b, 0x08, 0x05, 0x03, 0x01}, /* 10, -11.0dB */
+        {0x10, 0x10, 0x0e, 0x0b, 0x08, 0x05, 0x03, 0x01}, /* 11, -10.5dB */
+        {0x11, 0x11, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01}, /* 12, -10.0dB */
+        {0x12, 0x12, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01}, /* 13, -9.5dB */
+        {0x13, 0x13, 0x10, 0x0d, 0x0a, 0x06, 0x03, 0x01}, /* 14, -9.0dB */
+        {0x14, 0x14, 0x11, 0x0e, 0x0b, 0x07, 0x03, 0x02}, /* 15, -8.5dB */
+        {0x16, 0x15, 0x12, 0x0f, 0x0b, 0x07, 0x04, 0x01}, /* 16, -8.0dB */
+        {0x17, 0x16, 0x13, 0x10, 0x0c, 0x08, 0x04, 0x02}, /* 17, -7.5dB */
+        {0x18, 0x17, 0x15, 0x11, 0x0c, 0x08, 0x04, 0x02}, /* 18, -7.0dB */
+        {0x1a, 0x19, 0x16, 0x12, 0x0d, 0x09, 0x04, 0x02}, /* 19, -6.5dB */
+        {0x1b, 0x1a, 0x17, 0x13, 0x0e, 0x09, 0x04, 0x02}, /* 20, -6.0dB */
+        {0x1d, 0x1c, 0x18, 0x14, 0x0f, 0x0a, 0x05, 0x02}, /* 21, -5.5dB */
+        {0x1f, 0x1e, 0x1a, 0x15, 0x10, 0x0a, 0x05, 0x02}, /* 22, -5.0dB */
+        {0x20, 0x20, 0x1b, 0x16, 0x11, 0x08, 0x05, 0x02}, /* 23, -4.5dB */
+        {0x22, 0x21, 0x1d, 0x18, 0x11, 0x0b, 0x06, 0x02}, /* 24, -4.0dB */
+        {0x24, 0x23, 0x1f, 0x19, 0x13, 0x0c, 0x06, 0x03}, /* 25, -3.5dB */
+        {0x26, 0x25, 0x21, 0x1b, 0x14, 0x0d, 0x06, 0x03}, /* 26, -3.0dB */
+        {0x28, 0x28, 0x22, 0x1c, 0x15, 0x0d, 0x07, 0x03}, /* 27, -2.5dB */
+        {0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03}, /* 28, -2.0dB */
+        {0x2d, 0x2d, 0x27, 0x1f, 0x18, 0x0f, 0x08, 0x03}, /* 29, -1.5dB */
+        {0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03}, /* 30, -1.0dB */
+        {0x33, 0x32, 0x2b, 0x23, 0x1a, 0x11, 0x08, 0x04}, /* 31, -0.5dB */
+        {0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04} /* 32, +0dB */
+};
+
+static const u8 cckswing_table_ch14[CCK_TABLE_SIZE][8] = {
+        {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00}, /* 0, -16.0dB */
+        {0x09, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 1, -15.5dB */
+        {0x0a, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 2, -15.0dB */
+        {0x0a, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 3, -14.5dB */
+        {0x0b, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 4, -14.0dB */
+        {0x0b, 0x0b, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 5, -13.5dB */
+        {0x0c, 0x0c, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 6, -13.0dB */
+        {0x0d, 0x0c, 0x0b, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 7, -12.5dB */
+        {0x0d, 0x0d, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00}, /* 8, -12.0dB */
+        {0x0e, 0x0e, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00}, /* 9, -11.5dB */
+        {0x0f, 0x0f, 0x0d, 0x08, 0x00, 0x00, 0x00, 0x00}, /* 10, -11.0dB */
+        {0x10, 0x10, 0x0e, 0x08, 0x00, 0x00, 0x00, 0x00}, /* 11, -10.5dB */
+        {0x11, 0x11, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, /* 12, -10.0dB */
+        {0x12, 0x12, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, /* 13, -9.5dB */
+        {0x13, 0x13, 0x10, 0x0a, 0x00, 0x00, 0x00, 0x00}, /* 14, -9.0dB */
+        {0x14, 0x14, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x00}, /* 15, -8.5dB */
+        {0x16, 0x15, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00}, /* 16, -8.0dB */
+        {0x17, 0x16, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x00}, /* 17, -7.5dB */
+        {0x18, 0x17, 0x15, 0x0c, 0x00, 0x00, 0x00, 0x00}, /* 18, -7.0dB */
+        {0x1a, 0x19, 0x16, 0x0d, 0x00, 0x00, 0x00, 0x00}, /* 19, -6.5dB */
+        {0x1b, 0x1a, 0x17, 0x0e, 0x00, 0x00, 0x00, 0x00}, /* 20, -6.0dB */
+        {0x1d, 0x1c, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00}, /* 21, -5.5dB */
+        {0x1f, 0x1e, 0x1a, 0x0f, 0x00, 0x00, 0x00, 0x00}, /* 22, -5.0dB */
+        {0x20, 0x20, 0x1b, 0x10, 0x00, 0x00, 0x00, 0x00}, /* 23, -4.5dB */
+        {0x22, 0x21, 0x1d, 0x11, 0x00, 0x00, 0x00, 0x00}, /* 24, -4.0dB */
+        {0x24, 0x23, 0x1f, 0x12, 0x00, 0x00, 0x00, 0x00}, /* 25, -3.5dB */
+        {0x26, 0x25, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00}, /* 26, -3.0dB */
+        {0x28, 0x28, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00}, /* 27, -2.5dB */
+        {0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00}, /* 28, -2.0dB */
+        {0x2d, 0x2d, 0x17, 0x17, 0x00, 0x00, 0x00, 0x00}, /* 29, -1.5dB */
+        {0x30, 0x2f, 0x29, 0x18, 0x00, 0x00, 0x00, 0x00}, /* 30, -1.0dB */
+        {0x33, 0x32, 0x2b, 0x19, 0x00, 0x00, 0x00, 0x00}, /* 31, -0.5dB */
+        {0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00} /* 32, +0dB */
+};
+
+static const u32 edca_setting_dl[PEER_MAX] = {
+        0xa44f,         /* 0 UNKNOWN */
+        0x5ea44f,       /* 1 REALTEK_90 */
+        0x5e4322,       /* 2 REALTEK_92SE */
+        0x5ea42b,               /* 3 BROAD      */
+        0xa44f,         /* 4 RAL */
+        0xa630,         /* 5 ATH */
+        0x5ea630,               /* 6 CISCO */
+        0x5ea42b,               /* 7 MARVELL */
+};
+
+static const u32 edca_setting_ul[PEER_MAX] = {
+        0x5e4322,       /* 0 UNKNOWN */
+        0xa44f,         /* 1 REALTEK_90 */
+        0x5ea44f,       /* 2 REALTEK_92SE */
+        0x5ea32b,       /* 3 BROAD */
+        0x5ea422,       /* 4 RAL */
+        0x5ea322,       /* 5 ATH */
+        0x3ea430,       /* 6 CISCO */
+        0x5ea44f,       /* 7 MARV */
+};
+
+static u8 rtl8818e_delta_swing_table_idx_24gb_p[] = {
+        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 4,
+        4, 4, 4, 5, 5, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9};
+
+static u8 rtl8818e_delta_swing_table_idx_24gb_n[] = {
+        0, 0, 0, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 6,
+        7, 7, 7, 7, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11};
+
+static u8 rtl8812ae_delta_swing_table_idx_24gb_n[]  = {
+        0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
+        6, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11};
+
+static u8 rtl8812ae_delta_swing_table_idx_24gb_p[] = {
+        0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
+        6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
+
+static u8 rtl8812ae_delta_swing_table_idx_24ga_n[] = {
+        0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
+        6, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11};
+
+static u8 rtl8812ae_delta_swing_table_idx_24ga_p[] = {
+        0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
+        6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
+
+static u8 rtl8812ae_delta_swing_table_idx_24gcckb_n[] = {
+        0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
+        6, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11};
+
+static u8 rtl8812ae_delta_swing_table_idx_24gcckb_p[] = {
+        0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
+        6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
+
+static u8 rtl8812ae_delta_swing_table_idx_24gccka_n[] = {
+        0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
+        6, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11};
+
+static u8 rtl8812ae_delta_swing_table_idx_24gccka_p[] = {
+        0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
+        6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
+
+static u8 rtl8812ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
+        {0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7,
+        7, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13},
+        {0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
+        7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 13, 13},
+        {0, 1, 1, 2, 3, 3, 4, 4, 5, 6, 6, 7, 8, 9, 10, 11,
+        12, 12, 13, 14, 14, 14, 15, 16, 17, 17, 17, 18, 18, 18},
+};
+
+static u8 rtl8812ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
+        {0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 8,
+        8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11},
+        {0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
+        8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11},
+        {0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 9,
+        9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11},
+};
+
+static u8 rtl8812ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
+        {0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
+        8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 13, 13, 13},
+        {0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 9,
+        9, 10, 10, 11, 11, 11, 12, 12, 12, 12, 12, 13, 13},
+        {0, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 8, 8, 9, 10, 11,
+        12, 13, 14, 14, 15, 15, 15, 16, 16, 16, 17, 17, 18, 18},
+};
+
+static u8 rtl8812ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
+        {0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 7, 7, 8,
+        8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11},
+        {0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
+        9, 9, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11},
+        {0, 1, 1, 2, 3, 3, 4, 4, 5, 6, 6, 7, 7, 8, 9, 9,
+        10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11},
+};
+
+static u8 rtl8821ae_delta_swing_table_idx_24gb_n[] = {
+        0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
+        6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
+
+static u8 rtl8821ae_delta_swing_table_idx_24gb_p[]  = {
+        0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
+        8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
+
+static u8 rtl8821ae_delta_swing_table_idx_24ga_n[]  = {
+        0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
+        6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
+
+static u8 rtl8821ae_delta_swing_table_idx_24ga_p[] = {
+        0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
+        8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
+
+static u8 rtl8821ae_delta_swing_table_idx_24gcckb_n[] = {
+        0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
+        6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
+
+static u8 rtl8821ae_delta_swing_table_idx_24gcckb_p[] = {
+        0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
+        8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
+
+static u8 rtl8821ae_delta_swing_table_idx_24gccka_n[] = {
+        0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
+        6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
+
+static u8 rtl8821ae_delta_swing_table_idx_24gccka_p[] = {
+        0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
+        8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
+
+static u8 rtl8821ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+};
+
+static u8 rtl8821ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+};
+
+static u8 rtl8821ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+};
+
+static u8 rtl8821ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+        {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
+        12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
+};
+
+void rtl8821ae_dm_txpower_track_adjust(struct ieee80211_hw *hw,
+                                       u8 type, u8 *pdirection,
+                                       u32 *poutwrite_val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        u8 pwr_val = 0;
+
+        if (type == 0) {
+                if (rtlpriv->dm.swing_idx_ofdm[RF90_PATH_A] <=
+                        rtlpriv->dm.swing_idx_ofdm_base[RF90_PATH_A]) {
+                        *pdirection = 1;
+                        pwr_val = rtldm->swing_idx_ofdm_base[RF90_PATH_A] -
+                                        rtldm->swing_idx_ofdm[RF90_PATH_A];
+                } else {
+                        *pdirection = 2;
+                        pwr_val = rtldm->swing_idx_ofdm[RF90_PATH_A] -
+                                rtldm->swing_idx_ofdm_base[RF90_PATH_A];
+                }
+        } else if (type == 1) {
+                if (rtldm->swing_idx_cck <= rtldm->swing_idx_cck_base) {
+                        *pdirection = 1;
+                        pwr_val = rtldm->swing_idx_cck_base -
+                                        rtldm->swing_idx_cck;
+                } else {
+                        *pdirection = 2;
+                        pwr_val = rtldm->swing_idx_cck -
+                                rtldm->swing_idx_cck_base;
+                }
+        }
+
+        if (pwr_val >= TXPWRTRACK_MAX_IDX && (*pdirection == 1))
+                pwr_val = TXPWRTRACK_MAX_IDX;
+
+        *poutwrite_val = pwr_val | (pwr_val << 8)|
+                                (pwr_val << 16)|
+                                (pwr_val << 24);
+}
+
+void rtl8821ae_dm_clear_txpower_tracking_state(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *rtldm = rtl_dm(rtlpriv);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv);
+        u8 p = 0;
+
+        rtldm->swing_idx_cck_base = rtldm->default_cck_index;
+        rtldm->swing_idx_cck = rtldm->default_cck_index;
+        rtldm->cck_index = 0;
+
+        for (p = RF90_PATH_A; p <= RF90_PATH_B; ++p) {
+                rtldm->swing_idx_ofdm_base[p] = rtldm->default_ofdm_index;
+                rtldm->swing_idx_ofdm[p] = rtldm->default_ofdm_index;
+                rtldm->ofdm_index[p] = rtldm->default_ofdm_index;
+
+                rtldm->power_index_offset[p] = 0;
+                rtldm->delta_power_index[p] = 0;
+                rtldm->delta_power_index_last[p] = 0;
+                /*Initial Mix mode power tracking*/
+                rtldm->absolute_ofdm_swing_idx[p] = 0;
+                rtldm->remnant_ofdm_swing_idx[p] = 0;
+        }
+        /*Initial at Modify Tx Scaling Mode*/
+        rtldm->modify_txagc_flag_path_a = false;
+        /*Initial at Modify Tx Scaling Mode*/
+        rtldm->modify_txagc_flag_path_b = false;
+        rtldm->remnant_cck_idx = 0;
+        rtldm->thermalvalue = rtlefuse->eeprom_thermalmeter;
+        rtldm->thermalvalue_iqk = rtlefuse->eeprom_thermalmeter;
+        rtldm->thermalvalue_lck = rtlefuse->eeprom_thermalmeter;
+}
+
+static u8  rtl8821ae_dm_get_swing_index(struct ieee80211_hw *hw)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 i = 0;
+        u32  bb_swing;
+
+        bb_swing = phy_get_tx_swing_8812A(hw, rtlhal->current_bandtype,
+                                          RF90_PATH_A);
+
+        for (i = 0; i < TXSCALE_TABLE_SIZE; ++i)
+                if (bb_swing == rtl8821ae_txscaling_table[i])
+                        break;
+
+        return i;
+}
+
+void rtl8821ae_dm_initialize_txpower_tracking_thermalmeter(
+                                struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *rtldm = rtl_dm(rtlpriv);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv);
+        u8 default_swing_index  = 0;
+        u8 p = 0;
+
+        rtlpriv->dm.txpower_track_control = true;
+        rtldm->thermalvalue = rtlefuse->eeprom_thermalmeter;
+        rtldm->thermalvalue_iqk = rtlefuse->eeprom_thermalmeter;
+        rtldm->thermalvalue_lck = rtlefuse->eeprom_thermalmeter;
+        default_swing_index = rtl8821ae_dm_get_swing_index(hw);
+
+        rtldm->default_ofdm_index =
+                (default_swing_index == TXSCALE_TABLE_SIZE) ?
+                24 : default_swing_index;
+        rtldm->default_cck_index = 24;
+
+        rtldm->swing_idx_cck_base = rtldm->default_cck_index;
+        rtldm->cck_index = rtldm->default_cck_index;
+
+        for (p = RF90_PATH_A; p < MAX_RF_PATH; ++p) {
+                rtldm->swing_idx_ofdm_base[p] =
+                        rtldm->default_ofdm_index;
+                rtldm->ofdm_index[p] = rtldm->default_ofdm_index;
+                rtldm->delta_power_index[p] = 0;
+                rtldm->power_index_offset[p] = 0;
+                rtldm->delta_power_index_last[p] = 0;
+        }
+}
+
+static void rtl8821ae_dm_diginit(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+
+        dm_digtable->cur_igvalue = rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f);
+        dm_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW;
+        dm_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
+        dm_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
+        dm_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
+        dm_digtable->rx_gain_max = DM_DIG_MAX;
+        dm_digtable->rx_gain_min = DM_DIG_MIN;
+        dm_digtable->back_val = DM_DIG_BACKOFF_DEFAULT;
+        dm_digtable->back_range_max = DM_DIG_BACKOFF_MAX;
+        dm_digtable->back_range_min = DM_DIG_BACKOFF_MIN;
+        dm_digtable->pre_cck_cca_thres = 0xff;
+        dm_digtable->cur_cck_cca_thres = 0x83;
+        dm_digtable->forbidden_igi = DM_DIG_MIN;
+        dm_digtable->large_fa_hit = 0;
+        dm_digtable->recover_cnt = 0;
+        dm_digtable->dig_dynamic_min = DM_DIG_MIN;
+        dm_digtable->dig_dynamic_min_1 = DM_DIG_MIN;
+        dm_digtable->media_connect_0 = false;
+        dm_digtable->media_connect_1 = false;
+        rtlpriv->dm.dm_initialgain_enable = true;
+        dm_digtable->bt30_cur_igi = 0x32;
+}
+
+void rtl8821ae_dm_init_edca_turbo(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.current_turbo_edca = false;
+        rtlpriv->dm.is_any_nonbepkts = false;
+        rtlpriv->dm.is_cur_rdlstate = false;
+}
+
+void rtl8821ae_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
+
+        p_ra->ratr_state = DM_RATR_STA_INIT;
+        p_ra->pre_ratr_state = DM_RATR_STA_INIT;
+
+        rtlpriv->dm.dm_type = DM_TYPE_BYDRIVER;
+        if (rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER)
+                rtlpriv->dm.useramask = true;
+        else
+                rtlpriv->dm.useramask = false;
+
+        p_ra->high_rssi_thresh_for_ra = 50;
+        p_ra->low_rssi_thresh_for_ra40m = 20;
+}
+
+static void rtl8821ae_dm_init_dynamic_atc_switch(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpriv->dm.crystal_cap = rtlpriv->efuse.crystalcap;
+
+        rtlpriv->dm.atc_status = rtl_get_bbreg(hw, ROFDM1_CFOTRACKING, BIT(11));
+        rtlpriv->dm.cfo_threshold = CFO_THRESHOLD_XTAL;
+}
+
+static void rtl8821ae_dm_common_info_self_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 tmp;
+
+        rtlphy->cck_high_power =
+                (bool)rtl_get_bbreg(hw, ODM_REG_CCK_RPT_FORMAT_11AC,
+                                    ODM_BIT_CCK_RPT_FORMAT_11AC);
+
+        tmp = (u8)rtl_get_bbreg(hw, ODM_REG_BB_RX_PATH_11AC,
+                                ODM_BIT_BB_RX_PATH_11AC);
+        if (tmp & BIT(0))
+                rtlpriv->dm.rfpath_rxenable[0] = true;
+        if (tmp & BIT(1))
+                rtlpriv->dm.rfpath_rxenable[1] = true;
+}
+
+void rtl8821ae_dm_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        spin_lock(&rtlpriv->locks.iqk_lock);
+        rtlphy->lck_inprogress = false;
+        spin_unlock(&rtlpriv->locks.iqk_lock);
+
+        rtlpriv->dm.dm_type = DM_TYPE_BYDRIVER;
+        rtl8821ae_dm_common_info_self_init(hw);
+        rtl8821ae_dm_diginit(hw);
+        rtl8821ae_dm_init_rate_adaptive_mask(hw);
+        rtl8821ae_dm_init_edca_turbo(hw);
+        rtl8821ae_dm_initialize_txpower_tracking_thermalmeter(hw);
+        rtl8821ae_dm_init_dynamic_atc_switch(hw);
+}
+
+static void rtl8821ae_dm_find_minimum_rssi(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *rtl_dm_dig = &rtlpriv->dm_digtable;
+        struct rtl_mac *mac = rtl_mac(rtlpriv);
+
+        /* Determine the minimum RSSI  */
+        if ((mac->link_state < MAC80211_LINKED) &&
+            (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {
+                rtl_dm_dig->min_undec_pwdb_for_dm = 0;
+                RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
+                         "Not connected to any\n");
+        }
+        if (mac->link_state >= MAC80211_LINKED) {
+                if (mac->opmode == NL80211_IFTYPE_AP ||
+                    mac->opmode == NL80211_IFTYPE_ADHOC) {
+                        rtl_dm_dig->min_undec_pwdb_for_dm =
+                            rtlpriv->dm.entry_min_undec_sm_pwdb;
+                        RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
+                                 "AP Client PWDB = 0x%lx\n",
+                                 rtlpriv->dm.entry_min_undec_sm_pwdb);
+                } else {
+                        rtl_dm_dig->min_undec_pwdb_for_dm =
+                            rtlpriv->dm.undec_sm_pwdb;
+                        RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
+                                 "STA Default Port PWDB = 0x%x\n",
+                                 rtl_dm_dig->min_undec_pwdb_for_dm);
+                }
+        } else {
+                rtl_dm_dig->min_undec_pwdb_for_dm =
+                    rtlpriv->dm.entry_min_undec_sm_pwdb;
+                RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
+                         "AP Ext Port or disconnet PWDB = 0x%x\n",
+                         rtl_dm_dig->min_undec_pwdb_for_dm);
+        }
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "MinUndecoratedPWDBForDM =%d\n",
+                 rtl_dm_dig->min_undec_pwdb_for_dm);
+}
+
+static void  rtl8812ae_dm_rssi_dump_to_register(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl_write_byte(rtlpriv, RA_RSSI_DUMP,
+                       rtlpriv->stats.rx_rssi_percentage[0]);
+        rtl_write_byte(rtlpriv, RB_RSSI_DUMP,
+                       rtlpriv->stats.rx_rssi_percentage[1]);
+
+        /* Rx EVM*/
+        rtl_write_byte(rtlpriv, RS1_RX_EVM_DUMP,
+                       rtlpriv->stats.rx_evm_dbm[0]);
+        rtl_write_byte(rtlpriv, RS2_RX_EVM_DUMP,
+                       rtlpriv->stats.rx_evm_dbm[1]);
+
+        /*Rx SNR*/
+        rtl_write_byte(rtlpriv, RA_RX_SNR_DUMP,
+                       (u8)(rtlpriv->stats.rx_snr_db[0]));
+        rtl_write_byte(rtlpriv, RB_RX_SNR_DUMP,
+                       (u8)(rtlpriv->stats.rx_snr_db[1]));
+
+        /*Rx Cfo_Short*/
+        rtl_write_word(rtlpriv, RA_CFO_SHORT_DUMP,
+                       rtlpriv->stats.rx_cfo_short[0]);
+        rtl_write_word(rtlpriv, RB_CFO_SHORT_DUMP,
+                       rtlpriv->stats.rx_cfo_short[1]);
+
+        /*Rx Cfo_Tail*/
+        rtl_write_word(rtlpriv, RA_CFO_LONG_DUMP,
+                       rtlpriv->stats.rx_cfo_tail[0]);
+        rtl_write_word(rtlpriv, RB_CFO_LONG_DUMP,
+                       rtlpriv->stats.rx_cfo_tail[1]);
+}
+
+static void rtl8821ae_dm_check_rssi_monitor(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_sta_info *drv_priv;
+        u8 h2c_parameter[4] = { 0 };
+        long tmp_entry_max_pwdb = 0, tmp_entry_min_pwdb = 0xff;
+        u8 stbc_tx = 0;
+        u64 cur_txokcnt = 0, cur_rxokcnt = 0;
+        static u64 last_txokcnt = 0, last_rxokcnt;
+
+        cur_txokcnt = rtlpriv->stats.txbytesunicast - last_txokcnt;
+        cur_rxokcnt = rtlpriv->stats.rxbytesunicast - last_rxokcnt;
+        last_txokcnt = rtlpriv->stats.txbytesunicast;
+        last_rxokcnt = rtlpriv->stats.rxbytesunicast;
+        if (cur_rxokcnt > (last_txokcnt * 6))
+                h2c_parameter[3] = 0x01;
+        else
+                h2c_parameter[3] = 0x00;
+
+        /* AP & ADHOC & MESH */
+        if (mac->opmode == NL80211_IFTYPE_AP ||
+            mac->opmode == NL80211_IFTYPE_ADHOC ||
+            mac->opmode == NL80211_IFTYPE_MESH_POINT) {
+                spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                list_for_each_entry(drv_priv, &rtlpriv->entry_list, list) {
+                        if (drv_priv->rssi_stat.undec_sm_pwdb <
+                                        tmp_entry_min_pwdb)
+                                tmp_entry_min_pwdb =
+                                        drv_priv->rssi_stat.undec_sm_pwdb;
+                        if (drv_priv->rssi_stat.undec_sm_pwdb >
+                                        tmp_entry_max_pwdb)
+                                tmp_entry_max_pwdb =
+                                        drv_priv->rssi_stat.undec_sm_pwdb;
+                }
+                spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
+
+                /* If associated entry is found */
+                if (tmp_entry_max_pwdb != 0) {
+                        rtlpriv->dm.entry_max_undec_sm_pwdb =
+                                tmp_entry_max_pwdb;
+                        RTPRINT(rtlpriv, FDM, DM_PWDB,
+                                "EntryMaxPWDB = 0x%lx(%ld)\n",
+                                tmp_entry_max_pwdb, tmp_entry_max_pwdb);
+                } else {
+                        rtlpriv->dm.entry_max_undec_sm_pwdb = 0;
+                }
+                /* If associated entry is found */
+                if (tmp_entry_min_pwdb != 0xff) {
+                        rtlpriv->dm.entry_min_undec_sm_pwdb =
+                                tmp_entry_min_pwdb;
+                        RTPRINT(rtlpriv, FDM, DM_PWDB,
+                                "EntryMinPWDB = 0x%lx(%ld)\n",
+                                tmp_entry_min_pwdb, tmp_entry_min_pwdb);
+                } else {
+                        rtlpriv->dm.entry_min_undec_sm_pwdb = 0;
+                }
+        }
+        /* Indicate Rx signal strength to FW. */
+        if (rtlpriv->dm.useramask) {
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        if (mac->mode == WIRELESS_MODE_AC_24G ||
+                            mac->mode == WIRELESS_MODE_AC_5G ||
+                            mac->mode == WIRELESS_MODE_AC_ONLY)
+                                stbc_tx = (mac->vht_cur_stbc &
+                                           STBC_VHT_ENABLE_TX) ? 1 : 0;
+                        else
+                                stbc_tx = (mac->ht_cur_stbc &
+                                           STBC_HT_ENABLE_TX) ? 1 : 0;
+                        h2c_parameter[3] |= stbc_tx << 1;
+                }
+                h2c_parameter[2] =
+                        (u8)(rtlpriv->dm.undec_sm_pwdb & 0xFF);
+                h2c_parameter[1] = 0x20;
+                h2c_parameter[0] = 0;
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                        rtl8821ae_fill_h2c_cmd(hw, H2C_RSSI_21AE_REPORT, 4,
+                                               h2c_parameter);
+                else
+                        rtl8821ae_fill_h2c_cmd(hw, H2C_RSSI_21AE_REPORT, 3,
+                                               h2c_parameter);
+        } else {
+                rtl_write_byte(rtlpriv, 0x4fe, rtlpriv->dm.undec_sm_pwdb);
+        }
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                rtl8812ae_dm_rssi_dump_to_register(hw);
+        rtl8821ae_dm_find_minimum_rssi(hw);
+        dm_digtable->rssi_val_min = rtlpriv->dm_digtable.min_undec_pwdb_for_dm;
+}
+
+void rtl8821ae_dm_write_cck_cca_thres(struct ieee80211_hw *hw, u8 current_cca)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+
+        if (dm_digtable->cur_cck_cca_thres != current_cca)
+                rtl_write_byte(rtlpriv, DM_REG_CCK_CCA_11AC, current_cca);
+
+        dm_digtable->pre_cck_cca_thres = dm_digtable->cur_cck_cca_thres;
+        dm_digtable->cur_cck_cca_thres = current_cca;
+}
+
+void rtl8821ae_dm_write_dig(struct ieee80211_hw *hw, u8 current_igi)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+
+        if (dm_digtable->stop_dig)
+                return;
+
+        if (dm_digtable->cur_igvalue != current_igi) {
+                rtl_set_bbreg(hw, DM_REG_IGI_A_11AC,
+                              DM_BIT_IGI_11AC, current_igi);
+                if (rtlpriv->phy.rf_type != RF_1T1R)
+                        rtl_set_bbreg(hw, DM_REG_IGI_B_11AC,
+                                      DM_BIT_IGI_11AC, current_igi);
+        }
+        dm_digtable->cur_igvalue = current_igi;
+}
+
+static void rtl8821ae_dm_dig(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 dig_dynamic_min;
+        u8 dig_max_of_min;
+        bool first_connect, first_disconnect;
+        u8 dm_dig_max, dm_dig_min, offset;
+        u8 current_igi = dm_digtable->cur_igvalue;
+
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "\n");
+
+        if (mac->act_scanning) {
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "Return: In Scan Progress\n");
+                return;
+        }
+
+        /*add by Neil Chen to avoid PSD is processing*/
+        dig_dynamic_min = dm_digtable->dig_dynamic_min;
+        first_connect = (mac->link_state >= MAC80211_LINKED) &&
+                        (!dm_digtable->media_connect_0);
+        first_disconnect = (mac->link_state < MAC80211_LINKED) &&
+                        (dm_digtable->media_connect_0);
+
+        /*1 Boundary Decision*/
+
+        dm_dig_max = 0x5A;
+
+        if (rtlhal->hw_type != HARDWARE_TYPE_RTL8821AE)
+                dm_dig_min = DM_DIG_MIN;
+        else
+                dm_dig_min = 0x1C;
+
+        dig_max_of_min = DM_DIG_MAX_AP;
+
+        if (mac->link_state >= MAC80211_LINKED) {
+                if (rtlhal->hw_type != HARDWARE_TYPE_RTL8821AE)
+                        offset = 20;
+                else
+                        offset = 10;
+
+                if ((dm_digtable->rssi_val_min + offset) > dm_dig_max)
+                        dm_digtable->rx_gain_max = dm_dig_max;
+                else if ((dm_digtable->rssi_val_min + offset) < dm_dig_min)
+                        dm_digtable->rx_gain_max = dm_dig_min;
+                else
+                        dm_digtable->rx_gain_max =
+                                dm_digtable->rssi_val_min + offset;
+
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "dm_digtable->rssi_val_min=0x%x,dm_digtable->rx_gain_max = 0x%x",
+                         dm_digtable->rssi_val_min,
+                         dm_digtable->rx_gain_max);
+                if (rtlpriv->dm.one_entry_only) {
+                        offset = 0;
+
+                        if (dm_digtable->rssi_val_min - offset < dm_dig_min)
+                                dig_dynamic_min = dm_dig_min;
+                        else if (dm_digtable->rssi_val_min -
+                                offset > dig_max_of_min)
+                                dig_dynamic_min = dig_max_of_min;
+                        else
+                                dig_dynamic_min =
+                                        dm_digtable->rssi_val_min - offset;
+
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                 "bOneEntryOnly=TRUE, dig_dynamic_min=0x%x\n",
+                                 dig_dynamic_min);
+                } else {
+                        dig_dynamic_min = dm_dig_min;
+                }
+        } else {
+                dm_digtable->rx_gain_max = dm_dig_max;
+                dig_dynamic_min = dm_dig_min;
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "No Link\n");
+        }
+
+        if (rtlpriv->falsealm_cnt.cnt_all > 10000) {
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "Abnornally false alarm case.\n");
+
+                if (dm_digtable->large_fa_hit != 3)
+                        dm_digtable->large_fa_hit++;
+                if (dm_digtable->forbidden_igi < current_igi) {
+                        dm_digtable->forbidden_igi = current_igi;
+                        dm_digtable->large_fa_hit = 1;
+                }
+
+                if (dm_digtable->large_fa_hit >= 3) {
+                        if ((dm_digtable->forbidden_igi + 1) >
+                                dm_digtable->rx_gain_max)
+                                dm_digtable->rx_gain_min =
+                                        dm_digtable->rx_gain_max;
+                        else
+                                dm_digtable->rx_gain_min =
+                                        (dm_digtable->forbidden_igi + 1);
+                        dm_digtable->recover_cnt = 3600;
+                }
+        } else {
+                /*Recovery mechanism for IGI lower bound*/
+                if (dm_digtable->recover_cnt != 0) {
+                        dm_digtable->recover_cnt--;
+                } else {
+                        if (dm_digtable->large_fa_hit < 3) {
+                                if ((dm_digtable->forbidden_igi - 1) <
+                                    dig_dynamic_min) {
+                                        dm_digtable->forbidden_igi =
+                                                dig_dynamic_min;
+                                        dm_digtable->rx_gain_min =
+                                                dig_dynamic_min;
+                                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                                 "Normal Case: At Lower Bound\n");
+                                } else {
+                                        dm_digtable->forbidden_igi--;
+                                        dm_digtable->rx_gain_min =
+                                          (dm_digtable->forbidden_igi + 1);
+                                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                                 "Normal Case: Approach Lower Bound\n");
+                                }
+                        } else {
+                                dm_digtable->large_fa_hit = 0;
+                        }
+                }
+        }
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "pDM_DigTable->LargeFAHit=%d\n",
+                 dm_digtable->large_fa_hit);
+
+        if (rtlpriv->dm.dbginfo.num_qry_beacon_pkt < 10)
+                dm_digtable->rx_gain_min = dm_dig_min;
+
+        if (dm_digtable->rx_gain_min > dm_digtable->rx_gain_max)
+                dm_digtable->rx_gain_min = dm_digtable->rx_gain_max;
+
+        /*Adjust initial gain by false alarm*/
+        if (mac->link_state >= MAC80211_LINKED) {
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "DIG AfterLink\n");
+                if (first_connect) {
+                        if (dm_digtable->rssi_val_min <= dig_max_of_min)
+                                current_igi = dm_digtable->rssi_val_min;
+                        else
+                                current_igi = dig_max_of_min;
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                 "First Connect\n");
+                } else {
+                        if (rtlpriv->falsealm_cnt.cnt_all > DM_DIG_FA_TH2)
+                                current_igi = current_igi + 4;
+                        else if (rtlpriv->falsealm_cnt.cnt_all > DM_DIG_FA_TH1)
+                                current_igi = current_igi + 2;
+                        else if (rtlpriv->falsealm_cnt.cnt_all < DM_DIG_FA_TH0)
+                                current_igi = current_igi - 2;
+
+                        if ((rtlpriv->dm.dbginfo.num_qry_beacon_pkt < 10) &&
+                            (rtlpriv->falsealm_cnt.cnt_all < DM_DIG_FA_TH1)) {
+                                current_igi = dm_digtable->rx_gain_min;
+                                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                         "Beacon is less than 10 and FA is less than 768, IGI GOES TO 0x1E!!!!!!!!!!!!\n");
+                        }
+                }
+        } else {
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "DIG BeforeLink\n");
+                if (first_disconnect) {
+                        current_igi = dm_digtable->rx_gain_min;
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                 "First DisConnect\n");
+                } else {
+                        /* 2012.03.30 LukeLee: enable DIG before
+                         * link but with very high thresholds
+                         */
+                        if (rtlpriv->falsealm_cnt.cnt_all > 2000)
+                                current_igi = current_igi + 4;
+                        else if (rtlpriv->falsealm_cnt.cnt_all > 600)
+                                current_igi = current_igi + 2;
+                        else if (rtlpriv->falsealm_cnt.cnt_all < 300)
+                                current_igi = current_igi - 2;
+
+                        if (current_igi >= 0x3e)
+                                current_igi = 0x3e;
+
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "England DIG\n");
+                }
+        }
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "DIG End Adjust IGI\n");
+        /* Check initial gain by upper/lower bound*/
+
+        if (current_igi > dm_digtable->rx_gain_max)
+                current_igi = dm_digtable->rx_gain_max;
+        if (current_igi < dm_digtable->rx_gain_min)
+                current_igi = dm_digtable->rx_gain_min;
+
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "rx_gain_max=0x%x, rx_gain_min=0x%x\n",
+                dm_digtable->rx_gain_max, dm_digtable->rx_gain_min);
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "TotalFA=%d\n", rtlpriv->falsealm_cnt.cnt_all);
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "CurIGValue=0x%x\n", current_igi);
+
+        rtl8821ae_dm_write_dig(hw, current_igi);
+        dm_digtable->media_connect_0 =
+                ((mac->link_state >= MAC80211_LINKED) ? true : false);
+        dm_digtable->dig_dynamic_min = dig_dynamic_min;
+}
+
+static void rtl8821ae_dm_common_info_self_update(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 cnt = 0;
+        struct rtl_sta_info *drv_priv;
+
+        rtlpriv->dm.tx_rate = 0xff;
+
+        rtlpriv->dm.one_entry_only = false;
+
+        if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_STATION &&
+            rtlpriv->mac80211.link_state >= MAC80211_LINKED) {
+                rtlpriv->dm.one_entry_only = true;
+                return;
+        }
+
+        if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP ||
+            rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC ||
+            rtlpriv->mac80211.opmode == NL80211_IFTYPE_MESH_POINT) {
+                spin_lock_bh(&rtlpriv->locks.entry_list_lock);
+                list_for_each_entry(drv_priv, &rtlpriv->entry_list, list)
+                        cnt++;
+                spin_unlock_bh(&rtlpriv->locks.entry_list_lock);
+
+                if (cnt == 1)
+                        rtlpriv->dm.one_entry_only = true;
+        }
+}
+
+static void rtl8821ae_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct false_alarm_statistics *falsealm_cnt = &rtlpriv->falsealm_cnt;
+        u32 cck_enable = 0;
+
+        /*read OFDM FA counter*/
+        falsealm_cnt->cnt_ofdm_fail =
+                rtl_get_bbreg(hw, ODM_REG_OFDM_FA_11AC, BMASKLWORD);
+        falsealm_cnt->cnt_cck_fail =
+                rtl_get_bbreg(hw, ODM_REG_CCK_FA_11AC, BMASKLWORD);
+
+        cck_enable =  rtl_get_bbreg(hw, ODM_REG_BB_RX_PATH_11AC, BIT(28));
+        if (cck_enable)  /*if(pDM_Odm->pBandType == ODM_BAND_2_4G)*/
+                falsealm_cnt->cnt_all = falsealm_cnt->cnt_ofdm_fail +
+                                        falsealm_cnt->cnt_cck_fail;
+        else
+                falsealm_cnt->cnt_all = falsealm_cnt->cnt_ofdm_fail;
+
+        /*reset OFDM FA coutner*/
+        rtl_set_bbreg(hw, ODM_REG_OFDM_FA_RST_11AC, BIT(17), 1);
+        rtl_set_bbreg(hw, ODM_REG_OFDM_FA_RST_11AC, BIT(17), 0);
+        /* reset CCK FA counter*/
+        rtl_set_bbreg(hw, ODM_REG_CCK_FA_RST_11AC, BIT(15), 0);
+        rtl_set_bbreg(hw, ODM_REG_CCK_FA_RST_11AC, BIT(15), 1);
+
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "Cnt_Cck_fail=%d\n",
+                 falsealm_cnt->cnt_cck_fail);
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "cnt_ofdm_fail=%d\n",
+                 falsealm_cnt->cnt_ofdm_fail);
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "Total False Alarm=%d\n",
+                 falsealm_cnt->cnt_all);
+}
+
+static void rtl8812ae_dm_check_txpower_tracking_thermalmeter(
+                struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        static u8 tm_trigger;
+
+        if (!tm_trigger) {
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER_88E,
+                              BIT(17) | BIT(16), 0x03);
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "Trigger 8812 Thermal Meter!!\n");
+                tm_trigger = 1;
+                return;
+        }
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "Schedule TxPowerTracking direct call!!\n");
+        rtl8812ae_dm_txpower_tracking_callback_thermalmeter(hw);
+        tm_trigger = 0;
+}
+
+static void rtl8821ae_dm_iq_calibrate(struct ieee80211_hw *hw)
+{
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        if (mac->link_state >= MAC80211_LINKED) {
+                if (rtldm->linked_interval < 3)
+                        rtldm->linked_interval++;
+
+                if (rtldm->linked_interval == 2) {
+                        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                                rtl8812ae_phy_iq_calibrate(hw, false);
+                        else
+                                rtl8821ae_phy_iq_calibrate(hw, false);
+                }
+        } else {
+                rtldm->linked_interval = 0;
+        }
+}
+
+static void rtl8812ae_get_delta_swing_table(struct ieee80211_hw *hw,
+                                            u8 **up_a, u8 **down_a,
+                                            u8 **up_b, u8 **down_b)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        u8 channel = rtlphy->current_channel;
+        u8 rate = rtldm->tx_rate;
+
+        if (1 <= channel && channel <= 14) {
+                if (RTL8821AE_RX_HAL_IS_CCK_RATE(rate)) {
+                        *up_a = rtl8812ae_delta_swing_table_idx_24gccka_p;
+                        *down_a = rtl8812ae_delta_swing_table_idx_24gccka_n;
+                        *up_b = rtl8812ae_delta_swing_table_idx_24gcckb_p;
+                        *down_b = rtl8812ae_delta_swing_table_idx_24gcckb_n;
+                } else {
+                        *up_a = rtl8812ae_delta_swing_table_idx_24ga_p;
+                        *down_a = rtl8812ae_delta_swing_table_idx_24ga_n;
+                        *up_b = rtl8812ae_delta_swing_table_idx_24gb_p;
+                        *down_b = rtl8812ae_delta_swing_table_idx_24gb_n;
+                }
+        } else if (36 <= channel && channel <= 64) {
+                *up_a = rtl8812ae_delta_swing_table_idx_5ga_p[0];
+                *down_a = rtl8812ae_delta_swing_table_idx_5ga_n[0];
+                *up_b = rtl8812ae_delta_swing_table_idx_5gb_p[0];
+                *down_b = rtl8812ae_delta_swing_table_idx_5gb_n[0];
+        } else if (100 <= channel && channel <= 140) {
+                *up_a = rtl8812ae_delta_swing_table_idx_5ga_p[1];
+                *down_a = rtl8812ae_delta_swing_table_idx_5ga_n[1];
+                *up_b = rtl8812ae_delta_swing_table_idx_5gb_p[1];
+                *down_b = rtl8812ae_delta_swing_table_idx_5gb_n[1];
+        } else if (149 <= channel && channel <= 173) {
+                *up_a = rtl8812ae_delta_swing_table_idx_5ga_p[2];
+                *down_a = rtl8812ae_delta_swing_table_idx_5ga_n[2];
+                *up_b = rtl8812ae_delta_swing_table_idx_5gb_p[2];
+                *down_b = rtl8812ae_delta_swing_table_idx_5gb_n[2];
+        } else {
+            *up_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p;
+            *down_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n;
+            *up_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p;
+            *down_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n;
+        }
+}
+
+void rtl8821ae_dm_update_init_rate(struct ieee80211_hw *hw, u8 rate)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 p = 0;
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "Get C2H Command! Rate=0x%x\n", rate);
+
+        rtldm->tx_rate = rate;
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                rtl8821ae_dm_txpwr_track_set_pwr(hw, MIX_MODE, RF90_PATH_A, 0);
+        } else {
+                for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++)
+                        rtl8812ae_dm_txpwr_track_set_pwr(hw, MIX_MODE, p, 0);
+        }
+}
+
+u8 rtl8821ae_hw_rate_to_mrate(struct ieee80211_hw *hw, u8 rate)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 ret_rate = MGN_1M;
+
+        switch (rate) {
+        case DESC_RATE1M:
+                ret_rate = MGN_1M;
+                break;
+        case DESC_RATE2M:
+                ret_rate = MGN_2M;
+                break;
+        case DESC_RATE5_5M:
+                ret_rate = MGN_5_5M;
+                break;
+        case DESC_RATE11M:
+                ret_rate = MGN_11M;
+                break;
+        case DESC_RATE6M:
+                ret_rate = MGN_6M;
+                break;
+        case DESC_RATE9M:
+                ret_rate = MGN_9M;
+                break;
+        case DESC_RATE12M:
+                ret_rate = MGN_12M;
+                break;
+        case DESC_RATE18M:
+                ret_rate = MGN_18M;
+                break;
+        case DESC_RATE24M:
+                ret_rate = MGN_24M;
+                break;
+        case DESC_RATE36M:
+                ret_rate = MGN_36M;
+                break;
+        case DESC_RATE48M:
+                ret_rate = MGN_48M;
+                break;
+        case DESC_RATE54M:
+                ret_rate = MGN_54M;
+                break;
+        case DESC_RATEMCS0:
+                ret_rate = MGN_MCS0;
+                break;
+        case DESC_RATEMCS1:
+                ret_rate = MGN_MCS1;
+                break;
+        case DESC_RATEMCS2:
+                ret_rate = MGN_MCS2;
+                break;
+        case DESC_RATEMCS3:
+                ret_rate = MGN_MCS3;
+                break;
+        case DESC_RATEMCS4:
+                ret_rate = MGN_MCS4;
+                break;
+        case DESC_RATEMCS5:
+                ret_rate = MGN_MCS5;
+                break;
+        case DESC_RATEMCS6:
+                ret_rate = MGN_MCS6;
+                break;
+        case DESC_RATEMCS7:
+                ret_rate = MGN_MCS7;
+                break;
+        case DESC_RATEMCS8:
+                ret_rate = MGN_MCS8;
+                break;
+        case DESC_RATEMCS9:
+                ret_rate = MGN_MCS9;
+                break;
+        case DESC_RATEMCS10:
+                ret_rate = MGN_MCS10;
+                break;
+        case DESC_RATEMCS11:
+                ret_rate = MGN_MCS11;
+                break;
+        case DESC_RATEMCS12:
+                ret_rate = MGN_MCS12;
+                break;
+        case DESC_RATEMCS13:
+                ret_rate = MGN_MCS13;
+                break;
+        case DESC_RATEMCS14:
+                ret_rate = MGN_MCS14;
+                break;
+        case DESC_RATEMCS15:
+                ret_rate = MGN_MCS15;
+                break;
+        case DESC_RATEVHT1SS_MCS0:
+                ret_rate = MGN_VHT1SS_MCS0;
+                break;
+        case DESC_RATEVHT1SS_MCS1:
+                ret_rate = MGN_VHT1SS_MCS1;
+                break;
+        case DESC_RATEVHT1SS_MCS2:
+                ret_rate = MGN_VHT1SS_MCS2;
+                break;
+        case DESC_RATEVHT1SS_MCS3:
+                ret_rate = MGN_VHT1SS_MCS3;
+                break;
+        case DESC_RATEVHT1SS_MCS4:
+                ret_rate = MGN_VHT1SS_MCS4;
+                break;
+        case DESC_RATEVHT1SS_MCS5:
+                ret_rate = MGN_VHT1SS_MCS5;
+                break;
+        case DESC_RATEVHT1SS_MCS6:
+                ret_rate = MGN_VHT1SS_MCS6;
+                break;
+        case DESC_RATEVHT1SS_MCS7:
+                ret_rate = MGN_VHT1SS_MCS7;
+                break;
+        case DESC_RATEVHT1SS_MCS8:
+                ret_rate = MGN_VHT1SS_MCS8;
+                break;
+        case DESC_RATEVHT1SS_MCS9:
+                ret_rate = MGN_VHT1SS_MCS9;
+                break;
+        case DESC_RATEVHT2SS_MCS0:
+                ret_rate = MGN_VHT2SS_MCS0;
+                break;
+        case DESC_RATEVHT2SS_MCS1:
+                ret_rate = MGN_VHT2SS_MCS1;
+                break;
+        case DESC_RATEVHT2SS_MCS2:
+                ret_rate = MGN_VHT2SS_MCS2;
+                break;
+        case DESC_RATEVHT2SS_MCS3:
+                ret_rate = MGN_VHT2SS_MCS3;
+                break;
+        case DESC_RATEVHT2SS_MCS4:
+                ret_rate = MGN_VHT2SS_MCS4;
+                break;
+        case DESC_RATEVHT2SS_MCS5:
+                ret_rate = MGN_VHT2SS_MCS5;
+                break;
+        case DESC_RATEVHT2SS_MCS6:
+                ret_rate = MGN_VHT2SS_MCS6;
+                break;
+        case DESC_RATEVHT2SS_MCS7:
+                ret_rate = MGN_VHT2SS_MCS7;
+                break;
+        case DESC_RATEVHT2SS_MCS8:
+                ret_rate = MGN_VHT2SS_MCS8;
+                break;
+        case DESC_RATEVHT2SS_MCS9:
+                ret_rate = MGN_VHT2SS_MCS9;
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "HwRateToMRate8812(): Non supported Rate [%x]!!!\n",
+                         rate);
+                break;
+        }
+        return ret_rate;
+}
+
+/*-----------------------------------------------------------------------------
+ * Function:    odm_TxPwrTrackSetPwr88E()
+ *
+ * Overview:    88E change all channel tx power accordign to flag.
+ *                              OFDM & CCK are all different.
+ *
+ * Input:               NONE
+ *
+ * Output:              NONE
+ *
+ * Return:              NONE
+ *
+ * Revised History:
+ *      When            Who             Remark
+ *      04/23/2012      MHC             Create Version 0.
+ *
+ *---------------------------------------------------------------------------
+ */
+void rtl8812ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,
+                                      enum pwr_track_control_method method,
+                                      u8 rf_path, u8 channel_mapped_index)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 final_swing_idx[2];
+        u8 pwr_tracking_limit = 26; /*+1.0dB*/
+        u8 tx_rate = 0xFF;
+        char final_ofdm_swing_index = 0;
+
+        if (rtldm->tx_rate != 0xFF)
+                tx_rate =
+                        rtl8821ae_hw_rate_to_mrate(hw, rtldm->tx_rate);
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "===>rtl8812ae_dm_txpwr_track_set_pwr\n");
+        /*20130429 Mimic Modify High Rate BBSwing Limit.*/
+        if (tx_rate != 0xFF) {
+                /*CCK*/
+                if ((tx_rate >= MGN_1M) && (tx_rate <= MGN_11M))
+                        pwr_tracking_limit = 32; /*+4dB*/
+                /*OFDM*/
+                else if ((tx_rate >= MGN_6M) && (tx_rate <= MGN_48M))
+                        pwr_tracking_limit = 30; /*+3dB*/
+                else if (tx_rate == MGN_54M)
+                        pwr_tracking_limit = 28; /*+2dB*/
+                /*HT*/
+                 /*QPSK/BPSK*/
+                else if ((tx_rate >= MGN_MCS0) && (tx_rate <= MGN_MCS2))
+                        pwr_tracking_limit = 34; /*+5dB*/
+                 /*16QAM*/
+                else if ((tx_rate >= MGN_MCS3) && (tx_rate <= MGN_MCS4))
+                        pwr_tracking_limit = 30; /*+3dB*/
+                 /*64QAM*/
+                else if ((tx_rate >= MGN_MCS5) && (tx_rate <= MGN_MCS7))
+                        pwr_tracking_limit = 28; /*+2dB*/
+                 /*QPSK/BPSK*/
+                else if ((tx_rate >= MGN_MCS8) && (tx_rate <= MGN_MCS10))
+                        pwr_tracking_limit = 34; /*+5dB*/
+                 /*16QAM*/
+                else if ((tx_rate >= MGN_MCS11) && (tx_rate <= MGN_MCS12))
+                        pwr_tracking_limit = 30; /*+3dB*/
+                 /*64QAM*/
+                else if ((tx_rate >= MGN_MCS13) && (tx_rate <= MGN_MCS15))
+                        pwr_tracking_limit = 28; /*+2dB*/
+
+                /*2 VHT*/
+                 /*QPSK/BPSK*/
+                else if ((tx_rate >= MGN_VHT1SS_MCS0) &&
+                         (tx_rate <= MGN_VHT1SS_MCS2))
+                        pwr_tracking_limit = 34; /*+5dB*/
+                 /*16QAM*/
+                else if ((tx_rate >= MGN_VHT1SS_MCS3) &&
+                         (tx_rate <= MGN_VHT1SS_MCS4))
+                        pwr_tracking_limit = 30; /*+3dB*/
+                 /*64QAM*/
+                else if ((tx_rate >= MGN_VHT1SS_MCS5) &&
+                         (tx_rate <= MGN_VHT1SS_MCS6))
+                        pwr_tracking_limit = 28; /*+2dB*/
+                else if (tx_rate == MGN_VHT1SS_MCS7) /*64QAM*/
+                        pwr_tracking_limit = 26; /*+1dB*/
+                else if (tx_rate == MGN_VHT1SS_MCS8) /*256QAM*/
+                        pwr_tracking_limit = 24; /*+0dB*/
+                else if (tx_rate == MGN_VHT1SS_MCS9) /*256QAM*/
+                        pwr_tracking_limit = 22; /*-1dB*/
+                 /*QPSK/BPSK*/
+                else if ((tx_rate >= MGN_VHT2SS_MCS0) &&
+                         (tx_rate <= MGN_VHT2SS_MCS2))
+                        pwr_tracking_limit = 34; /*+5dB*/
+                 /*16QAM*/
+                else if ((tx_rate >= MGN_VHT2SS_MCS3) &&
+                         (tx_rate <= MGN_VHT2SS_MCS4))
+                        pwr_tracking_limit = 30; /*+3dB*/
+                 /*64QAM*/
+                else if ((tx_rate >= MGN_VHT2SS_MCS5) &&
+                         (tx_rate <= MGN_VHT2SS_MCS6))
+                        pwr_tracking_limit = 28; /*+2dB*/
+                else if (tx_rate == MGN_VHT2SS_MCS7) /*64QAM*/
+                        pwr_tracking_limit = 26; /*+1dB*/
+                else if (tx_rate == MGN_VHT2SS_MCS8) /*256QAM*/
+                        pwr_tracking_limit = 24; /*+0dB*/
+                else if (tx_rate == MGN_VHT2SS_MCS9) /*256QAM*/
+                        pwr_tracking_limit = 22; /*-1dB*/
+                else
+                        pwr_tracking_limit = 24;
+        }
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "TxRate=0x%x, PwrTrackingLimit=%d\n",
+                 tx_rate, pwr_tracking_limit);
+
+        if (method == BBSWING) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "===>rtl8812ae_dm_txpwr_track_set_pwr\n");
+
+                if (rf_path == RF90_PATH_A) {
+                        u32 tmp;
+
+                        final_swing_idx[RF90_PATH_A] =
+                                (rtldm->ofdm_index[RF90_PATH_A] >
+                                pwr_tracking_limit) ?
+                                pwr_tracking_limit :
+                                rtldm->ofdm_index[RF90_PATH_A];
+                        tmp = final_swing_idx[RF90_PATH_A];
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_A]=%d,pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_A]=%d\n",
+                                 rtldm->ofdm_index[RF90_PATH_A],
+                                 final_swing_idx[RF90_PATH_A]);
+
+                        rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
+                                      txscaling_tbl[tmp]);
+                } else {
+                        u32 tmp;
+
+                        final_swing_idx[RF90_PATH_B] =
+                                rtldm->ofdm_index[RF90_PATH_B] >
+                                pwr_tracking_limit ?
+                                pwr_tracking_limit :
+                                rtldm->ofdm_index[RF90_PATH_B];
+                        tmp = final_swing_idx[RF90_PATH_B];
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_B]=%d, pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_B]=%d\n",
+                                 rtldm->ofdm_index[RF90_PATH_B],
+                                 final_swing_idx[RF90_PATH_B]);
+
+                        rtl_set_bbreg(hw, RB_TXSCALE, 0xFFE00000,
+                                      txscaling_tbl[tmp]);
+                }
+        } else if (method == MIX_MODE) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "pDM_Odm->DefaultOfdmIndex=%d, pDM_Odm->Aboslute_OFDMSwingIdx[RFPath]=%d, RF_Path = %d\n",
+                         rtldm->default_ofdm_index,
+                         rtldm->absolute_ofdm_swing_idx[rf_path],
+                         rf_path);
+
+                final_ofdm_swing_index = rtldm->default_ofdm_index +
+                                rtldm->absolute_ofdm_swing_idx[rf_path];
+
+                if (rf_path == RF90_PATH_A) {
+                        /*BBSwing higher then Limit*/
+                        if (final_ofdm_swing_index > pwr_tracking_limit) {
+                                rtldm->remnant_cck_idx =
+                                        final_ofdm_swing_index -
+                                        pwr_tracking_limit;
+                                /* CCK Follow the same compensation value
+                                 * as Path A
+                                 */
+                                rtldm->remnant_ofdm_swing_idx[rf_path] =
+                                        final_ofdm_swing_index -
+                                        pwr_tracking_limit;
+
+                                rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
+                                              txscaling_tbl[pwr_tracking_limit]);
+
+                                rtldm->modify_txagc_flag_path_a = true;
+
+                                /*Set TxAGC Page C{};*/
+                                rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                        rtlphy->current_channel,
+                                        RF90_PATH_A);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "******Path_A Over BBSwing Limit ,PwrTrackingLimit = %d ,Remnant TxAGC Value = %d\n",
+                                         pwr_tracking_limit,
+                                         rtldm->remnant_ofdm_swing_idx[rf_path]);
+                        } else if (final_ofdm_swing_index < 0) {
+                                rtldm->remnant_cck_idx = final_ofdm_swing_index;
+                                /* CCK Follow the same compensate value as Path A*/
+                                rtldm->remnant_ofdm_swing_idx[rf_path] =
+                                        final_ofdm_swing_index;
+
+                                rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
+                                        txscaling_tbl[0]);
+
+                                rtldm->modify_txagc_flag_path_a = true;
+
+                                /*Set TxAGC Page C{};*/
+                                rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                        rtlphy->current_channel, RF90_PATH_A);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "******Path_A Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
+                                         rtldm->remnant_ofdm_swing_idx[rf_path]);
+                        } else {
+                                rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
+                                        txscaling_tbl[(u8)final_ofdm_swing_index]);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "******Path_A Compensate with BBSwing, Final_OFDM_Swing_Index = %d\n",
+                                        final_ofdm_swing_index);
+                                /*If TxAGC has changed, reset TxAGC again*/
+                                if (rtldm->modify_txagc_flag_path_a) {
+                                        rtldm->remnant_cck_idx = 0;
+                                        rtldm->remnant_ofdm_swing_idx[rf_path] = 0;
+
+                                        /*Set TxAGC Page C{};*/
+                                        rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                                rtlphy->current_channel, RF90_PATH_A);
+                                        rtldm->modify_txagc_flag_path_a = false;
+
+                                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
+                                                 DBG_LOUD,
+                                                 "******Path_A pDM_Odm->Modify_TxAGC_Flag = FALSE\n");
+                                }
+                        }
+                }
+                /*BBSwing higher then Limit*/
+                if (rf_path == RF90_PATH_B) {
+                        if (final_ofdm_swing_index > pwr_tracking_limit) {
+                                rtldm->remnant_ofdm_swing_idx[rf_path] =
+                                        final_ofdm_swing_index -
+                                        pwr_tracking_limit;
+
+                                rtl_set_bbreg(hw, RB_TXSCALE,
+                                        0xFFE00000,
+                                        txscaling_tbl[pwr_tracking_limit]);
+
+                                rtldm->modify_txagc_flag_path_b = true;
+
+                                /*Set TxAGC Page E{};*/
+                                rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                        rtlphy->current_channel, RF90_PATH_B);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "******Path_B Over BBSwing Limit , PwrTrackingLimit = %d , Remnant TxAGC Value = %d\n",
+                                         pwr_tracking_limit,
+                                         rtldm->remnant_ofdm_swing_idx[rf_path]);
+                        } else if (final_ofdm_swing_index < 0) {
+                                rtldm->remnant_ofdm_swing_idx[rf_path] =
+                                        final_ofdm_swing_index;
+
+                                rtl_set_bbreg(hw, RB_TXSCALE, 0xFFE00000,
+                                              txscaling_tbl[0]);
+
+                                rtldm->modify_txagc_flag_path_b = true;
+
+                                /*Set TxAGC Page E{};*/
+                                rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                        rtlphy->current_channel, RF90_PATH_B);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "******Path_B Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
+                                         rtldm->remnant_ofdm_swing_idx[rf_path]);
+                        } else {
+                                rtl_set_bbreg(hw, RB_TXSCALE, 0xFFE00000,
+                                        txscaling_tbl[(u8)final_ofdm_swing_index]);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "******Path_B Compensate with BBSwing ,Final_OFDM_Swing_Index = %d\n",
+                                        final_ofdm_swing_index);
+                                 /*If TxAGC has changed, reset TxAGC again*/
+                                if (rtldm->modify_txagc_flag_path_b) {
+                                        rtldm->remnant_ofdm_swing_idx[rf_path] = 0;
+
+                                        /*Set TxAGC Page E{};*/
+                                        rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                        rtlphy->current_channel, RF90_PATH_B);
+
+                                        rtldm->modify_txagc_flag_path_b =
+                                                false;
+
+                                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                                 "******Path_B pDM_Odm->Modify_TxAGC_Flag = FALSE\n");
+                                }
+                        }
+                }
+        } else {
+                return;
+        }
+}
+
+void rtl8812ae_dm_txpower_tracking_callback_thermalmeter(
+        struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 thermal_value = 0, delta, delta_lck, delta_iqk, p = 0, i = 0;
+        u8 thermal_value_avg_count = 0;
+        u32 thermal_value_avg = 0;
+        /* OFDM BB Swing should be less than +3.0dB, */
+        u8 ofdm_min_index = 6;
+         /* GetRightChnlPlaceforIQK(pHalData->CurrentChannel)*/
+        u8 index_for_channel = 0;
+        /* 1. The following TWO tables decide
+         * the final index of OFDM/CCK swing table.
+         */
+        u8 *delta_swing_table_idx_tup_a;
+        u8 *delta_swing_table_idx_tdown_a;
+        u8 *delta_swing_table_idx_tup_b;
+        u8 *delta_swing_table_idx_tdown_b;
+
+        /*2. Initilization ( 7 steps in total )*/
+        rtl8812ae_get_delta_swing_table(hw,
+                (u8 **)&delta_swing_table_idx_tup_a,
+                (u8 **)&delta_swing_table_idx_tdown_a,
+                (u8 **)&delta_swing_table_idx_tup_b,
+                (u8 **)&delta_swing_table_idx_tdown_b);
+
+        rtldm->txpower_trackinginit = true;
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "pDM_Odm->BbSwingIdxCckBase: %d, pDM_Odm->BbSwingIdxOfdmBase[A]:%d, pDM_Odm->DefaultOfdmIndex: %d\n",
+                 rtldm->swing_idx_cck_base,
+                 rtldm->swing_idx_ofdm_base[RF90_PATH_A],
+                 rtldm->default_ofdm_index);
+
+        thermal_value = (u8)rtl_get_rfreg(hw, RF90_PATH_A,
+                /*0x42: RF Reg[15:10] 88E*/
+                RF_T_METER_8812A, 0xfc00);
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
+                 thermal_value, rtlefuse->eeprom_thermalmeter);
+        if (!rtldm->txpower_track_control ||
+            rtlefuse->eeprom_thermalmeter == 0 ||
+            rtlefuse->eeprom_thermalmeter == 0xFF)
+                return;
+
+        /* 3. Initialize ThermalValues of RFCalibrateInfo*/
+
+        if (rtlhal->reloadtxpowerindex)
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "reload ofdm index for band switch\n");
+
+        /*4. Calculate average thermal meter*/
+        rtldm->thermalvalue_avg[rtldm->thermalvalue_avg_index] = thermal_value;
+        rtldm->thermalvalue_avg_index++;
+        if (rtldm->thermalvalue_avg_index == AVG_THERMAL_NUM_8812A)
+                /*Average times =  c.AverageThermalNum*/
+                rtldm->thermalvalue_avg_index = 0;
+
+        for (i = 0; i < AVG_THERMAL_NUM_8812A; i++) {
+                if (rtldm->thermalvalue_avg[i]) {
+                        thermal_value_avg += rtldm->thermalvalue_avg[i];
+                        thermal_value_avg_count++;
+                }
+        }
+        /*Calculate Average ThermalValue after average enough times*/
+        if (thermal_value_avg_count) {
+                thermal_value = (u8)(thermal_value_avg /
+                                thermal_value_avg_count);
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "AVG Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
+                         thermal_value, rtlefuse->eeprom_thermalmeter);
+        }
+
+        /*5. Calculate delta, delta_LCK, delta_IQK.
+         *"delta" here is used to determine whether
+         *thermal value changes or not.
+         */
+        delta = (thermal_value > rtldm->thermalvalue) ?
+                (thermal_value - rtldm->thermalvalue) :
+                (rtldm->thermalvalue - thermal_value);
+        delta_lck = (thermal_value > rtldm->thermalvalue_lck) ?
+                (thermal_value - rtldm->thermalvalue_lck) :
+                (rtldm->thermalvalue_lck - thermal_value);
+        delta_iqk = (thermal_value > rtldm->thermalvalue_iqk) ?
+                (thermal_value - rtldm->thermalvalue_iqk) :
+                (rtldm->thermalvalue_iqk - thermal_value);
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "(delta, delta_LCK, delta_IQK) = (%d, %d, %d)\n",
+                 delta, delta_lck, delta_iqk);
+
+        /* 6. If necessary, do LCK.
+         * Delta temperature is equal to or larger than 20 centigrade.
+         */
+        if (delta_lck >= IQK_THRESHOLD) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "delta_LCK(%d) >= Threshold_IQK(%d)\n",
+                         delta_lck, IQK_THRESHOLD);
+                rtldm->thermalvalue_lck = thermal_value;
+                rtl8821ae_phy_lc_calibrate(hw);
+        }
+
+        /*7. If necessary, move the index of swing table to adjust Tx power.*/
+
+        if (delta > 0 && rtldm->txpower_track_control) {
+                /* "delta" here is used to record the
+                 * absolute value of differrence.
+                 */
+                delta = thermal_value > rtlefuse->eeprom_thermalmeter ?
+                        (thermal_value - rtlefuse->eeprom_thermalmeter) :
+                        (rtlefuse->eeprom_thermalmeter - thermal_value);
+
+                if (delta >= TXPWR_TRACK_TABLE_SIZE)
+                        delta = TXPWR_TRACK_TABLE_SIZE - 1;
+
+                /*7.1 The Final Power Index = BaseIndex + PowerIndexOffset*/
+
+                if (thermal_value > rtlefuse->eeprom_thermalmeter) {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "delta_swing_table_idx_tup_a[%d] = %d\n",
+                                 delta, delta_swing_table_idx_tup_a[delta]);
+                        rtldm->delta_power_index_last[RF90_PATH_A] =
+                                rtldm->delta_power_index[RF90_PATH_A];
+                        rtldm->delta_power_index[RF90_PATH_A] =
+                                delta_swing_table_idx_tup_a[delta];
+
+                        rtldm->absolute_ofdm_swing_idx[RF90_PATH_A] =
+                                delta_swing_table_idx_tup_a[delta];
+                        /*Record delta swing for mix mode power tracking*/
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "******Temp is higher and pDM_Odm->Aboslute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
+                        rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "delta_swing_table_idx_tup_b[%d] = %d\n",
+                                 delta, delta_swing_table_idx_tup_b[delta]);
+                        rtldm->delta_power_index_last[RF90_PATH_B] =
+                                rtldm->delta_power_index[RF90_PATH_B];
+                        rtldm->delta_power_index[RF90_PATH_B] =
+                                delta_swing_table_idx_tup_b[delta];
+
+                        rtldm->absolute_ofdm_swing_idx[RF90_PATH_B] =
+                                delta_swing_table_idx_tup_b[delta];
+                        /*Record delta swing for mix mode power tracking*/
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "******Temp is higher and pDM_Odm->Aboslute_OFDMSwingIdx[ODM_RF_PATH_B] = %d\n",
+                                 rtldm->absolute_ofdm_swing_idx[RF90_PATH_B]);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "delta_swing_table_idx_tdown_a[%d] = %d\n",
+                                 delta, delta_swing_table_idx_tdown_a[delta]);
+
+                        rtldm->delta_power_index_last[RF90_PATH_A] =
+                                rtldm->delta_power_index[RF90_PATH_A];
+                        rtldm->delta_power_index[RF90_PATH_A] =
+                                -1 * delta_swing_table_idx_tdown_a[delta];
+
+                        rtldm->absolute_ofdm_swing_idx[RF90_PATH_A] =
+                                -1 * delta_swing_table_idx_tdown_a[delta];
+                        /* Record delta swing for mix mode power tracking*/
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "******Temp is lower and pDM_Odm->Aboslute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
+                                 rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "deltaSwingTableIdx_TDOWN_B[%d] = %d\n",
+                                 delta, delta_swing_table_idx_tdown_b[delta]);
+
+                        rtldm->delta_power_index_last[RF90_PATH_B] =
+                                rtldm->delta_power_index[RF90_PATH_B];
+                        rtldm->delta_power_index[RF90_PATH_B] =
+                                -1 * delta_swing_table_idx_tdown_b[delta];
+
+                        rtldm->absolute_ofdm_swing_idx[RF90_PATH_B] =
+                                -1 * delta_swing_table_idx_tdown_b[delta];
+                        /*Record delta swing for mix mode power tracking*/
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "******Temp is lower and pDM_Odm->Aboslute_OFDMSwingIdx[ODM_RF_PATH_B] = %d\n",
+                                 rtldm->absolute_ofdm_swing_idx[RF90_PATH_B]);
+                }
+
+                for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++) {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "============================= [Path-%c]Calculating PowerIndexOffset =============================\n",
+                                 (p == RF90_PATH_A ? 'A' : 'B'));
+
+                        if (rtldm->delta_power_index[p] ==
+                                rtldm->delta_power_index_last[p])
+                                /*If Thermal value changes but lookup
+                                table value still the same*/
+                                rtldm->power_index_offset[p] = 0;
+                        else
+                                rtldm->power_index_offset[p] =
+                                        rtldm->delta_power_index[p] -
+                                        rtldm->delta_power_index_last[p];
+                                /* Power Index Diff between 2
+                                 * times Power Tracking
+                                 */
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "[Path-%c] PowerIndexOffset(%d) =DeltaPowerIndex(%d) -DeltaPowerIndexLast(%d)\n",
+                                 (p == RF90_PATH_A ? 'A' : 'B'),
+                                 rtldm->power_index_offset[p],
+                                 rtldm->delta_power_index[p] ,
+                                 rtldm->delta_power_index_last[p]);
+
+                        rtldm->ofdm_index[p] =
+                                        rtldm->swing_idx_ofdm_base[p] +
+                                        rtldm->power_index_offset[p];
+                        rtldm->cck_index =
+                                        rtldm->swing_idx_cck_base +
+                                        rtldm->power_index_offset[p];
+
+                        rtldm->swing_idx_cck = rtldm->cck_index;
+                        rtldm->swing_idx_ofdm[p] = rtldm->ofdm_index[p];
+
+                        /****Print BB Swing Base and Index Offset */
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "The 'CCK' final index(%d) = BaseIndex(%d) + PowerIndexOffset(%d)\n",
+                                 rtldm->swing_idx_cck,
+                                rtldm->swing_idx_cck_base,
+                                rtldm->power_index_offset[p]);
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "The 'OFDM' final index(%d) = BaseIndex[%c](%d) + PowerIndexOffset(%d)\n",
+                                 rtldm->swing_idx_ofdm[p],
+                                 (p == RF90_PATH_A ? 'A' : 'B'),
+                                 rtldm->swing_idx_ofdm_base[p],
+                                 rtldm->power_index_offset[p]);
+
+                        /*7.1 Handle boundary conditions of index.*/
+
+                        if (rtldm->ofdm_index[p] > TXSCALE_TABLE_SIZE - 1)
+                                rtldm->ofdm_index[p] = TXSCALE_TABLE_SIZE - 1;
+                        else if (rtldm->ofdm_index[p] < ofdm_min_index)
+                                rtldm->ofdm_index[p] = ofdm_min_index;
+                }
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "\n\n====================================================================================\n");
+                if (rtldm->cck_index > TXSCALE_TABLE_SIZE - 1)
+                        rtldm->cck_index = TXSCALE_TABLE_SIZE - 1;
+                else if (rtldm->cck_index < 0)
+                        rtldm->cck_index = 0;
+        } else {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "The thermal meter is unchanged or TxPowerTracking OFF(%d): ThermalValue: %d , pDM_Odm->RFCalibrateInfo.ThermalValue: %d\n",
+                         rtldm->txpower_track_control,
+                         thermal_value,
+                         rtldm->thermalvalue);
+
+                for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++)
+                        rtldm->power_index_offset[p] = 0;
+        }
+        /*Print Swing base & current*/
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "TxPowerTracking: [CCK] Swing Current Index: %d,Swing Base Index: %d\n",
+                 rtldm->cck_index, rtldm->swing_idx_cck_base);
+        for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "TxPowerTracking: [OFDM] Swing Current Index: %d,Swing Base Index[%c]: %d\n",
+                         rtldm->ofdm_index[p],
+                         (p == RF90_PATH_A ? 'A' : 'B'),
+                         rtldm->swing_idx_ofdm_base[p]);
+        }
+
+        if ((rtldm->power_index_offset[RF90_PATH_A] != 0 ||
+                rtldm->power_index_offset[RF90_PATH_B] != 0) &&
+                rtldm->txpower_track_control) {
+                /*7.2 Configure the Swing Table to adjust Tx Power.
+                 *Always TRUE after Tx Power is adjusted by power tracking.
+                 *
+                 *2012/04/23 MH According to Luke's suggestion,
+                 *we can not write BB digital
+                 *to increase TX power. Otherwise, EVM will be bad.
+                 *
+                 *2012/04/25 MH Add for tx power tracking to set
+                 *tx power in tx agc for 88E.
+                 */
+                if (thermal_value > rtldm->thermalvalue) {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature Increasing(A): delta_pi: %d , delta_t: %d, Now_t: %d,EFUSE_t: %d, Last_t: %d\n",
+                                 rtldm->power_index_offset[RF90_PATH_A],
+                                 delta, thermal_value,
+                                 rtlefuse->eeprom_thermalmeter,
+                                 rtldm->thermalvalue);
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature Increasing(B): delta_pi: %d ,delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
+                                 rtldm->power_index_offset[RF90_PATH_B],
+                                 delta, thermal_value,
+                                 rtlefuse->eeprom_thermalmeter,
+                                 rtldm->thermalvalue);
+                } else if (thermal_value < rtldm->thermalvalue) { /*Low temperature*/
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature Decreasing(A): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
+                                 rtldm->power_index_offset[RF90_PATH_A],
+                                 delta, thermal_value,
+                                 rtlefuse->eeprom_thermalmeter,
+                                 rtldm->thermalvalue);
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature Decreasing(B): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
+                                 rtldm->power_index_offset[RF90_PATH_B],
+                                 delta, thermal_value,
+                                 rtlefuse->eeprom_thermalmeter,
+                                 rtldm->thermalvalue);
+                }
+
+                if (thermal_value > rtlefuse->eeprom_thermalmeter) {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature(%d) higher than PG value(%d)\n",
+                                 thermal_value, rtlefuse->eeprom_thermalmeter);
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "**********Enter POWER Tracking MIX_MODE**********\n");
+                        for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++)
+                                rtl8812ae_dm_txpwr_track_set_pwr(hw, MIX_MODE,
+                                                                 p, 0);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature(%d) lower than PG value(%d)\n",
+                                 thermal_value, rtlefuse->eeprom_thermalmeter);
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "**********Enter POWER Tracking MIX_MODE**********\n");
+                        for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++)
+                                rtl8812ae_dm_txpwr_track_set_pwr(hw, MIX_MODE,
+                                                                 p, index_for_channel);
+                }
+                /*Record last time Power Tracking result as base.*/
+                rtldm->swing_idx_cck_base = rtldm->swing_idx_cck;
+                for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++)
+                                rtldm->swing_idx_ofdm_base[p] =
+                                        rtldm->swing_idx_ofdm[p];
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "pDM_Odm->RFCalibrateInfo.ThermalValue =%d ThermalValue= %d\n",
+                                 rtldm->thermalvalue, thermal_value);
+                /*Record last Power Tracking Thermal Value*/
+                rtldm->thermalvalue = thermal_value;
+        }
+        /*Delta temperature is equal to or larger than
+        20 centigrade (When threshold is 8).*/
+        if (delta_iqk >= IQK_THRESHOLD)
+                rtl8812ae_do_iqk(hw, delta_iqk, thermal_value, 8);
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "<===rtl8812ae_dm_txpower_tracking_callback_thermalmeter\n");
+}
+
+static void rtl8821ae_get_delta_swing_table(struct ieee80211_hw *hw, u8 **up_a,
+                                            u8 **down_a, u8 **up_b, u8 **down_b)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        u8 channel = rtlphy->current_channel;
+        u8 rate = rtldm->tx_rate;
+
+        if (1 <= channel && channel <= 14) {
+                if (RTL8821AE_RX_HAL_IS_CCK_RATE(rate)) {
+                        *up_a = rtl8821ae_delta_swing_table_idx_24gccka_p;
+                        *down_a = rtl8821ae_delta_swing_table_idx_24gccka_n;
+                        *up_b = rtl8821ae_delta_swing_table_idx_24gcckb_p;
+                        *down_b = rtl8821ae_delta_swing_table_idx_24gcckb_n;
+                } else {
+                        *up_a = rtl8821ae_delta_swing_table_idx_24ga_p;
+                        *down_a = rtl8821ae_delta_swing_table_idx_24ga_n;
+                        *up_b = rtl8821ae_delta_swing_table_idx_24gb_p;
+                        *down_b = rtl8821ae_delta_swing_table_idx_24gb_n;
+                }
+        } else if (36 <= channel && channel <= 64) {
+                *up_a = rtl8821ae_delta_swing_table_idx_5ga_p[0];
+                *down_a = rtl8821ae_delta_swing_table_idx_5ga_n[0];
+                *up_b = rtl8821ae_delta_swing_table_idx_5gb_p[0];
+                *down_b = rtl8821ae_delta_swing_table_idx_5gb_n[0];
+        } else if (100 <= channel && channel <= 140) {
+                *up_a = rtl8821ae_delta_swing_table_idx_5ga_p[1];
+                *down_a = rtl8821ae_delta_swing_table_idx_5ga_n[1];
+                *up_b = rtl8821ae_delta_swing_table_idx_5gb_p[1];
+                *down_b = rtl8821ae_delta_swing_table_idx_5gb_n[1];
+        } else if (149 <= channel && channel <= 173) {
+                *up_a = rtl8821ae_delta_swing_table_idx_5ga_p[2];
+                *down_a = rtl8821ae_delta_swing_table_idx_5ga_n[2];
+                *up_b = rtl8821ae_delta_swing_table_idx_5gb_p[2];
+                *down_b = rtl8821ae_delta_swing_table_idx_5gb_n[2];
+        } else {
+            *up_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p;
+            *down_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n;
+            *up_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p;
+            *down_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n;
+        }
+        return;
+}
+
+/*-----------------------------------------------------------------------------
+ * Function:    odm_TxPwrTrackSetPwr88E()
+ *
+ * Overview:    88E change all channel tx power accordign to flag.
+ *                              OFDM & CCK are all different.
+ *
+ * Input:               NONE
+ *
+ * Output:              NONE
+ *
+ * Return:              NONE
+ *
+ * Revised History:
+ *      When            Who             Remark
+ *      04/23/2012      MHC             Create Version 0.
+ *
+ *---------------------------------------------------------------------------
+ */
+void rtl8821ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,
+                                      enum pwr_track_control_method method,
+                                      u8 rf_path, u8 channel_mapped_index)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 final_swing_idx[1];
+        u8 pwr_tracking_limit = 26; /*+1.0dB*/
+        u8 tx_rate = 0xFF;
+        char final_ofdm_swing_index = 0;
+
+        if (rtldm->tx_rate != 0xFF)
+                tx_rate = rtl8821ae_hw_rate_to_mrate(hw, rtldm->tx_rate);
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "===>rtl8812ae_dm_txpwr_track_set_pwr\n");
+
+        if (tx_rate != 0xFF) { /* Mimic Modify High Rate BBSwing Limit.*/
+                /*CCK*/
+                if ((tx_rate >= MGN_1M) && (tx_rate <= MGN_11M))
+                        pwr_tracking_limit = 32; /*+4dB*/
+                /*OFDM*/
+                else if ((tx_rate >= MGN_6M) && (tx_rate <= MGN_48M))
+                        pwr_tracking_limit = 30; /*+3dB*/
+                else if (tx_rate == MGN_54M)
+                        pwr_tracking_limit = 28; /*+2dB*/
+                /*HT*/
+                /*QPSK/BPSK*/
+                else if ((tx_rate >= MGN_MCS0) && (tx_rate <= MGN_MCS2))
+                        pwr_tracking_limit = 34; /*+5dB*/
+                /*16QAM*/
+                else if ((tx_rate >= MGN_MCS3) && (tx_rate <= MGN_MCS4))
+                        pwr_tracking_limit = 30; /*+3dB*/
+                /*64QAM*/
+                else if ((tx_rate >= MGN_MCS5) && (tx_rate <= MGN_MCS7))
+                        pwr_tracking_limit = 28; /*+2dB*/
+                /*2 VHT*/
+                /*QPSK/BPSK*/
+                else if ((tx_rate >= MGN_VHT1SS_MCS0) &&
+                        (tx_rate <= MGN_VHT1SS_MCS2))
+                        pwr_tracking_limit = 34; /*+5dB*/
+                /*16QAM*/
+                else if ((tx_rate >= MGN_VHT1SS_MCS3) &&
+                        (tx_rate <= MGN_VHT1SS_MCS4))
+                        pwr_tracking_limit = 30; /*+3dB*/
+                /*64QAM*/
+                else if ((tx_rate >= MGN_VHT1SS_MCS5) &&
+                        (tx_rate <= MGN_VHT1SS_MCS6))
+                        pwr_tracking_limit = 28; /*+2dB*/
+                else if (tx_rate == MGN_VHT1SS_MCS7) /*64QAM*/
+                        pwr_tracking_limit = 26; /*+1dB*/
+                else if (tx_rate == MGN_VHT1SS_MCS8) /*256QAM*/
+                        pwr_tracking_limit = 24; /*+0dB*/
+                else if (tx_rate == MGN_VHT1SS_MCS9) /*256QAM*/
+                        pwr_tracking_limit = 22; /*-1dB*/
+                else
+                        pwr_tracking_limit = 24;
+        }
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "TxRate=0x%x, PwrTrackingLimit=%d\n",
+                 tx_rate, pwr_tracking_limit);
+
+        if (method == BBSWING) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "===>rtl8812ae_dm_txpwr_track_set_pwr\n");
+                if (rf_path == RF90_PATH_A) {
+                        final_swing_idx[RF90_PATH_A] =
+                                (rtldm->ofdm_index[RF90_PATH_A] >
+                                pwr_tracking_limit) ?
+                                pwr_tracking_limit :
+                                rtldm->ofdm_index[RF90_PATH_A];
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_A]=%d,pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_A]=%d\n",
+                                 rtldm->ofdm_index[RF90_PATH_A],
+                                 final_swing_idx[RF90_PATH_A]);
+
+                        rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
+                                txscaling_tbl[final_swing_idx[RF90_PATH_A]]);
+                }
+        } else if (method == MIX_MODE) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "pDM_Odm->DefaultOfdmIndex=%d,pDM_Odm->Aboslute_OFDMSwingIdx[RFPath]=%d, RF_Path = %d\n",
+                         rtldm->default_ofdm_index,
+                         rtldm->absolute_ofdm_swing_idx[rf_path],
+                         rf_path);
+
+                final_ofdm_swing_index =
+                        rtldm->default_ofdm_index +
+                        rtldm->absolute_ofdm_swing_idx[rf_path];
+                /*BBSwing higher then Limit*/
+                if (rf_path == RF90_PATH_A) {
+                        if (final_ofdm_swing_index > pwr_tracking_limit) {
+                                rtldm->remnant_cck_idx =
+                                        final_ofdm_swing_index -
+                                        pwr_tracking_limit;
+                                /* CCK Follow the same compensate value as Path A*/
+                                rtldm->remnant_ofdm_swing_idx[rf_path] =
+                                        final_ofdm_swing_index -
+                                        pwr_tracking_limit;
+
+                                rtl_set_bbreg(hw, RA_TXSCALE,
+                                        0xFFE00000,
+                                        txscaling_tbl[pwr_tracking_limit]);
+
+                                rtldm->modify_txagc_flag_path_a = true;
+
+                                /*Set TxAGC Page C{};*/
+                                rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                        rtlphy->current_channel,
+                                        RF90_PATH_A);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                        " ******Path_A Over BBSwing Limit , PwrTrackingLimit = %d , Remnant TxAGC Value = %d\n",
+                                         pwr_tracking_limit,
+                                         rtldm->remnant_ofdm_swing_idx[rf_path]);
+                        } else if (final_ofdm_swing_index < 0) {
+                                rtldm->remnant_cck_idx = final_ofdm_swing_index;
+                                /* CCK Follow the same compensate value as Path A*/
+                                rtldm->remnant_ofdm_swing_idx[rf_path] =
+                                        final_ofdm_swing_index;
+
+                                rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
+                                        txscaling_tbl[0]);
+
+                                rtldm->modify_txagc_flag_path_a = true;
+
+                                /*Set TxAGC Page C{};*/
+                                rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                        rtlphy->current_channel, RF90_PATH_A);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "******Path_A Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
+                                         rtldm->remnant_ofdm_swing_idx[rf_path]);
+                        } else {
+                                rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
+                                        txscaling_tbl[(u8)final_ofdm_swing_index]);
+
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "******Path_A Compensate with BBSwing ,Final_OFDM_Swing_Index = %d\n",
+                                         final_ofdm_swing_index);
+                                /*If TxAGC has changed, reset TxAGC again*/
+                                if (rtldm->modify_txagc_flag_path_a) {
+                                        rtldm->remnant_cck_idx = 0;
+                                        rtldm->remnant_ofdm_swing_idx[rf_path] = 0;
+
+                                        /*Set TxAGC Page C{};*/
+                                        rtl8821ae_phy_set_txpower_level_by_path(hw,
+                                                rtlphy->current_channel, RF90_PATH_A);
+
+                                        rtldm->modify_txagc_flag_path_a = false;
+
+                                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
+                                                 DBG_LOUD,
+                                                 "******Path_A pDM_Odm->Modify_TxAGC_Flag= FALSE\n");
+                                }
+                        }
+                }
+        } else {
+                return;
+        }
+}
+
+void rtl8821ae_dm_txpower_tracking_callback_thermalmeter(
+        struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        u8 thermal_value = 0, delta, delta_lck, delta_iqk, p = 0, i = 0;
+        u8 thermal_value_avg_count = 0;
+        u32 thermal_value_avg = 0;
+
+        u8 ofdm_min_index = 6;  /*OFDM BB Swing should be less than +3.0dB */
+        /* GetRightChnlPlaceforIQK(pHalData->CurrentChannel)*/
+        u8 index_for_channel = 0;
+
+        /* 1. The following TWO tables decide the final
+         * index of OFDM/CCK swing table.
+         */
+        u8 *delta_swing_table_idx_tup_a;
+        u8 *delta_swing_table_idx_tdown_a;
+        u8 *delta_swing_table_idx_tup_b;
+        u8 *delta_swing_table_idx_tdown_b;
+
+        /*2. Initilization ( 7 steps in total )*/
+        rtl8821ae_get_delta_swing_table(hw, (u8 **)&delta_swing_table_idx_tup_a,
+                                        (u8 **)&delta_swing_table_idx_tdown_a,
+                                        (u8 **)&delta_swing_table_idx_tup_b,
+                                        (u8 **)&delta_swing_table_idx_tdown_b);
+
+        rtldm->txpower_trackinginit = true;
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "===>rtl8812ae_dm_txpower_tracking_callback_thermalmeter,\n pDM_Odm->BbSwingIdxCckBase: %d,pDM_Odm->BbSwingIdxOfdmBase[A]:%d, pDM_Odm->DefaultOfdmIndex: %d\n",
+                 rtldm->swing_idx_cck_base,
+                 rtldm->swing_idx_ofdm_base[RF90_PATH_A],
+                 rtldm->default_ofdm_index);
+        /*0x42: RF Reg[15:10] 88E*/
+        thermal_value = (u8)rtl_get_rfreg(hw,
+                RF90_PATH_A, RF_T_METER_8812A, 0xfc00);
+        if (!rtldm->txpower_track_control ||
+                rtlefuse->eeprom_thermalmeter == 0 ||
+                rtlefuse->eeprom_thermalmeter == 0xFF)
+                return;
+
+        /* 3. Initialize ThermalValues of RFCalibrateInfo*/
+
+        if (rtlhal->reloadtxpowerindex) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "reload ofdm index for band switch\n");
+        }
+
+        /*4. Calculate average thermal meter*/
+        rtldm->thermalvalue_avg[rtldm->thermalvalue_avg_index] = thermal_value;
+        rtldm->thermalvalue_avg_index++;
+        if (rtldm->thermalvalue_avg_index == AVG_THERMAL_NUM_8812A)
+                /*Average times =  c.AverageThermalNum*/
+                rtldm->thermalvalue_avg_index = 0;
+
+        for (i = 0; i < AVG_THERMAL_NUM_8812A; i++) {
+                if (rtldm->thermalvalue_avg[i]) {
+                        thermal_value_avg += rtldm->thermalvalue_avg[i];
+                        thermal_value_avg_count++;
+                }
+        }
+        /*Calculate Average ThermalValue after average enough times*/
+        if (thermal_value_avg_count) {
+                thermal_value = (u8)(thermal_value_avg /
+                                thermal_value_avg_count);
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "AVG Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
+                         thermal_value, rtlefuse->eeprom_thermalmeter);
+        }
+
+        /*5. Calculate delta, delta_LCK, delta_IQK.
+         *"delta" here is used to determine whether
+         * thermal value changes or not.
+         */
+        delta = (thermal_value > rtldm->thermalvalue) ?
+                (thermal_value - rtldm->thermalvalue) :
+                (rtldm->thermalvalue - thermal_value);
+        delta_lck = (thermal_value > rtldm->thermalvalue_lck) ?
+                (thermal_value - rtldm->thermalvalue_lck) :
+                (rtldm->thermalvalue_lck - thermal_value);
+        delta_iqk = (thermal_value > rtldm->thermalvalue_iqk) ?
+                (thermal_value - rtldm->thermalvalue_iqk) :
+                (rtldm->thermalvalue_iqk - thermal_value);
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "(delta, delta_LCK, delta_IQK) = (%d, %d, %d)\n",
+                 delta, delta_lck, delta_iqk);
+
+        /* 6. If necessary, do LCK.     */
+        /*Delta temperature is equal to or larger than 20 centigrade.*/
+        if (delta_lck >= IQK_THRESHOLD) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "delta_LCK(%d) >= Threshold_IQK(%d)\n",
+                         delta_lck, IQK_THRESHOLD);
+                rtldm->thermalvalue_lck = thermal_value;
+                rtl8821ae_phy_lc_calibrate(hw);
+        }
+
+        /*7. If necessary, move the index of swing table to adjust Tx power.*/
+
+        if (delta > 0 && rtldm->txpower_track_control) {
+                /*"delta" here is used to record the
+                 * absolute value of differrence.
+                 */
+                delta = thermal_value > rtlefuse->eeprom_thermalmeter ?
+                        (thermal_value - rtlefuse->eeprom_thermalmeter) :
+                        (rtlefuse->eeprom_thermalmeter - thermal_value);
+
+                if (delta >= TXSCALE_TABLE_SIZE)
+                        delta = TXSCALE_TABLE_SIZE - 1;
+
+                /*7.1 The Final Power Index = BaseIndex + PowerIndexOffset*/
+
+                if (thermal_value > rtlefuse->eeprom_thermalmeter) {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "delta_swing_table_idx_tup_a[%d] = %d\n",
+                                 delta, delta_swing_table_idx_tup_a[delta]);
+                        rtldm->delta_power_index_last[RF90_PATH_A] =
+                                rtldm->delta_power_index[RF90_PATH_A];
+                        rtldm->delta_power_index[RF90_PATH_A] =
+                                delta_swing_table_idx_tup_a[delta];
+
+                        rtldm->absolute_ofdm_swing_idx[RF90_PATH_A] =
+                                delta_swing_table_idx_tup_a[delta];
+                        /*Record delta swing for mix mode power tracking*/
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "******Temp is higher and pDM_Odm->Aboslute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
+                                 rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "delta_swing_table_idx_tdown_a[%d] = %d\n",
+                                 delta, delta_swing_table_idx_tdown_a[delta]);
+
+                        rtldm->delta_power_index_last[RF90_PATH_A] =
+                                rtldm->delta_power_index[RF90_PATH_A];
+                        rtldm->delta_power_index[RF90_PATH_A] =
+                                -1 * delta_swing_table_idx_tdown_a[delta];
+
+                        rtldm->absolute_ofdm_swing_idx[RF90_PATH_A] =
+                                -1 * delta_swing_table_idx_tdown_a[delta];
+                        /* Record delta swing for mix mode power tracking*/
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "******Temp is lower and pDM_Odm->Aboslute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
+                                 rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
+                }
+
+                for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++) {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "\n\n================================ [Path-%c]Calculating PowerIndexOffset ================================\n",
+                                 (p == RF90_PATH_A ? 'A' : 'B'));
+                        /*If Thermal value changes but lookup table value
+                         * still the same
+                         */
+                        if (rtldm->delta_power_index[p] ==
+                                rtldm->delta_power_index_last[p])
+
+                                rtldm->power_index_offset[p] = 0;
+                        else
+                                rtldm->power_index_offset[p] =
+                                        rtldm->delta_power_index[p] -
+                                        rtldm->delta_power_index_last[p];
+                        /*Power Index Diff between 2 times Power Tracking*/
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "[Path-%c] PowerIndexOffset(%d) = DeltaPowerIndex(%d) - DeltaPowerIndexLast(%d)\n",
+                                 (p == RF90_PATH_A ? 'A' : 'B'),
+                                rtldm->power_index_offset[p],
+                                rtldm->delta_power_index[p] ,
+                                rtldm->delta_power_index_last[p]);
+
+                        rtldm->ofdm_index[p] =
+                                        rtldm->swing_idx_ofdm_base[p] +
+                                        rtldm->power_index_offset[p];
+                        rtldm->cck_index =
+                                        rtldm->swing_idx_cck_base +
+                                        rtldm->power_index_offset[p];
+
+                        rtldm->swing_idx_cck = rtldm->cck_index;
+                        rtldm->swing_idx_ofdm[p] = rtldm->ofdm_index[p];
+
+                        /*********Print BB Swing Base and Index Offset********/
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "The 'CCK' final index(%d) = BaseIndex(%d) + PowerIndexOffset(%d)\n",
+                                 rtldm->swing_idx_cck,
+                                 rtldm->swing_idx_cck_base,
+                                 rtldm->power_index_offset[p]);
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "The 'OFDM' final index(%d) = BaseIndex[%c](%d) + PowerIndexOffset(%d)\n",
+                                 rtldm->swing_idx_ofdm[p],
+                                 (p == RF90_PATH_A ? 'A' : 'B'),
+                                 rtldm->swing_idx_ofdm_base[p],
+                                 rtldm->power_index_offset[p]);
+
+                        /*7.1 Handle boundary conditions of index.*/
+
+                        if (rtldm->ofdm_index[p] > TXSCALE_TABLE_SIZE - 1)
+                                rtldm->ofdm_index[p] = TXSCALE_TABLE_SIZE - 1;
+                        else if (rtldm->ofdm_index[p] < ofdm_min_index)
+                                rtldm->ofdm_index[p] = ofdm_min_index;
+                }
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "\n\n========================================================================================================\n");
+                if (rtldm->cck_index > TXSCALE_TABLE_SIZE - 1)
+                        rtldm->cck_index = TXSCALE_TABLE_SIZE - 1;
+                else if (rtldm->cck_index < 0)
+                        rtldm->cck_index = 0;
+        } else {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "The thermal meter is unchanged or TxPowerTracking OFF(%d):ThermalValue: %d , pDM_Odm->RFCalibrateInfo.ThermalValue: %d\n",
+                         rtldm->txpower_track_control,
+                         thermal_value,
+                         rtldm->thermalvalue);
+
+                for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
+                        rtldm->power_index_offset[p] = 0;
+        }
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "TxPowerTracking: [CCK] Swing Current Index: %d, Swing Base Index: %d\n",
+                 /*Print Swing base & current*/
+                rtldm->cck_index, rtldm->swing_idx_cck_base);
+        for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++) {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "TxPowerTracking: [OFDM] Swing Current Index: %d, Swing Base Index[%c]: %d\n",
+                         rtldm->ofdm_index[p],
+                         (p == RF90_PATH_A ? 'A' : 'B'),
+                         rtldm->swing_idx_ofdm_base[p]);
+        }
+
+        if ((rtldm->power_index_offset[RF90_PATH_A] != 0 ||
+                rtldm->power_index_offset[RF90_PATH_B] != 0) &&
+                rtldm->txpower_track_control) {
+                /*7.2 Configure the Swing Table to adjust Tx Power.*/
+                /*Always TRUE after Tx Power is adjusted by power tracking.*/
+                /*
+                 *  2012/04/23 MH According to Luke's suggestion,
+                 *  we can not write BB digital
+                 *  to increase TX power. Otherwise, EVM will be bad.
+                 *
+                 *  2012/04/25 MH Add for tx power tracking to
+                 *  set tx power in tx agc for 88E.
+                 */
+                if (thermal_value > rtldm->thermalvalue) {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature Increasing(A): delta_pi: %d , delta_t: %d,Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
+                                 rtldm->power_index_offset[RF90_PATH_A],
+                                 delta, thermal_value,
+                                 rtlefuse->eeprom_thermalmeter,
+                                 rtldm->thermalvalue);
+                } else if (thermal_value < rtldm->thermalvalue) { /*Low temperature*/
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature Decreasing(A): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
+                                 rtldm->power_index_offset[RF90_PATH_A],
+                                 delta, thermal_value,
+                                 rtlefuse->eeprom_thermalmeter,
+                                 rtldm->thermalvalue);
+                }
+
+                if (thermal_value > rtlefuse->eeprom_thermalmeter) {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature(%d) higher than PG value(%d)\n",
+                                 thermal_value, rtlefuse->eeprom_thermalmeter);
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "****Enter POWER Tracking MIX_MODE****\n");
+                        for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
+                                        rtl8821ae_dm_txpwr_track_set_pwr(hw,
+                                                MIX_MODE, p, index_for_channel);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "Temperature(%d) lower than PG value(%d)\n",
+                                 thermal_value, rtlefuse->eeprom_thermalmeter);
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "*****Enter POWER Tracking MIX_MODE*****\n");
+                        for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
+                                rtl8812ae_dm_txpwr_track_set_pwr(hw,
+                                        MIX_MODE, p, index_for_channel);
+                }
+                /*Record last time Power Tracking result as base.*/
+                rtldm->swing_idx_cck_base = rtldm->swing_idx_cck;
+                for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
+                        rtldm->swing_idx_ofdm_base[p] = rtldm->swing_idx_ofdm[p];
+
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                 "pDM_Odm->RFCalibrateInfo.ThermalValue = %d ThermalValue= %d\n",
+                                 rtldm->thermalvalue, thermal_value);
+                /*Record last Power Tracking Thermal Value*/
+                rtldm->thermalvalue = thermal_value;
+        }
+        /* Delta temperature is equal to or larger than
+         * 20 centigrade (When threshold is 8).
+         */
+        if (delta_iqk >= IQK_THRESHOLD) {
+                if (!rtlphy->lck_inprogress) {
+                        spin_lock(&rtlpriv->locks.iqk_lock);
+                        rtlphy->lck_inprogress = true;
+                        spin_unlock(&rtlpriv->locks.iqk_lock);
+
+                        rtl8821ae_do_iqk(hw, delta_iqk, thermal_value, 8);
+
+                        spin_lock(&rtlpriv->locks.iqk_lock);
+                        rtlphy->lck_inprogress = false;
+                        spin_unlock(&rtlpriv->locks.iqk_lock);
+                }
+        }
+
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                 "<===rtl8812ae_dm_txpower_tracking_callback_thermalmeter\n");
+}
+
+void rtl8821ae_dm_check_txpower_tracking_thermalmeter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        static u8 tm_trigger;
+
+        if (!tm_trigger) {
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER_88E, BIT(17)|BIT(16),
+                              0x03);
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "Trigger 8821ae Thermal Meter!!\n");
+                tm_trigger = 1;
+                return;
+        } else {
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                         "Schedule TxPowerTracking !!\n");
+
+                rtl8821ae_dm_txpower_tracking_callback_thermalmeter(hw);
+                tm_trigger = 0;
+        }
+}
+
+static void rtl8821ae_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rate_adaptive *p_ra = &rtlpriv->ra;
+        u32 low_rssithresh_for_ra = p_ra->low2high_rssi_thresh_for_ra40m;
+        u32 high_rssithresh_for_ra = p_ra->high_rssi_thresh_for_ra;
+        u8 go_up_gap = 5;
+        struct ieee80211_sta *sta = NULL;
+
+        if (is_hal_stop(rtlhal)) {
+                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                         "driver is going to unload\n");
+                return;
+        }
+
+        if (!rtlpriv->dm.useramask) {
+                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                         "driver does not control rate adaptive mask\n");
+                return;
+        }
+
+        if (mac->link_state == MAC80211_LINKED &&
+                mac->opmode == NL80211_IFTYPE_STATION) {
+                switch (p_ra->pre_ratr_state) {
+                case DM_RATR_STA_MIDDLE:
+                        high_rssithresh_for_ra += go_up_gap;
+                        break;
+                case DM_RATR_STA_LOW:
+                        high_rssithresh_for_ra += go_up_gap;
+                        low_rssithresh_for_ra += go_up_gap;
+                        break;
+                default:
+                        break;
+                }
+
+                if (rtlpriv->dm.undec_sm_pwdb >
+                    (long)high_rssithresh_for_ra)
+                        p_ra->ratr_state = DM_RATR_STA_HIGH;
+                else if (rtlpriv->dm.undec_sm_pwdb >
+                         (long)low_rssithresh_for_ra)
+                        p_ra->ratr_state = DM_RATR_STA_MIDDLE;
+                else
+                        p_ra->ratr_state = DM_RATR_STA_LOW;
+
+                if (p_ra->pre_ratr_state != p_ra->ratr_state) {
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "RSSI = %ld\n",
+                                  rtlpriv->dm.undec_sm_pwdb);
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "PreState = %d, CurState = %d\n",
+                                  p_ra->pre_ratr_state, p_ra->ratr_state);
+
+                        rcu_read_lock();
+                        sta = rtl_find_sta(hw, mac->bssid);
+                        if (sta)
+                                rtlpriv->cfg->ops->update_rate_tbl(hw,
+                                                sta, p_ra->ratr_state);
+                        rcu_read_unlock();
+
+                        p_ra->pre_ratr_state = p_ra->ratr_state;
+                }
+        }
+}
+
+static void rtl8821ae_dm_refresh_basic_rate_mask(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+        struct rtl_mac *mac = &rtlpriv->mac80211;
+        static u8 stage;
+        u8 cur_stage = 0;
+        u16 basic_rate = RRSR_1M | RRSR_2M | RRSR_5_5M | RRSR_11M | RRSR_6M;
+
+        if (mac->link_state < MAC80211_LINKED)
+                cur_stage = 0;
+        else if (dm_digtable->rssi_val_min < 25)
+                cur_stage = 1;
+        else if (dm_digtable->rssi_val_min > 30)
+                cur_stage = 3;
+        else
+                cur_stage = 2;
+
+        if (cur_stage != stage) {
+                if (cur_stage == 1) {
+                        basic_rate &= (!(basic_rate ^ mac->basic_rates));
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                HW_VAR_BASIC_RATE, (u8 *)&basic_rate);
+                } else if (cur_stage == 3 && (stage == 1 || stage == 2)) {
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                HW_VAR_BASIC_RATE, (u8 *)&mac->basic_rates);
+                }
+        }
+        stage = cur_stage;
+}
+
+static void rtl8821ae_dm_edca_choose_traffic_idx(
+        struct ieee80211_hw *hw, u64 cur_tx_bytes,
+        u64 cur_rx_bytes, bool b_bias_on_rx,
+        bool *pb_is_cur_rdl_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (b_bias_on_rx) {
+                if (cur_tx_bytes > (cur_rx_bytes*4)) {
+                        *pb_is_cur_rdl_state = false;
+                        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                                 "Uplink Traffic\n ");
+                } else {
+                        *pb_is_cur_rdl_state = true;
+                        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                                 "Balance Traffic\n");
+                }
+        } else {
+                if (cur_rx_bytes > (cur_tx_bytes*4)) {
+                        *pb_is_cur_rdl_state = true;
+                        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                                 "Downlink      Traffic\n");
+                } else {
+                        *pb_is_cur_rdl_state = false;
+                        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                                 "Balance Traffic\n");
+                }
+        }
+        return;
+}
+
+static void rtl8821ae_dm_check_edca_turbo(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_dm *rtldm =  rtl_dm(rtl_priv(hw));
+
+        /*Keep past Tx/Rx packet count for RT-to-RT EDCA turbo.*/
+        u64 cur_tx_ok_cnt = 0;
+        u64 cur_rx_ok_cnt = 0;
+        u32 edca_be_ul = 0x5ea42b;
+        u32 edca_be_dl = 0x5ea42b;
+        u32 edca_be = 0x5ea42b;
+        u8 iot_peer = 0;
+        bool *pb_is_cur_rdl_state = NULL;
+        bool b_last_is_cur_rdl_state = false;
+        bool b_bias_on_rx = false;
+        bool b_edca_turbo_on = false;
+
+        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                 "rtl8821ae_dm_check_edca_turbo=====>");
+        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                 "Orginial BE PARAM: 0x%x\n",
+                 rtl_read_dword(rtlpriv, DM_REG_EDCA_BE_11N));
+
+        if (rtlpriv->dm.dbginfo.num_non_be_pkt > 0x100)
+                rtlpriv->dm.is_any_nonbepkts = true;
+        rtlpriv->dm.dbginfo.num_non_be_pkt = 0;
+
+        /*===============================
+         * list paramter for different platform
+         *===============================
+         */
+        b_last_is_cur_rdl_state = rtlpriv->dm.is_cur_rdlstate;
+        pb_is_cur_rdl_state = &rtlpriv->dm.is_cur_rdlstate;
+
+        cur_tx_ok_cnt = rtlpriv->stats.txbytesunicast - rtldm->last_tx_ok_cnt;
+        cur_rx_ok_cnt = rtlpriv->stats.rxbytesunicast - rtldm->last_rx_ok_cnt;
+
+        rtldm->last_tx_ok_cnt = rtlpriv->stats.txbytesunicast;
+        rtldm->last_rx_ok_cnt = rtlpriv->stats.rxbytesunicast;
+
+        iot_peer = rtlpriv->mac80211.vendor;
+        b_bias_on_rx = false;
+        b_edca_turbo_on = ((!rtlpriv->dm.is_any_nonbepkts) &&
+                           (!rtlpriv->dm.disable_framebursting)) ?
+                           true : false;
+
+        if (rtlpriv->rtlhal.hw_type != HARDWARE_TYPE_RTL8812AE) {
+                if ((iot_peer == PEER_CISCO) &&
+                        (mac->mode == WIRELESS_MODE_N_24G)) {
+                        edca_be_dl = edca_setting_dl[iot_peer];
+                        edca_be_ul = edca_setting_ul[iot_peer];
+                }
+        }
+
+        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                 "bIsAnyNonBEPkts : 0x%x  bDisableFrameBursting : 0x%x\n",
+                 rtlpriv->dm.is_any_nonbepkts,
+                 rtlpriv->dm.disable_framebursting);
+
+        RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                 "bEdcaTurboOn : 0x%x bBiasOnRx : 0x%x\n",
+                 b_edca_turbo_on, b_bias_on_rx);
+
+        if (b_edca_turbo_on) {
+                RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                         "curTxOkCnt : 0x%llx\n", cur_tx_ok_cnt);
+                RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                         "curRxOkCnt : 0x%llx\n", cur_rx_ok_cnt);
+                if (b_bias_on_rx)
+                        rtl8821ae_dm_edca_choose_traffic_idx(hw, cur_tx_ok_cnt,
+                                cur_rx_ok_cnt, true, pb_is_cur_rdl_state);
+                else
+                        rtl8821ae_dm_edca_choose_traffic_idx(hw, cur_tx_ok_cnt,
+                                cur_rx_ok_cnt, false, pb_is_cur_rdl_state);
+
+                edca_be = (*pb_is_cur_rdl_state) ?  edca_be_dl : edca_be_ul;
+
+                rtl_write_dword(rtlpriv, DM_REG_EDCA_BE_11N, edca_be);
+
+                RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                         "EDCA Turbo on: EDCA_BE:0x%x\n", edca_be);
+
+                rtlpriv->dm.current_turbo_edca = true;
+
+                RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
+                         "EDCA_BE_DL : 0x%x  EDCA_BE_UL : 0x%x  EDCA_BE : 0x%x\n",
+                         edca_be_dl, edca_be_ul, edca_be);
+        } else {
+                if (rtlpriv->dm.current_turbo_edca) {
+                        u8 tmp = AC0_BE;
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
+                                                      (u8 *)(&tmp));
+                }
+                rtlpriv->dm.current_turbo_edca = false;
+        }
+
+        rtlpriv->dm.is_any_nonbepkts = false;
+        rtldm->last_tx_ok_cnt = rtlpriv->stats.txbytesunicast;
+        rtldm->last_rx_ok_cnt = rtlpriv->stats.rxbytesunicast;
+}
+
+static void rtl8821ae_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+        u8 cur_cck_cca_thresh;
+
+        if (rtlpriv->mac80211.link_state >= MAC80211_LINKED) {
+                if (dm_digtable->rssi_val_min > 25) {
+                        cur_cck_cca_thresh = 0xcd;
+                } else if ((dm_digtable->rssi_val_min <= 25) &&
+                           (dm_digtable->rssi_val_min > 10)) {
+                        cur_cck_cca_thresh = 0x83;
+                } else {
+                        if (rtlpriv->falsealm_cnt.cnt_cck_fail > 1000)
+                                cur_cck_cca_thresh = 0x83;
+                        else
+                                cur_cck_cca_thresh = 0x40;
+                }
+        } else {
+                if (rtlpriv->falsealm_cnt.cnt_cck_fail > 1000)
+                        cur_cck_cca_thresh = 0x83;
+                else
+                        cur_cck_cca_thresh = 0x40;
+        }
+
+        if (dm_digtable->cur_cck_cca_thres != cur_cck_cca_thresh)
+                rtl_write_byte(rtlpriv, ODM_REG_CCK_CCA_11AC,
+                               cur_cck_cca_thresh);
+
+        dm_digtable->pre_cck_cca_thres = dm_digtable->cur_cck_cca_thres;
+        dm_digtable->cur_cck_cca_thres = cur_cck_cca_thresh;
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
+                 "CCK cca thresh hold =%x\n", dm_digtable->cur_cck_cca_thres);
+}
+
+static void rtl8821ae_dm_dynamic_atc_switch(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        u8 crystal_cap;
+        u32 packet_count;
+        int cfo_khz_a, cfo_khz_b, cfo_ave = 0, adjust_xtal = 0;
+        int cfo_ave_diff;
+
+        if (rtlpriv->mac80211.link_state < MAC80211_LINKED) {
+                /*1.Enable ATC*/
+                if (rtldm->atc_status == ATC_STATUS_OFF) {
+                        rtl_set_bbreg(hw, RFC_AREA, BIT(14), ATC_STATUS_ON);
+                        rtldm->atc_status = ATC_STATUS_ON;
+                }
+
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "No link!!\n");
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "atc_status = %d\n", rtldm->atc_status);
+
+                if (rtldm->crystal_cap != rtlpriv->efuse.crystalcap) {
+                        rtldm->crystal_cap = rtlpriv->efuse.crystalcap;
+                        crystal_cap = rtldm->crystal_cap & 0x3f;
+                        crystal_cap = crystal_cap & 0x3f;
+                        if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE)
+                                rtl_set_bbreg(hw, REG_MAC_PHY_CTRL,
+                                              0x7ff80000, (crystal_cap |
+                                              (crystal_cap << 6)));
+                        else
+                                rtl_set_bbreg(hw, REG_MAC_PHY_CTRL,
+                                              0xfff000, (crystal_cap |
+                                              (crystal_cap << 6)));
+                }
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "crystal_cap = 0x%x\n",
+                         rtldm->crystal_cap);
+        } else{
+                /*1. Calculate CFO for path-A & path-B*/
+                cfo_khz_a = (int)(rtldm->cfo_tail[0] * 3125) / 1280;
+                cfo_khz_b = (int)(rtldm->cfo_tail[1] * 3125) / 1280;
+                packet_count = rtldm->packet_count;
+
+                /*2.No new packet*/
+                if (packet_count == rtldm->packet_count_pre) {
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                 "packet counter doesn't change\n");
+                        return;
+                }
+
+                rtldm->packet_count_pre = packet_count;
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "packet counter = %d\n",
+                         rtldm->packet_count);
+
+                /*3.Average CFO*/
+                if (rtlpriv->phy.rf_type == RF_1T1R)
+                        cfo_ave = cfo_khz_a;
+                else
+                        cfo_ave = (cfo_khz_a + cfo_khz_b) >> 1;
+
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "cfo_khz_a = %dkHz, cfo_khz_b = %dkHz, cfo_ave = %dkHz\n",
+                         cfo_khz_a, cfo_khz_b, cfo_ave);
+
+                /*4.Avoid abnormal large CFO*/
+                cfo_ave_diff = (rtldm->cfo_ave_pre >= cfo_ave) ?
+                                                (rtldm->cfo_ave_pre - cfo_ave) :
+                                                (cfo_ave - rtldm->cfo_ave_pre);
+
+                if (cfo_ave_diff > 20 && rtldm->large_cfo_hit == 0) {
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                 "first large CFO hit\n");
+                        rtldm->large_cfo_hit = 1;
+                        return;
+                } else
+                        rtldm->large_cfo_hit = 0;
+
+                rtldm->cfo_ave_pre = cfo_ave;
+
+                /*CFO tracking by adjusting Xtal cap.*/
+
+                /*1.Dynamic Xtal threshold*/
+                if (cfo_ave >= -rtldm->cfo_threshold &&
+                        cfo_ave <= rtldm->cfo_threshold &&
+                        rtldm->is_freeze == 0) {
+                        if (rtldm->cfo_threshold == CFO_THRESHOLD_XTAL) {
+                                rtldm->cfo_threshold = CFO_THRESHOLD_XTAL + 10;
+                                rtldm->is_freeze = 1;
+                        } else {
+                                rtldm->cfo_threshold = CFO_THRESHOLD_XTAL;
+                        }
+                }
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "Dynamic threshold = %d\n",
+                         rtldm->cfo_threshold);
+
+                /* 2.Calculate Xtal offset*/
+                if (cfo_ave > rtldm->cfo_threshold && rtldm->crystal_cap < 0x3f)
+                        adjust_xtal = ((cfo_ave - CFO_THRESHOLD_XTAL) >> 2) + 1;
+                else if ((cfo_ave < -rtlpriv->dm.cfo_threshold) &&
+                         rtlpriv->dm.crystal_cap > 0)
+                        adjust_xtal = ((cfo_ave + CFO_THRESHOLD_XTAL) >> 2) - 1;
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                         "Crystal cap = 0x%x, Crystal cap offset = %d\n",
+                         rtldm->crystal_cap, adjust_xtal);
+
+                /*3.Adjudt Crystal Cap.*/
+                if (adjust_xtal != 0) {
+                        rtldm->is_freeze = 0;
+                        rtldm->crystal_cap += adjust_xtal;
+
+                        if (rtldm->crystal_cap > 0x3f)
+                                rtldm->crystal_cap = 0x3f;
+                        else if (rtldm->crystal_cap < 0)
+                                rtldm->crystal_cap = 0;
+
+                        crystal_cap = rtldm->crystal_cap & 0x3f;
+                        crystal_cap = crystal_cap & 0x3f;
+                        if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE)
+                                rtl_set_bbreg(hw, REG_MAC_PHY_CTRL,
+                                              0x7ff80000, (crystal_cap |
+                                              (crystal_cap << 6)));
+                        else
+                                rtl_set_bbreg(hw, REG_MAC_PHY_CTRL,
+                                              0xfff000, (crystal_cap |
+                                              (crystal_cap << 6)));
+                        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                                 "New crystal cap = 0x%x\n",
+                                 rtldm->crystal_cap);
+                }
+        }
+}
+
+void rtl8821ae_dm_watchdog(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool fw_current_inpsmode = false;
+        bool fw_ps_awake = true;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                      (u8 *)(&fw_current_inpsmode));
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
+                                      (u8 *)(&fw_ps_awake));
+
+        if (ppsc->p2p_ps_info.p2p_ps_mode)
+                fw_ps_awake = false;
+
+        if ((ppsc->rfpwr_state == ERFON) &&
+            ((!fw_current_inpsmode) && fw_ps_awake) &&
+            (!ppsc->rfchange_inprogress)) {
+                rtl8821ae_dm_common_info_self_update(hw);
+                rtl8821ae_dm_false_alarm_counter_statistics(hw);
+                rtl8821ae_dm_check_rssi_monitor(hw);
+                rtl8821ae_dm_dig(hw);
+                rtl8821ae_dm_cck_packet_detection_thresh(hw);
+                rtl8821ae_dm_refresh_rate_adaptive_mask(hw);
+                rtl8821ae_dm_refresh_basic_rate_mask(hw);
+                rtl8821ae_dm_check_edca_turbo(hw);
+                rtl8821ae_dm_dynamic_atc_switch(hw);
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                        rtl8812ae_dm_check_txpower_tracking_thermalmeter(hw);
+                else
+                        rtl8821ae_dm_check_txpower_tracking_thermalmeter(hw);
+                rtl8821ae_dm_iq_calibrate(hw);
+        }
+
+        rtlpriv->dm.dbginfo.num_qry_beacon_pkt = 0;
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_DMESG, "\n");
+}
+
+void rtl8821ae_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw,
+                                        u8 *pdesc, u32 mac_id)
+{
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct fast_ant_training *pfat_table = &rtldm->fat_table;
+
+        if (rtlhal->hw_type != HARDWARE_TYPE_RTL8812AE)
+                return;
+
+        if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
+                SET_TX_DESC_TX_ANT(pdesc, pfat_table->antsel_a[mac_id]);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.h b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.h
new file mode 100644
index 000000000000..9dd40dd316c1
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.h
@@ -0,0 +1,356 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_DM_H__
+#define __RTL8821AE_DM_H__
+
+#define MAIN_ANT        0
+#define AUX_ANT 1
+#define MAIN_ANT_CG_TRX 1
+#define AUX_ANT_CG_TRX  0
+#define MAIN_ANT_CGCS_RX        0
+#define AUX_ANT_CGCS_RX 1
+
+#define TXSCALE_TABLE_SIZE 37
+
+/*RF REG LIST*/
+#define DM_REG_RF_MODE_11N                              0x00
+#define DM_REG_RF_0B_11N                                0x0B
+#define DM_REG_CHNBW_11N                                0x18
+#define DM_REG_T_METER_11N                              0x24
+#define DM_REG_RF_25_11N                                0x25
+#define DM_REG_RF_26_11N                                0x26
+#define DM_REG_RF_27_11N                                0x27
+#define DM_REG_RF_2B_11N                                0x2B
+#define DM_REG_RF_2C_11N                                0x2C
+#define DM_REG_RXRF_A3_11N                              0x3C
+#define DM_REG_T_METER_92D_11N                  0x42
+#define DM_REG_T_METER_88E_11N                  0x42
+
+/*BB REG LIST*/
+/*PAGE 8 */
+#define DM_REG_BB_CTRL_11N                              0x800
+#define DM_REG_RF_PIN_11N                               0x804
+#define DM_REG_PSD_CTRL_11N                             0x808
+#define DM_REG_TX_ANT_CTRL_11N                  0x80C
+#define DM_REG_BB_PWR_SAV5_11N                  0x818
+#define DM_REG_CCK_RPT_FORMAT_11N               0x824
+#define DM_REG_RX_DEFUALT_A_11N         0x858
+#define DM_REG_RX_DEFUALT_B_11N         0x85A
+#define DM_REG_BB_PWR_SAV3_11N                  0x85C
+#define DM_REG_ANTSEL_CTRL_11N                  0x860
+#define DM_REG_RX_ANT_CTRL_11N                  0x864
+#define DM_REG_PIN_CTRL_11N                             0x870
+#define DM_REG_BB_PWR_SAV1_11N                  0x874
+#define DM_REG_ANTSEL_PATH_11N                  0x878
+#define DM_REG_BB_3WIRE_11N                     0x88C
+#define DM_REG_SC_CNT_11N                               0x8C4
+#define DM_REG_PSD_DATA_11N                     0x8B4
+/*PAGE 9*/
+#define DM_REG_ANT_MAPPING1_11N         0x914
+#define DM_REG_ANT_MAPPING2_11N         0x918
+/*PAGE A*/
+#define DM_REG_CCK_ANTDIV_PARA1_11N     0xA00
+#define DM_REG_CCK_CCA_11N                      0xA0A
+#define DM_REG_CCK_CCA_11AC                     0xA0A
+#define DM_REG_CCK_ANTDIV_PARA2_11N     0xA0C
+#define DM_REG_CCK_ANTDIV_PARA3_11N     0xA10
+#define DM_REG_CCK_ANTDIV_PARA4_11N     0xA14
+#define DM_REG_CCK_FILTER_PARA1_11N     0xA22
+#define DM_REG_CCK_FILTER_PARA2_11N     0xA23
+#define DM_REG_CCK_FILTER_PARA3_11N     0xA24
+#define DM_REG_CCK_FILTER_PARA4_11N     0xA25
+#define DM_REG_CCK_FILTER_PARA5_11N     0xA26
+#define DM_REG_CCK_FILTER_PARA6_11N     0xA27
+#define DM_REG_CCK_FILTER_PARA7_11N     0xA28
+#define DM_REG_CCK_FILTER_PARA8_11N     0xA29
+#define DM_REG_CCK_FA_RST_11N                   0xA2C
+#define DM_REG_CCK_FA_MSB_11N                   0xA58
+#define DM_REG_CCK_FA_LSB_11N                   0xA5C
+#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
+/*PAGE C */
+#define DM_REG_OFDM_FA_HOLDC_11N                0xC00
+#define DM_REG_RX_PATH_11N                              0xC04
+#define DM_REG_TRMUX_11N                                0xC08
+#define DM_REG_OFDM_FA_RSTC_11N         0xC0C
+#define DM_REG_RXIQI_MATRIX_11N         0xC14
+#define DM_REG_TXIQK_MATRIX_LSB1_11N    0xC4C
+#define DM_REG_IGI_A_11N                                0xC50
+#define DM_REG_IGI_A_11AC                               0xC50
+#define DM_REG_ANTDIV_PARA2_11N         0xC54
+#define DM_REG_IGI_B_11N                                        0xC58
+#define DM_REG_IGI_B_11AC                                       0xE50
+#define DM_REG_ANTDIV_PARA3_11N         0xC5C
+#define DM_REG_BB_PWR_SAV2_11N                  0xC70
+#define DM_REG_RX_OFF_11N                               0xC7C
+#define DM_REG_TXIQK_MATRIXA_11N                0xC80
+#define DM_REG_TXIQK_MATRIXB_11N                0xC88
+#define DM_REG_TXIQK_MATRIXA_LSB2_11N   0xC94
+#define DM_REG_TXIQK_MATRIXB_LSB2_11N   0xC9C
+#define DM_REG_RXIQK_MATRIX_LSB_11N     0xCA0
+#define DM_REG_ANTDIV_PARA1_11N         0xCA4
+#define DM_REG_OFDM_FA_TYPE1_11N                0xCF0
+/*PAGE D */
+#define DM_REG_OFDM_FA_RSTD_11N         0xD00
+#define DM_REG_OFDM_FA_TYPE2_11N                0xDA0
+#define DM_REG_OFDM_FA_TYPE3_11N                0xDA4
+#define DM_REG_OFDM_FA_TYPE4_11N                0xDA8
+/*PAGE E */
+#define DM_REG_TXAGC_A_6_18_11N         0xE00
+#define DM_REG_TXAGC_A_24_54_11N                0xE04
+#define DM_REG_TXAGC_A_1_MCS32_11N      0xE08
+#define DM_REG_TXAGC_A_MCS0_3_11N               0xE10
+#define DM_REG_TXAGC_A_MCS4_7_11N               0xE14
+#define DM_REG_TXAGC_A_MCS8_11_11N      0xE18
+#define DM_REG_TXAGC_A_MCS12_15_11N     0xE1C
+#define DM_REG_FPGA0_IQK_11N                    0xE28
+#define DM_REG_TXIQK_TONE_A_11N         0xE30
+#define DM_REG_RXIQK_TONE_A_11N         0xE34
+#define DM_REG_TXIQK_PI_A_11N                   0xE38
+#define DM_REG_RXIQK_PI_A_11N                   0xE3C
+#define DM_REG_TXIQK_11N                                0xE40
+#define DM_REG_RXIQK_11N                                0xE44
+#define DM_REG_IQK_AGC_PTS_11N                  0xE48
+#define DM_REG_IQK_AGC_RSP_11N                  0xE4C
+#define DM_REG_BLUETOOTH_11N                    0xE6C
+#define DM_REG_RX_WAIT_CCA_11N                  0xE70
+#define DM_REG_TX_CCK_RFON_11N                  0xE74
+#define DM_REG_TX_CCK_BBON_11N                  0xE78
+#define DM_REG_OFDM_RFON_11N                    0xE7C
+#define DM_REG_OFDM_BBON_11N                    0xE80
+#define DM_REG_TX2RX_11N                                0xE84
+#define DM_REG_TX2TX_11N                                0xE88
+#define DM_REG_RX_CCK_11N                               0xE8C
+#define DM_REG_RX_OFDM_11N                              0xED0
+#define DM_REG_RX_WAIT_RIFS_11N         0xED4
+#define DM_REG_RX2RX_11N                                0xED8
+#define DM_REG_STANDBY_11N                              0xEDC
+#define DM_REG_SLEEP_11N                                0xEE0
+#define DM_REG_PMPD_ANAEN_11N                   0xEEC
+
+/*MAC REG LIST*/
+#define DM_REG_BB_RST_11N                               0x02
+#define DM_REG_ANTSEL_PIN_11N                   0x4C
+#define DM_REG_EARLY_MODE_11N                   0x4D0
+#define DM_REG_RSSI_MONITOR_11N         0x4FE
+#define DM_REG_EDCA_VO_11N                              0x500
+#define DM_REG_EDCA_VI_11N                              0x504
+#define DM_REG_EDCA_BE_11N                              0x508
+#define DM_REG_EDCA_BK_11N                              0x50C
+#define DM_REG_TXPAUSE_11N                              0x522
+#define DM_REG_RESP_TX_11N                              0x6D8
+#define DM_REG_ANT_TRAIN_PARA1_11N      0x7b0
+#define DM_REG_ANT_TRAIN_PARA2_11N      0x7b4
+
+/*DIG Related*/
+#define DM_BIT_IGI_11N                                  0x0000007F
+#define DM_BIT_IGI_11AC                                 0xFFFFFFFF
+
+#define HAL_DM_DIG_DISABLE                      BIT(0)
+#define HAL_DM_HIPWR_DISABLE            BIT(1)
+
+#define OFDM_TABLE_LENGTH                       43
+#define CCK_TABLE_LENGTH                        33
+
+#define OFDM_TABLE_SIZE                         37
+#define CCK_TABLE_SIZE                          33
+
+#define BW_AUTO_SWITCH_HIGH_LOW         25
+#define BW_AUTO_SWITCH_LOW_HIGH         30
+
+#define DM_DIG_THRESH_HIGH                      40
+#define DM_DIG_THRESH_LOW                       35
+
+#define DM_FALSEALARM_THRESH_LOW        400
+#define DM_FALSEALARM_THRESH_HIGH       1000
+
+#define DM_DIG_MAX                                      0x3e
+#define DM_DIG_MIN                                      0x1e
+
+#define DM_DIG_MAX_AP                           0x32
+#define DM_DIG_MIN_AP                           0x20
+
+#define DM_DIG_FA_UPPER                         0x3e
+#define DM_DIG_FA_LOWER                         0x1e
+#define DM_DIG_FA_TH0                           200
+#define DM_DIG_FA_TH1                           0x300
+#define DM_DIG_FA_TH2                           0x400
+
+#define DM_DIG_BACKOFF_MAX                      12
+#define DM_DIG_BACKOFF_MIN                      -4
+#define DM_DIG_BACKOFF_DEFAULT          10
+
+#define RXPATHSELECTION_SS_TH_LOW       30
+#define RXPATHSELECTION_DIFF_TH         18
+
+#define DM_RATR_STA_INIT                        0
+#define DM_RATR_STA_HIGH                        1
+#define DM_RATR_STA_MIDDLE                      2
+#define DM_RATR_STA_LOW                         3
+
+#define CTS2SELF_THVAL                          30
+#define REGC38_TH                                       20
+
+#define WAIOTTHVAL                                      25
+
+#define TXHIGHPWRLEVEL_NORMAL           0
+#define TXHIGHPWRLEVEL_LEVEL1           1
+#define TXHIGHPWRLEVEL_LEVEL2           2
+#define TXHIGHPWRLEVEL_BT1                      3
+#define TXHIGHPWRLEVEL_BT2                      4
+
+#define DM_TYPE_BYFW                            0
+#define DM_TYPE_BYDRIVER                        1
+
+#define TX_POWER_NEAR_FIELD_THRESH_LVL2 74
+#define TX_POWER_NEAR_FIELD_THRESH_LVL1 67
+#define TXPWRTRACK_MAX_IDX 6
+
+/* Dynamic ATC switch */
+#define ATC_STATUS_OFF                          0x0     /* enable */
+#define ATC_STATUS_ON                           0x1     /* disable */
+#define CFO_THRESHOLD_XTAL                      10      /* kHz */
+#define CFO_THRESHOLD_ATC                       80      /* kHz */
+
+#define AVG_THERMAL_NUM_8812A   4
+#define TXPWR_TRACK_TABLE_SIZE  30
+#define MAX_PATH_NUM_8812A              2
+#define MAX_PATH_NUM_8821A              1
+
+enum FAT_STATE {
+        FAT_NORMAL_STATE        = 0,
+        FAT_TRAINING_STATE = 1,
+};
+
+enum tag_dynamic_init_gain_operation_type_definition {
+        DIG_TYPE_THRESH_HIGH = 0,
+        DIG_TYPE_THRESH_LOW = 1,
+        DIG_TYPE_BACKOFF = 2,
+        DIG_TYPE_RX_GAIN_MIN = 3,
+        DIG_TYPE_RX_GAIN_MAX = 4,
+        DIG_TYPE_ENABLE = 5,
+        DIG_TYPE_DISABLE = 6,
+        DIG_OP_TYPE_MAX
+};
+
+enum tag_cck_packet_detection_threshold_type_definition {
+        CCK_PD_STAGE_LOWRSSI = 0,
+        CCK_PD_STAGE_HIGHRSSI = 1,
+        CCK_FA_STAGE_LOW = 2,
+        CCK_FA_STAGE_HIGH = 3,
+        CCK_PD_STAGE_MAX = 4,
+};
+
+enum dm_1r_cca_e {
+        CCA_1R = 0,
+        CCA_2R = 1,
+        CCA_MAX = 2,
+};
+
+enum dm_rf_e {
+        RF_SAVE = 0,
+        RF_NORMAL = 1,
+        RF_MAX = 2,
+};
+
+enum dm_sw_ant_switch_e {
+        ANS_ANTENNA_B = 1,
+        ANS_ANTENNA_A = 2,
+        ANS_ANTENNA_MAX = 3,
+};
+
+enum dm_dig_ext_port_alg_e {
+        DIG_EXT_PORT_STAGE_0 = 0,
+        DIG_EXT_PORT_STAGE_1 = 1,
+        DIG_EXT_PORT_STAGE_2 = 2,
+        DIG_EXT_PORT_STAGE_3 = 3,
+        DIG_EXT_PORT_STAGE_MAX = 4,
+};
+
+enum dm_dig_connect_e {
+        DIG_STA_DISCONNECT = 0,
+        DIG_STA_CONNECT = 1,
+        DIG_STA_BEFORE_CONNECT = 2,
+        DIG_MULTISTA_DISCONNECT = 3,
+        DIG_MULTISTA_CONNECT = 4,
+        DIG_CONNECT_MAX
+};
+
+enum pwr_track_control_method {
+        BBSWING,
+        TXAGC,
+        MIX_MODE
+};
+
+#define BT_RSSI_STATE_NORMAL_POWER      BIT_OFFSET_LEN_MASK_32(0, 1)
+#define BT_RSSI_STATE_AMDPU_OFF         BIT_OFFSET_LEN_MASK_32(1, 1)
+#define BT_RSSI_STATE_SPECIAL_LOW       BIT_OFFSET_LEN_MASK_32(2, 1)
+#define BT_RSSI_STATE_BG_EDCA_LOW       BIT_OFFSET_LEN_MASK_32(3, 1)
+#define BT_RSSI_STATE_TXPOWER_LOW       BIT_OFFSET_LEN_MASK_32(4, 1)
+#define GET_UNDECORATED_AVERAGE_RSSI(_priv)     \
+        ((((struct rtl_priv *)(_priv))->mac80211.opmode ==      \
+                              NL80211_IFTYPE_ADHOC) ? \
+        (((struct rtl_priv *)(_priv))->dm.entry_min_undec_sm_pwdb) : \
+        (((struct rtl_priv *)(_priv))->dm.undec_sm_pwdb))
+
+void rtl8821ae_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw,
+                                        u8 *pdesc, u32 mac_id);
+void rtl8821ae_dm_ant_sel_statistics(struct ieee80211_hw *hw,
+                                     u8 antsel_tr_mux, u32 mac_id,
+                                     u32 rx_pwdb_all);
+void rtl8821ae_dm_fast_antenna_training_callback(unsigned long data);
+void rtl8821ae_dm_init(struct ieee80211_hw *hw);
+void rtl8821ae_dm_watchdog(struct ieee80211_hw *hw);
+void rtl8821ae_dm_write_dig(struct ieee80211_hw *hw, u8 current_igi);
+void rtl8821ae_dm_init_edca_turbo(struct ieee80211_hw *hw);
+void rtl8821ae_dm_check_txpower_tracking_thermalmeter(struct ieee80211_hw *hw);
+void rtl8821ae_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw);
+void rtl8821ae_dm_txpower_track_adjust(struct ieee80211_hw *hw,
+                                       u8 type, u8 *pdirection,
+                                       u32 *poutwrite_val);
+void rtl8821ae_dm_clear_txpower_tracking_state(struct ieee80211_hw *hw);
+void rtl8821ae_dm_write_cck_cca_thres(struct ieee80211_hw *hw, u8 current_cca);
+void rtl8821ae_dm_initialize_txpower_tracking_thermalmeter(struct ieee80211_hw *hw);
+void rtl8812ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,
+                                      enum pwr_track_control_method method,
+                                      u8 rf_path,
+                                      u8 channel_mapped_index);
+void rtl8821ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,
+                                      enum pwr_track_control_method method,
+                                      u8 rf_path, u8 channel_mapped_index);
+
+void rtl8821ae_dm_update_init_rate(struct ieee80211_hw *hw, u8 rate);
+u8 rtl8821ae_hw_rate_to_mrate(struct ieee80211_hw *hw, u8 rate);
+void rtl8812ae_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw *hw);
+void rtl8821ae_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw *hw);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/fw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/fw.c
new file mode 100644
index 000000000000..95e95626b632
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/fw.c
@@ -0,0 +1,1857 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../base.h"
+#include "../core.h"
+#include "reg.h"
+#include "def.h"
+#include "fw.h"
+#include "dm.h"
+
+static void _rtl8821ae_enable_fw_download(struct ieee80211_hw *hw, bool enable)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp;
+
+        if (enable) {
+                rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x05);
+
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL + 2);
+                rtl_write_byte(rtlpriv, REG_MCUFWDL + 2, tmp & 0xf7);
+
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL);
+        } else {
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL);
+                rtl_write_byte(rtlpriv, REG_MCUFWDL, tmp & 0xfe);
+                tmp = rtl_read_byte(rtlpriv, REG_MCUFWDL);
+        }
+}
+
+static void _rtl8821ae_fw_block_write(struct ieee80211_hw *hw,
+                                      const u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 blocksize = sizeof(u32);
+        u8 *bufferptr = (u8 *)buffer;
+        u32 *pu4byteptr = (u32 *)buffer;
+        u32 i, offset, blockcount, remainsize;
+
+        blockcount = size / blocksize;
+        remainsize = size % blocksize;
+
+        for (i = 0; i < blockcount; i++) {
+                offset = i * blocksize;
+                rtl_write_dword(rtlpriv, (FW_8821AE_START_ADDRESS + offset),
+                                *(pu4byteptr + i));
+        }
+
+        if (remainsize) {
+                offset = blockcount * blocksize;
+                bufferptr += offset;
+                for (i = 0; i < remainsize; i++) {
+                        rtl_write_byte(rtlpriv, (FW_8821AE_START_ADDRESS +
+                                        offset + i), *(bufferptr + i));
+                }
+        }
+}
+
+static void _rtl8821ae_fw_page_write(struct ieee80211_hw *hw,
+                                     u32 page, const u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 value8;
+        u8 u8page = (u8)(page & 0x07);
+
+        value8 = (rtl_read_byte(rtlpriv, REG_MCUFWDL + 2) & 0xF8) | u8page;
+
+        rtl_write_byte(rtlpriv, (REG_MCUFWDL + 2), value8);
+        _rtl8821ae_fw_block_write(hw, buffer, size);
+}
+
+static void _rtl8821ae_fill_dummy(u8 *pfwbuf, u32 *pfwlen)
+{
+        u32 fwlen = *pfwlen;
+        u8 remain = (u8)(fwlen % 4);
+
+        remain = (remain == 0) ? 0 : (4 - remain);
+
+        while (remain > 0) {
+                pfwbuf[fwlen] = 0;
+                fwlen++;
+                remain--;
+        }
+
+        *pfwlen = fwlen;
+}
+
+static void _rtl8821ae_write_fw(struct ieee80211_hw *hw,
+                                enum version_8821ae version,
+                                u8 *buffer, u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 *bufferptr = (u8 *)buffer;
+        u32 pagenums, remainsize;
+        u32 page, offset;
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "FW size is %d bytes,\n", size);
+
+        _rtl8821ae_fill_dummy(bufferptr, &size);
+
+        pagenums = size / FW_8821AE_PAGE_SIZE;
+        remainsize = size % FW_8821AE_PAGE_SIZE;
+
+        if (pagenums > 8) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Page numbers should not greater then 8\n");
+        }
+
+        for (page = 0; page < pagenums; page++) {
+                offset = page * FW_8821AE_PAGE_SIZE;
+                _rtl8821ae_fw_page_write(hw, page, (bufferptr + offset),
+                                         FW_8821AE_PAGE_SIZE);
+        }
+
+        if (remainsize) {
+                offset = pagenums * FW_8821AE_PAGE_SIZE;
+                page = pagenums;
+                _rtl8821ae_fw_page_write(hw, page, (bufferptr + offset),
+                                         remainsize);
+        }
+}
+
+static int _rtl8821ae_fw_free_to_go(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int err = -EIO;
+        u32 counter = 0;
+        u32 value32;
+
+        do {
+                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+        } while ((counter++ < FW_8821AE_POLLING_TIMEOUT_COUNT) &&
+                 (!(value32 & FWDL_CHKSUM_RPT)));
+
+        if (counter >= FW_8821AE_POLLING_TIMEOUT_COUNT) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "chksum report faill ! REG_MCUFWDL:0x%08x .\n",
+                          value32);
+                goto exit;
+        }
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_EMERG,
+                 "Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32);
+
+        value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+        value32 |= MCUFWDL_RDY;
+        value32 &= ~WINTINI_RDY;
+        rtl_write_dword(rtlpriv, REG_MCUFWDL, value32);
+
+        rtl8821ae_firmware_selfreset(hw);
+
+        counter = 0;
+        do {
+                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
+                if (value32 & WINTINI_RDY) {
+                        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                                 "Polling FW ready success!! REG_MCUFWDL:0x%08x .\n",
+                                  value32);
+                        err = 0;
+                        goto exit;
+                }
+
+                udelay(FW_8821AE_POLLING_DELAY);
+        } while (counter++ < FW_8821AE_POLLING_TIMEOUT_COUNT);
+
+        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                 "Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n",
+                 value32);
+
+exit:
+        return err;
+}
+
+static void _rtl8821ae_wait_for_h2c_cmd_finish(struct rtl_priv *rtlpriv)
+{
+        u8 val;
+        u16 count = 0;
+
+        do {
+                val = rtl_read_byte(rtlpriv, REG_HMETFR);
+                mdelay(1);
+                count++;
+        } while ((val & 0x0F) && (count < 1000));
+}
+
+int rtl8821ae_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl8821a_firmware_header *pfwheader;
+        u8 *pfwdata;
+        u32 fwsize;
+        int err;
+        bool support_remote_wakeup;
+        enum version_8821ae version = rtlhal->version;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
+                                      (u8 *)(&support_remote_wakeup));
+
+        if (support_remote_wakeup)
+                _rtl8821ae_wait_for_h2c_cmd_finish(rtlpriv);
+
+        if (buse_wake_on_wlan_fw) {
+                if (!rtlhal->wowlan_firmware)
+                        return 1;
+
+                pfwheader =
+                  (struct rtl8821a_firmware_header *)rtlhal->wowlan_firmware;
+                rtlhal->fw_version = pfwheader->version;
+                rtlhal->fw_subversion = pfwheader->subversion;
+                pfwdata = (u8 *)rtlhal->wowlan_firmware;
+                fwsize = rtlhal->wowlan_fwsize;
+        } else {
+                if (!rtlhal->pfirmware)
+                        return 1;
+
+                pfwheader =
+                  (struct rtl8821a_firmware_header *)rtlhal->pfirmware;
+                rtlhal->fw_version = pfwheader->version;
+                rtlhal->fw_subversion = pfwheader->subversion;
+                pfwdata = (u8 *)rtlhal->pfirmware;
+                fwsize = rtlhal->fwsize;
+        }
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
+                 "%s Firmware SIZE %d\n",
+                 buse_wake_on_wlan_fw ? "Wowlan" : "Normal", fwsize);
+
+        if (IS_FW_HEADER_EXIST_8812(pfwheader) ||
+            IS_FW_HEADER_EXIST_8821(pfwheader)) {
+                RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
+                         "Firmware Version(%d), Signature(%#x)\n",
+                         pfwheader->version, pfwheader->signature);
+
+                pfwdata = pfwdata + sizeof(struct rtl8821a_firmware_header);
+                fwsize = fwsize - sizeof(struct rtl8821a_firmware_header);
+        }
+
+        if (rtlhal->mac_func_enable) {
+                if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) {
+                        rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
+                        rtl8821ae_firmware_selfreset(hw);
+                }
+        }
+        _rtl8821ae_enable_fw_download(hw, true);
+        _rtl8821ae_write_fw(hw, version, pfwdata, fwsize);
+        _rtl8821ae_enable_fw_download(hw, false);
+
+        err = _rtl8821ae_fw_free_to_go(hw);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Firmware is not ready to run!\n");
+        } else {
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                         "Firmware is ready to run!\n");
+        }
+
+        return 0;
+}
+
+#if (USE_SPECIFIC_FW_TO_SUPPORT_WOWLAN == 1)
+void rtl8821ae_set_fw_related_for_wowlan(struct ieee80211_hw *hw,
+                                         bool used_wowlan_fw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        /* 1. Before WoWLAN or After WOWLAN we need to re-download Fw. */
+        if (rtl8821ae_download_fw(hw, used_wowlan_fw)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                         "Re-Download Firmware failed!!\n");
+                rtlhal->fw_ready = false;
+                return;
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "Re-Download Firmware Success !!\n");
+        rtlhal->fw_ready = true;
+
+        /* 2. Re-Init the variables about Fw related setting. */
+        ppsc->fw_current_inpsmode = false;
+        rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON_8821AE;
+        rtlhal->fw_clk_change_in_progress = false;
+        rtlhal->allow_sw_to_change_hwclc = false;
+        rtlhal->last_hmeboxnum = 0;
+}
+#endif
+
+static bool _rtl8821ae_check_fw_read_last_h2c(struct ieee80211_hw *hw,
+                                              u8 boxnum)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 val_hmetfr;
+        bool result = false;
+
+        val_hmetfr = rtl_read_byte(rtlpriv, REG_HMETFR);
+        if (((val_hmetfr >> boxnum) & BIT(0)) == 0)
+                result = true;
+        return result;
+}
+
+static void _rtl8821ae_fill_h2c_command(struct ieee80211_hw *hw,
+                                        u8 element_id, u32 cmd_len,
+                                        u8 *cmdbuffer)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 boxnum = 0;
+        u16 box_reg = 0, box_extreg = 0;
+        u8 u1b_tmp = 0;
+        bool isfw_read = false;
+        u8 buf_index = 0;
+        bool bwrite_sucess = false;
+        u8 wait_h2c_limmit = 100;
+        /*u8 wait_writeh2c_limmit = 100;*/
+        u8 boxcontent[4], boxextcontent[4];
+        u32 h2c_waitcounter = 0;
+        unsigned long flag = 0;
+        u8 idx = 0;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");
+
+        while (true) {
+                spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
+                if (rtlhal->h2c_setinprogress) {
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                 "H2C set in progress! Wait to set..element_id(%d).\n",
+                                 element_id);
+
+                        while (rtlhal->h2c_setinprogress) {
+                                spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
+                                                       flag);
+                                h2c_waitcounter++;
+                                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                         "Wait 100 us (%d times)...\n",
+                                          h2c_waitcounter);
+                                udelay(100);
+
+                                if (h2c_waitcounter > 1000)
+                                        return;
+                                spin_lock_irqsave(&rtlpriv->locks.h2c_lock,
+                                                  flag);
+                        }
+                        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+                } else {
+                        rtlhal->h2c_setinprogress = true;
+                        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+                        break;
+                }
+        }
+
+        while (!bwrite_sucess) {
+                boxnum = rtlhal->last_hmeboxnum;
+                switch (boxnum) {
+                case 0:
+                        box_reg = REG_HMEBOX_0;
+                        box_extreg = REG_HMEBOX_EXT_0;
+                        break;
+                case 1:
+                        box_reg = REG_HMEBOX_1;
+                        box_extreg = REG_HMEBOX_EXT_1;
+                        break;
+                case 2:
+                        box_reg = REG_HMEBOX_2;
+                        box_extreg = REG_HMEBOX_EXT_2;
+                        break;
+                case 3:
+                        box_reg = REG_HMEBOX_3;
+                        box_extreg = REG_HMEBOX_EXT_3;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
+                        break;
+                }
+
+                isfw_read = false;
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_CR);
+
+                if (u1b_tmp != 0xEA) {
+                        isfw_read = true;
+                } else {
+                        if (rtl_read_byte(rtlpriv, REG_TXDMA_STATUS) == 0xEA ||
+                            rtl_read_byte(rtlpriv, REG_TXPKT_EMPTY) == 0xEA)
+                                rtl_write_byte(rtlpriv, REG_SYS_CFG1 + 3, 0xFF);
+                }
+
+                if (isfw_read) {
+                        wait_h2c_limmit = 100;
+                        isfw_read =
+                          _rtl8821ae_check_fw_read_last_h2c(hw, boxnum);
+                        while (!isfw_read) {
+                                /*wait until Fw read*/
+                                wait_h2c_limmit--;
+                                if (wait_h2c_limmit == 0) {
+                                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                                 "Waiting too long for FW read clear HMEBox(%d)!\n",
+                                                 boxnum);
+                                        break;
+                                }
+
+                                udelay(10);
+
+                                isfw_read =
+                                  _rtl8821ae_check_fw_read_last_h2c(hw, boxnum);
+                                u1b_tmp = rtl_read_byte(rtlpriv, 0x130);
+                                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                         "Waiting for FW read clear HMEBox(%d)!!! 0x130 = %2x\n",
+                                         boxnum, u1b_tmp);
+                        }
+                }
+
+                if (!isfw_read) {
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
+                                 boxnum);
+                        break;
+                }
+
+                memset(boxcontent, 0, sizeof(boxcontent));
+                memset(boxextcontent, 0, sizeof(boxextcontent));
+                boxcontent[0] = element_id;
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                         "Write element_id box_reg(%4x) = %2x\n",
+                         box_reg, element_id);
+
+                switch (cmd_len) {
+                case 1:
+                case 2:
+                case 3:
+                        /*boxcontent[0] &= ~(BIT(7));*/
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, cmd_len);
+
+                        for (idx = 0; idx < 4; idx++) {
+                                rtl_write_byte(rtlpriv, box_reg + idx,
+                                               boxcontent[idx]);
+                        }
+                        break;
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                        /*boxcontent[0] |= (BIT(7));*/
+                        memcpy((u8 *)(boxextcontent),
+                               cmdbuffer + buf_index+3, cmd_len-3);
+                        memcpy((u8 *)(boxcontent) + 1,
+                               cmdbuffer + buf_index, 3);
+
+                        for (idx = 0; idx < 4; idx++) {
+                                rtl_write_byte(rtlpriv, box_extreg + idx,
+                                               boxextcontent[idx]);
+                        }
+
+                        for (idx = 0; idx < 4; idx++) {
+                                rtl_write_byte(rtlpriv, box_reg + idx,
+                                               boxcontent[idx]);
+                        }
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
+                        break;
+                }
+
+                bwrite_sucess = true;
+
+                rtlhal->last_hmeboxnum = boxnum + 1;
+                if (rtlhal->last_hmeboxnum == 4)
+                        rtlhal->last_hmeboxnum = 0;
+
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
+                         "pHalData->last_hmeboxnum  = %d\n",
+                          rtlhal->last_hmeboxnum);
+        }
+
+        spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
+        rtlhal->h2c_setinprogress = false;
+        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
+}
+
+void rtl8821ae_fill_h2c_cmd(struct ieee80211_hw *hw,
+                            u8 element_id, u32 cmd_len, u8 *cmdbuffer)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 tmp_cmdbuf[2];
+
+        if (!rtlhal->fw_ready) {
+                RT_ASSERT(false,
+                          "return H2C cmd because of Fw download fail!!!\n");
+                return;
+        }
+
+        memset(tmp_cmdbuf, 0, 8);
+        memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
+        _rtl8821ae_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
+}
+
+void rtl8821ae_firmware_selfreset(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 u1b_tmp;
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL+1);
+                rtl_write_byte(rtlpriv, REG_RSV_CTRL+1, (u1b_tmp & (~BIT(3))));
+        } else {
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL+1);
+                rtl_write_byte(rtlpriv, REG_RSV_CTRL+1, (u1b_tmp & (~BIT(0))));
+        }
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp & (~BIT(2))));
+        udelay(50);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL+1);
+                rtl_write_byte(rtlpriv, REG_RSV_CTRL+1, (u1b_tmp | BIT(3)));
+        } else {
+                u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL+1);
+                rtl_write_byte(rtlpriv, REG_RSV_CTRL+1, (u1b_tmp | BIT(0)));
+        }
+
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp | BIT(2)));
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "_8051Reset8812ae(): 8051 reset success .\n");
+}
+
+void rtl8821ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 u1_h2c_set_pwrmode[H2C_8821AE_PWEMODE_LENGTH] = { 0 };
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 rlbm, power_state = 0;
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
+
+        SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));
+        rlbm = 0;/*YJ,temp,120316. FW now not support RLBM=2.*/
+        SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, rlbm);
+        SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,
+                                         (rtlpriv->mac80211.p2p) ?
+                                         ppsc->smart_ps : 1);
+        SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(u1_h2c_set_pwrmode,
+                                               ppsc->reg_max_lps_awakeintvl);
+        SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(u1_h2c_set_pwrmode, 0);
+        if (mode == FW_PS_ACTIVE_MODE)
+                power_state |= FW_PWR_STATE_ACTIVE;
+        else
+                power_state |= FW_PWR_STATE_RF_OFF;
+
+        SET_H2CCMD_PWRMODE_PARM_PWR_STATE(u1_h2c_set_pwrmode, power_state);
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                      "rtl92c_set_fw_pwrmode(): u1_h2c_set_pwrmode\n",
+                      u1_h2c_set_pwrmode, H2C_8821AE_PWEMODE_LENGTH);
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_SETPWRMODE,
+                               H2C_8821AE_PWEMODE_LENGTH,
+                               u1_h2c_set_pwrmode);
+}
+
+void rtl8821ae_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw,
+                                           u8 mstatus)
+{
+        u8 parm[3] = { 0, 0, 0 };
+        /* parm[0]: bit0=0-->Disconnect, bit0=1-->Connect
+         *          bit1=0-->update Media Status to MACID
+         *          bit1=1-->update Media Status from MACID to MACID_End
+         * parm[1]: MACID, if this is INFRA_STA, MacID = 0
+         * parm[2]: MACID_End
+         */
+
+        SET_H2CCMD_MSRRPT_PARM_OPMODE(parm, mstatus);
+        SET_H2CCMD_MSRRPT_PARM_MACID_IND(parm, 0);
+
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_MSRRPT, 3, parm);
+}
+
+void rtl8821ae_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,
+                                      u8 ap_offload_enable)
+{
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u8 u1_apoffload_parm[H2C_8821AE_AP_OFFLOAD_LENGTH] = { 0 };
+
+        SET_H2CCMD_AP_OFFLOAD_ON(u1_apoffload_parm, ap_offload_enable);
+        SET_H2CCMD_AP_OFFLOAD_HIDDEN(u1_apoffload_parm, mac->hiddenssid);
+        SET_H2CCMD_AP_OFFLOAD_DENYANY(u1_apoffload_parm, 0);
+
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AP_OFFLOAD,
+                               H2C_8821AE_AP_OFFLOAD_LENGTH,
+                               u1_apoffload_parm);
+}
+
+void rtl8821ae_set_fw_wowlan_mode(struct ieee80211_hw *hw, bool func_en)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        u8 fw_wowlan_info[H2C_8821AE_WOWLAN_LENGTH] = {0};
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "enable(%d)\n", func_en);
+
+        SET_8812_H2CCMD_WOWLAN_FUNC_ENABLE(fw_wowlan_info,
+                                           (func_en ? true : false));
+
+        SET_8812_H2CCMD_WOWLAN_PATTERN_MATCH_ENABLE(fw_wowlan_info,
+                ((ppsc->wo_wlan_mode & WAKE_ON_PATTERN_MATCH) ? 1 : 0));
+        SET_8812_H2CCMD_WOWLAN_MAGIC_PKT_ENABLE(fw_wowlan_info,
+                ((ppsc->wo_wlan_mode & WAKE_ON_MAGIC_PACKET) ? 1 : 0));
+
+        SET_8812_H2CCMD_WOWLAN_UNICAST_PKT_ENABLE(fw_wowlan_info, 0);
+        SET_8812_H2CCMD_WOWLAN_ALL_PKT_DROP(fw_wowlan_info, false);
+        SET_8812_H2CCMD_WOWLAN_GPIO_ACTIVE(fw_wowlan_info, 0);
+        SET_8812_H2CCMD_WOWLAN_DISCONNECT_WAKE_UP(fw_wowlan_info, 1);
+        SET_8812_H2CCMD_WOWLAN_GPIONUM(fw_wowlan_info, 0);
+        SET_8812_H2CCMD_WOWLAN_GPIO_DURATION(fw_wowlan_info, 0);
+
+        RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_DMESG,
+                      "wowlan mode: cmd 0x80: Content:\n",
+                      fw_wowlan_info, H2C_8821AE_WOWLAN_LENGTH);
+
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_WO_WLAN,
+                               H2C_8821AE_WOWLAN_LENGTH,
+                               fw_wowlan_info);
+}
+
+void rtl8821ae_set_fw_remote_wake_ctrl_cmd(struct ieee80211_hw *hw,
+                                           u8 enable)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 remote_wake_ctrl_parm[H2C_8821AE_REMOTE_WAKE_CTRL_LEN] = {0};
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                 "enable=%d, ARP offload=%d, GTK offload=%d\n",
+                 enable, ppsc->arp_offload_enable, ppsc->gtk_offload_enable);
+
+        SET_8812_H2CCMD_REMOTE_WAKECTRL_ENABLE(remote_wake_ctrl_parm, enable);
+        SET_8812_H2CCMD_REMOTE_WAKE_CTRL_ARP_OFFLOAD_EN(remote_wake_ctrl_parm,
+                                        (ppsc->arp_offload_enable ? 1 : 0));
+        SET_8812_H2CCMD_REMOTE_WAKE_CTRL_GTK_OFFLOAD_EN(remote_wake_ctrl_parm,
+                                        (ppsc->gtk_offload_enable ? 1 : 0));
+        SET_8812_H2CCMD_REMOTE_WAKE_CTRL_REALWOWV2_EN(remote_wake_ctrl_parm,
+                                        (rtlhal->real_wow_v2_enable ? 1 : 0));
+
+        RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,
+                      "remote_wake_ctrl: cmd 0x4: Content:\n",
+                      remote_wake_ctrl_parm, H2C_8821AE_REMOTE_WAKE_CTRL_LEN);
+
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_REMOTE_WAKE_CTRL,
+                               H2C_8821AE_REMOTE_WAKE_CTRL_LEN,
+                               remote_wake_ctrl_parm);
+}
+
+void rtl8821ae_set_fw_keep_alive_cmd(struct ieee80211_hw *hw,
+                                     bool func_en)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 keep_alive_info[H2C_8821AE_KEEP_ALIVE_CTRL_LENGTH] = {0};
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Enable(%d)\n", func_en);
+
+        SET_8812_H2CCMD_KEEP_ALIVE_ENABLE(keep_alive_info, func_en);
+        /* 1: the period is controled by driver, 0: by Fw default */
+        SET_8812_H2CCMD_KEEP_ALIVE_ACCPEPT_USER_DEFINED(keep_alive_info, 1);
+        SET_8812_H2CCMD_KEEP_ALIVE_PERIOD(keep_alive_info, 10); /* 10 sec */
+
+        RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,
+                      "keep alive: cmd 0x3: Content:\n",
+                      keep_alive_info, H2C_8821AE_KEEP_ALIVE_CTRL);
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_KEEP_ALIVE_CTRL,
+                               H2C_8821AE_KEEP_ALIVE_CTRL_LENGTH,
+                               keep_alive_info);
+}
+
+void rtl8821ae_set_fw_disconnect_decision_ctrl_cmd(struct ieee80211_hw *hw,
+                                                   bool enabled)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 parm[H2C_8821AE_DISCONNECT_DECISION_CTRL_LEN] = {0};
+
+        SET_8812_H2CCMD_DISCONNECT_DECISION_CTRL_ENABLE(parm, enabled);
+        SET_8812_H2CCMD_DISCONNECT_DECISION_CTRL_USER_SETTING(parm, 1);
+        SET_8812_H2CCMD_DISCONNECT_DECISION_CTRL_CHECK_PERIOD(parm, 30);
+        SET_8812_H2CCMD_DISCONNECT_DECISION_CTRL_TRYPKT_NUM(parm, 3);
+
+        RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,
+                      "disconnect_decision_ctrl: cmd 0x4: Content:\n",
+                      parm, H2C_8821AE_DISCONNECT_DECISION_CTRL_LEN);
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_DISCONNECT_DECISION,
+                               H2C_8821AE_DISCONNECT_DECISION_CTRL_LEN, parm);
+}
+
+void rtl8821ae_set_fw_global_info_cmd(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_security *sec = &rtlpriv->sec;
+        u8 remote_wakeup_sec_info[H2C_8821AE_AOAC_GLOBAL_INFO_LEN] = {0};
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                 "PairwiseEncAlgorithm=%d, GroupEncAlgorithm=%d\n",
+                 sec->pairwise_enc_algorithm, sec->group_enc_algorithm);
+
+        SET_8812_H2CCMD_AOAC_GLOBAL_INFO_PAIRWISE_ENC_ALG(
+                                                remote_wakeup_sec_info,
+                                                sec->pairwise_enc_algorithm);
+        SET_8812_H2CCMD_AOAC_GLOBAL_INFO_GROUP_ENC_ALG(remote_wakeup_sec_info,
+                                                      sec->group_enc_algorithm);
+
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_GLOBAL_INFO,
+                               H2C_8821AE_AOAC_GLOBAL_INFO_LEN,
+                               remote_wakeup_sec_info);
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_TRACE,
+                      "rtl8821ae_set_global_info: cmd 0x82:\n",
+                      remote_wakeup_sec_info, H2C_8821AE_AOAC_GLOBAL_INFO_LEN);
+}
+
+#define BEACON_PG               0
+#define PSPOLL_PG               1
+#define NULL_PG                 2
+#define QOSNULL_PG              3
+#define ARPRESP_PG              4
+#define REMOTE_PG               5
+#define GTKEXT_PG               6
+
+#define TOTAL_RESERVED_PKT_LEN_8812     3584
+#define TOTAL_RESERVED_PKT_LEN_8821     1792
+
+static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
+        /* page 0: beacon */
+        0x80, 0x00, 0x00, 0x00,  0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0x00, 0xe0,  0x4c, 0x02, 0xe2, 0x64,
+        0x40, 0x16, 0x9f, 0x23,  0xd4, 0x46, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x64, 0x00, 0x20, 0x04,  0x00, 0x06, 0x64, 0x6c,
+        0x69, 0x6e, 0x6b, 0x31,  0x01, 0x08, 0x82, 0x84,
+        0x8b, 0x96, 0x0c, 0x18,  0x30, 0x48, 0x03, 0x01,
+        0x0b, 0x06, 0x02, 0x00,  0x00, 0x2a, 0x01, 0x8b,
+        0x32, 0x04, 0x12, 0x24,  0x60, 0x6c, 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,
+        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, 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,  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, 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,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x10, 0x00, 0x28, 0x8c,  0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x81, 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,
+        /* page 1: ps-poll */
+        0xa4, 0x10, 0x01, 0xc0,  0x40, 0x16, 0x9f, 0x23,
+        0xd4, 0x46, 0x00, 0xe0,  0x4c, 0x02, 0xe2, 0x64,
+        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, 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,  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, 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,
+        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, 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,  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, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x18, 0x00, 0x28, 0x8c,  0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        /* page 2: null data */
+        0x48, 0x01, 0x00, 0x00,  0x40, 0x16, 0x9f, 0x23,
+        0xd4, 0x46, 0x00, 0xe0,  0x4c, 0x02, 0xe2, 0x64,
+        0x40, 0x16, 0x9f, 0x23,  0xd4, 0x46, 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,
+        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, 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,  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, 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,
+        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, 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,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x1A, 0x00, 0x28, 0x8C,  0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        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,
+        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, 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,  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, 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,
+        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, 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,  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, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x3C, 0x00, 0x28, 0x8C,  0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        /* page 4~6 is for wowlan */
+        /* page 4: 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,
+        0xAA, 0xAA, 0x03, 0x00,  0x00, 0x00, 0x08, 0x06,
+        0x00, 0x01, 0x08, 0x00,  0x06, 0x04, 0x00, 0x02,
+        0x00, 0xE0, 0x4C, 0x02,  0x51, 0x02, 0x00, 0x00,
+        0x00, 0x00, 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,
+        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, 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,  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, 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,
+        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, 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,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        /* page 5: H2C_REMOTE_WAKE_CTRL_INFO */
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        /* page 6: Rsvd GTK extend memory (zero memory) */
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+};
+
+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,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x64, 0x00, 0x20, 0x04,  0x00, 0x03, 0x32, 0x31,
+        0x35, 0x01, 0x08, 0x82,  0x84, 0x8B, 0x96, 0x0C,
+        0x12, 0x18, 0x24, 0x03,  0x01, 0x01, 0x06, 0x02,
+        0x00, 0x00, 0x2A, 0x01,  0x02, 0x32, 0x04, 0x30,
+        0x48, 0x60, 0x6C, 0x2D,  0x1A, 0xED, 0x09, 0x03,
+        0xFF, 0xFF, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x3D,
+        0x00, 0xDD, 0x07, 0x00,  0xE0, 0x4C, 0x02, 0x02,
+        0x08, 0x04, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 0x00, 0x00,
+        0x10, 0x00, 0x28, 0x8C,  0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x81, 0x00, 0x00,
+        0x04, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x18, 0x00, 0x28, 0x8C,  0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x1A, 0x00, 0x28, 0x8C,  0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x3C, 0x00, 0x28, 0x8C,  0x00, 0x12, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        /* page 4~6 is for wowlan */
+        /* page 4: 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,
+        0xAA, 0xAA, 0x03, 0x00,  0x00, 0x00, 0x08, 0x06,
+        0x00, 0x01, 0x08, 0x00,  0x06, 0x04, 0x00, 0x02,
+        0x00, 0xE0, 0x4C, 0x02,  0x51, 0x02, 0x00, 0x00,
+        0x00, 0x00, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        /* page 5: H2C_REMOTE_WAKE_CTRL_INFO */
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        /* page 6: Rsvd GTK extend memory (zero memory) */
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 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,
+        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, 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,  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, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+};
+
+void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
+                                  bool b_dl_finished, bool dl_whole_packets)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtlpriv);
+        struct sk_buff *skb = NULL;
+        u32 totalpacketlen;
+        bool rtstatus;
+        u8 u1RsvdPageLoc[5] = { 0 };
+        u8 u1RsvdPageLoc2[7] = { 0 };
+        bool b_dlok = false;
+        u8 *beacon;
+        u8 *p_pspoll;
+        u8 *nullfunc;
+        u8 *qosnull;
+        u8 *arpresp;
+
+        /*---------------------------------------------------------
+         *                      (1) beacon
+         *---------------------------------------------------------
+         */
+        beacon = &reserved_page_packet_8812[BEACON_PG * 512];
+        SET_80211_HDR_ADDRESS2(beacon, mac->mac_addr);
+        SET_80211_HDR_ADDRESS3(beacon, mac->bssid);
+
+        if (b_dl_finished) {
+                totalpacketlen = 512 - 40;
+                goto out;
+        }
+        /*-------------------------------------------------------
+         *                      (2) ps-poll
+         *--------------------------------------------------------
+         */
+        p_pspoll = &reserved_page_packet_8812[PSPOLL_PG * 512];
+        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);
+
+        /*--------------------------------------------------------
+         *                      (3) null data
+         *---------------------------------------------------------
+         */
+        nullfunc = &reserved_page_packet_8812[NULL_PG * 512];
+        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);
+
+        /*---------------------------------------------------------
+         *                      (4) Qos null data
+         *----------------------------------------------------------
+         */
+        qosnull = &reserved_page_packet_8812[QOSNULL_PG * 512];
+        SET_80211_HDR_ADDRESS1(qosnull, mac->bssid);
+        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);
+
+        if (!dl_whole_packets) {
+                totalpacketlen = 512 * (QOSNULL_PG + 1) - 40;
+                goto out;
+        }
+        /*---------------------------------------------------------
+         *                      (5) ARP Resp
+         *----------------------------------------------------------
+         */
+        arpresp = &reserved_page_packet_8812[ARPRESP_PG * 512];
+        SET_80211_HDR_ADDRESS1(arpresp, mac->bssid);
+        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);
+
+        /*---------------------------------------------------------
+         *                      (6) Remote Wake Ctrl
+         *----------------------------------------------------------
+         */
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
+                                                                REMOTE_PG);
+
+        /*---------------------------------------------------------
+         *                      (7) GTK Ext Memory
+         *----------------------------------------------------------
+         */
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
+
+        totalpacketlen = TOTAL_RESERVED_PKT_LEN_8812 - 40;
+
+out:
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
+                      "rtl8812ae_set_fw_rsvdpagepkt(): packet data\n",
+                      &reserved_page_packet_8812[0], totalpacketlen);
+
+        skb = dev_alloc_skb(totalpacketlen);
+        memcpy((u8 *)skb_put(skb, totalpacketlen),
+               &reserved_page_packet_8812, totalpacketlen);
+
+        rtstatus = rtl_cmd_send_packet(hw, skb);
+
+        if (rtstatus)
+                b_dlok = true;
+
+        if (!b_dl_finished && b_dlok) {
+                RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                              "H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
+                rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
+                                       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
+                if (dl_whole_packets) {
+                        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                                      "wowlan H2C_RSVDPAGE:\n", u1RsvdPageLoc2, 7);
+                        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
+                                               sizeof(u1RsvdPageLoc2), u1RsvdPageLoc2);
+                }
+        }
+
+        if (!b_dlok)
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set RSVD page location to Fw FAIL!!!!!!.\n");
+}
+
+void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
+                                  bool b_dl_finished, bool dl_whole_packets)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct sk_buff *skb = NULL;
+        u32 totalpacketlen;
+        bool rtstatus;
+        u8 u1RsvdPageLoc[5] = { 0 };
+        u8 u1RsvdPageLoc2[7] = { 0 };
+        bool b_dlok = false;
+        u8 *beacon;
+        u8 *p_pspoll;
+        u8 *nullfunc;
+        u8 *qosnull;
+        u8 *arpresp;
+
+        /*---------------------------------------------------------
+         *                      (1) beacon
+         *---------------------------------------------------------
+         */
+        beacon = &reserved_page_packet_8821[BEACON_PG * 256];
+        SET_80211_HDR_ADDRESS2(beacon, mac->mac_addr);
+        SET_80211_HDR_ADDRESS3(beacon, mac->bssid);
+
+        if (b_dl_finished) {
+                totalpacketlen = 256 - 40;
+                goto out;
+        }
+        /*-------------------------------------------------------
+         *                      (2) ps-poll
+         *--------------------------------------------------------
+         */
+        p_pspoll = &reserved_page_packet_8821[PSPOLL_PG * 256];
+        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);
+
+        /*--------------------------------------------------------
+         *                      (3) null data
+         *---------------------------------------------------------i
+         */
+        nullfunc = &reserved_page_packet_8821[NULL_PG * 256];
+        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);
+
+        /*---------------------------------------------------------
+         *                      (4) Qos null data
+         *----------------------------------------------------------
+         */
+        qosnull = &reserved_page_packet_8821[QOSNULL_PG * 256];
+        SET_80211_HDR_ADDRESS1(qosnull, mac->bssid);
+        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);
+
+        if (!dl_whole_packets) {
+                totalpacketlen = 256 * (QOSNULL_PG + 1) - 40;
+                goto out;
+        }
+        /*---------------------------------------------------------
+         *                      (5) ARP Resp
+         *----------------------------------------------------------
+         */
+        arpresp = &reserved_page_packet_8821[ARPRESP_PG * 256];
+        SET_80211_HDR_ADDRESS1(arpresp, mac->bssid);
+        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);
+
+        /*---------------------------------------------------------
+         *                      (6) Remote Wake Ctrl
+         *----------------------------------------------------------
+         */
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
+                                                                        REMOTE_PG);
+
+        /*---------------------------------------------------------
+         *                      (7) GTK Ext Memory
+         *----------------------------------------------------------
+         */
+        SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
+
+        totalpacketlen = TOTAL_RESERVED_PKT_LEN_8821 - 40;
+
+out:
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
+                      "rtl8821ae_set_fw_rsvdpagepkt(): packet data\n",
+                      &reserved_page_packet_8821[0], totalpacketlen);
+
+        skb = dev_alloc_skb(totalpacketlen);
+        memcpy((u8 *)skb_put(skb, totalpacketlen),
+               &reserved_page_packet_8821, totalpacketlen);
+
+        rtstatus = rtl_cmd_send_packet(hw, skb);
+
+        if (rtstatus)
+                b_dlok = true;
+
+        if (!b_dl_finished && b_dlok) {
+                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);
+                rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
+                                       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
+                if (dl_whole_packets) {
+                        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
+                                      "wowlan H2C_RSVDPAGE:\n",
+                                      u1RsvdPageLoc2, 7);
+                        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
+                                               sizeof(u1RsvdPageLoc2),
+                                               u1RsvdPageLoc2);
+                }
+        }
+
+        if (!b_dlok) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set RSVD page location to Fw FAIL!!!!!!.\n");
+        }
+}
+
+/*Should check FW support p2p or not.*/
+static void rtl8821ae_set_p2p_ctw_period_cmd(struct ieee80211_hw *hw, u8 ctwindow)
+{
+        u8 u1_ctwindow_period[1] = { ctwindow};
+
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_P2P_PS_CTW_CMD, 1,
+                               u1_ctwindow_period);
+}
+
+void rtl8821ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_p2p_ps_info *p2pinfo = &rtlps->p2p_ps_info;
+        struct p2p_ps_offload_t *p2p_ps_offload = &rtlhal->p2p_ps_offload;
+        u8      i;
+        u16     ctwindow;
+        u32     start_time, tsf_low;
+
+        switch (p2p_ps_state) {
+        case P2P_PS_DISABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
+                memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));
+                break;
+        case P2P_PS_ENABLE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
+                /* update CTWindow value. */
+                if (p2pinfo->ctwindow > 0) {
+                        p2p_ps_offload->ctwindow_en = 1;
+                        ctwindow = p2pinfo->ctwindow;
+                        rtl8821ae_set_p2p_ctw_period_cmd(hw, ctwindow);
+                }
+
+                /* hw only support 2 set of NoA */
+                for (i = 0 ; i < p2pinfo->noa_num ; i++) {
+                        /* To control the register setting for which NOA*/
+                        rtl_write_byte(rtlpriv, 0x5cf, (i << 4));
+                        if (i == 0)
+                                p2p_ps_offload->noa0_en = 1;
+                        else
+                                p2p_ps_offload->noa1_en = 1;
+
+                        /* config P2P NoA Descriptor Register */
+                        rtl_write_dword(rtlpriv, 0x5E0, p2pinfo->noa_duration[i]);
+                        rtl_write_dword(rtlpriv, 0x5E4, p2pinfo->noa_interval[i]);
+
+                        /*Get Current TSF value */
+                        tsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                        start_time = p2pinfo->noa_start_time[i];
+                        if (p2pinfo->noa_count_type[i] != 1) {
+                                while (start_time <= (tsf_low+(50*1024))) {
+                                        start_time += p2pinfo->noa_interval[i];
+                                        if (p2pinfo->noa_count_type[i] != 255)
+                                                p2pinfo->noa_count_type[i]--;
+                                }
+                        }
+                        rtl_write_dword(rtlpriv, 0x5E8, start_time);
+                        rtl_write_dword(rtlpriv, 0x5EC,
+                                        p2pinfo->noa_count_type[i]);
+                }
+
+                if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
+                        /* rst p2p circuit */
+                        rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, BIT(4));
+
+                        p2p_ps_offload->offload_en = 1;
+
+                        if (P2P_ROLE_GO == rtlpriv->mac80211.p2p) {
+                                p2p_ps_offload->role = 1;
+                                p2p_ps_offload->allstasleep = 0;
+                        } else {
+                                p2p_ps_offload->role = 0;
+                        }
+
+                        p2p_ps_offload->discovery = 0;
+                }
+                break;
+        case P2P_PS_SCAN:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");
+                p2p_ps_offload->discovery = 1;
+                break;
+        case P2P_PS_SCAN_DONE:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");
+                p2p_ps_offload->discovery = 0;
+                p2pinfo->p2p_ps_state = P2P_PS_ENABLE;
+                break;
+        default:
+                break;
+        }
+
+        rtl8821ae_fill_h2c_cmd(hw,
+                        H2C_8821AE_P2P_PS_OFFLOAD, 1, (u8 *)p2p_ps_offload);
+}
+
+static void rtl8821ae_c2h_ra_report_handler(struct ieee80211_hw *hw,
+                                     u8 *cmd_buf, u8 cmd_len)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 rate = cmd_buf[0] & 0x3F;
+
+        rtlhal->current_ra_rate = rtl8821ae_hw_rate_to_mrate(hw, rate);
+
+        rtl8821ae_dm_update_init_rate(hw, rate);
+}
+
+static void _rtl8821ae_c2h_content_parsing(struct ieee80211_hw *hw,
+                                           u8 c2h_cmd_id, u8 c2h_cmd_len,
+                                           u8 *tmp_buf)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        switch (c2h_cmd_id) {
+        case C2H_8812_DBG:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_8812_DBG!!\n");
+                break;
+        case C2H_8812_RA_RPT:
+                rtl8821ae_c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);
+                break;
+        case C2H_8812_BT_INFO:
+                RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                         "[C2H], C2H_8812_BT_INFO!!\n");
+                if (rtlpriv->cfg->ops->get_btc_status())
+                        rtlpriv->btcoexist.btc_ops->btc_btinfo_notify(rtlpriv,
+                                                                      tmp_buf,
+                                                                      c2h_cmd_len);
+                break;
+        default:
+                break;
+        }
+}
+
+void rtl8821ae_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer,
+                                  u8 length)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 c2h_cmd_id = 0, c2h_cmd_seq = 0, c2h_cmd_len = 0;
+        u8 *tmp_buf = NULL;
+
+        c2h_cmd_id = buffer[0];
+        c2h_cmd_seq = buffer[1];
+        c2h_cmd_len = length - 2;
+        tmp_buf = buffer + 2;
+
+        RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
+                 "[C2H packet], c2hCmdId=0x%x, c2hCmdSeq=0x%x, c2hCmdLen=%d\n",
+                 c2h_cmd_id, c2h_cmd_seq, c2h_cmd_len);
+
+        RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_LOUD,
+                      "[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);
+        _rtl8821ae_c2h_content_parsing(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/fw.h b/drivers/net/wireless/rtlwifi/rtl8821ae/fw.h
new file mode 100644
index 000000000000..591c14c0b9b5
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/fw.h
@@ -0,0 +1,351 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE__FW__H__
+#define __RTL8821AE__FW__H__
+#include "def.h"
+
+#define FW_8821AE_SIZE                                  0x8000
+#define FW_8821AE_START_ADDRESS                 0x1000
+#define FW_8821AE_END_ADDRESS                   0x5FFF
+#define FW_8821AE_PAGE_SIZE                             4096
+#define FW_8821AE_POLLING_DELAY                 5
+#define FW_8821AE_POLLING_TIMEOUT_COUNT 6000
+
+#define IS_FW_HEADER_EXIST_8812(_pfwhdr)        \
+        ((_pfwhdr->signature&0xFFF0) == 0x9500)
+
+#define IS_FW_HEADER_EXIST_8821(_pfwhdr)        \
+        ((_pfwhdr->signature&0xFFF0) == 0x2100)
+
+#define USE_OLD_WOWLAN_DEBUG_FW 0
+
+#define H2C_8821AE_RSVDPAGE_LOC_LEN             5
+#define H2C_8821AE_PWEMODE_LENGTH                       5
+#define H2C_8821AE_JOINBSSRPT_LENGTH            1
+#define H2C_8821AE_AP_OFFLOAD_LENGTH            3
+#define H2C_8821AE_WOWLAN_LENGTH                        3
+#define H2C_8821AE_KEEP_ALIVE_CTRL_LENGTH       3
+#if (USE_OLD_WOWLAN_DEBUG_FW == 0)
+#define H2C_8821AE_REMOTE_WAKE_CTRL_LEN 1
+#else
+#define H2C_8821AE_REMOTE_WAKE_CTRL_LEN 3
+#endif
+#define H2C_8821AE_AOAC_GLOBAL_INFO_LEN 2
+#define H2C_8821AE_AOAC_RSVDPAGE_LOC_LEN        7
+#define H2C_8821AE_DISCONNECT_DECISION_CTRL_LEN 3
+
+/* Fw PS state for RPWM.
+*BIT[2:0] = HW state
+
+*BIT[3] = Protocol PS state,
+1: register active state ,
+0: register sleep state
+
+*BIT[4] = sub-state
+*/
+#define FW_PS_GO_ON                     BIT(0)
+#define FW_PS_TX_NULL                   BIT(1)
+#define FW_PS_RF_ON                     BIT(2)
+#define FW_PS_REGISTER_ACTIVE   BIT(3)
+
+#define FW_PS_DPS               BIT(0)
+#define FW_PS_LCLK              (FW_PS_DPS)
+#define FW_PS_RF_OFF            BIT(1)
+#define FW_PS_ALL_ON            BIT(2)
+#define FW_PS_ST_ACTIVE         BIT(3)
+#define FW_PS_ISR_ENABLE        BIT(4)
+#define FW_PS_IMR_ENABLE        BIT(5)
+
+#define FW_PS_ACK               BIT(6)
+#define FW_PS_TOGGLE            BIT(7)
+
+ /* 8821AE RPWM value*/
+ /* BIT[0] = 1: 32k, 0: 40M*/
+ /* 32k*/
+#define FW_PS_CLOCK_OFF         BIT(0)
+/*40M*/
+#define FW_PS_CLOCK_ON          0
+
+#define FW_PS_STATE_MASK                (0x0F)
+#define FW_PS_STATE_HW_MASK     (0x07)
+/*ISR_ENABLE, IMR_ENABLE, and PS mode should be inherited.*/
+#define FW_PS_STATE_INT_MASK    (0x3F)
+
+#define FW_PS_STATE(x)                  (FW_PS_STATE_MASK & (x))
+#define FW_PS_STATE_HW(x)               (FW_PS_STATE_HW_MASK & (x))
+#define FW_PS_STATE_INT(x)      (FW_PS_STATE_INT_MASK & (x))
+#define FW_PS_ISR_VAL(x)                ((x) & 0x70)
+#define FW_PS_IMR_MASK(x)       ((x) & 0xDF)
+#define FW_PS_KEEP_IMR(x)               ((x) & 0x20)
+
+#define FW_PS_STATE_S0          (FW_PS_DPS)
+#define FW_PS_STATE_S1          (FW_PS_LCLK)
+#define FW_PS_STATE_S2          (FW_PS_RF_OFF)
+#define FW_PS_STATE_S3          (FW_PS_ALL_ON)
+#define FW_PS_STATE_S4          ((FW_PS_ST_ACTIVE) | (FW_PS_ALL_ON))
+ /* ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))*/
+#define FW_PS_STATE_ALL_ON_8821AE       (FW_PS_CLOCK_ON)
+ /* (FW_PS_RF_ON)*/
+#define FW_PS_STATE_RF_ON_8821AE        (FW_PS_CLOCK_ON)
+ /* 0x0*/
+#define FW_PS_STATE_RF_OFF_8821AE       (FW_PS_CLOCK_ON)
+ /* (FW_PS_STATE_RF_OFF)*/
+#define FW_PS_STATE_RF_OFF_LOW_PWR_8821AE       (FW_PS_CLOCK_OFF)
+
+#define FW_PS_STATE_ALL_ON_92C  (FW_PS_STATE_S4)
+#define FW_PS_STATE_RF_ON_92C           (FW_PS_STATE_S3)
+#define FW_PS_STATE_RF_OFF_92C  (FW_PS_STATE_S2)
+#define FW_PS_STATE_RF_OFF_LOW_PWR_92C  (FW_PS_STATE_S1)
+
+/* For 8821AE H2C PwrMode Cmd ID 5.*/
+#define FW_PWR_STATE_ACTIVE     ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
+#define FW_PWR_STATE_RF_OFF     0
+
+#define FW_PS_IS_ACK(x)         ((x) & FW_PS_ACK)
+#define FW_PS_IS_CLK_ON(x)      ((x) & (FW_PS_RF_OFF | FW_PS_ALL_ON))
+#define FW_PS_IS_RF_ON(x)       ((x) & (FW_PS_ALL_ON))
+#define FW_PS_IS_ACTIVE(x)      ((x) & (FW_PS_ST_ACTIVE))
+#define FW_PS_IS_CPWM_INT(x)    ((x) & 0x40)
+
+#define FW_CLR_PS_STATE(x)      ((x) = ((x) & (0xF0)))
+
+#define IS_IN_LOW_POWER_STATE_8821AE(__state)           \
+                        (FW_PS_STATE(__state) == FW_PS_CLOCK_OFF)
+
+#define FW_PWR_STATE_ACTIVE     ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
+#define FW_PWR_STATE_RF_OFF     0
+
+struct rtl8821a_firmware_header {
+        u16 signature;
+        u8 category;
+        u8 function;
+        u16 version;
+        u8 subversion;
+        u8 rsvd1;
+        u8 month;
+        u8 date;
+        u8 hour;
+        u8 minute;
+        u16 ramcodeSize;
+        u16 rsvd2;
+        u32 svnindex;
+        u32 rsvd3;
+        u32 rsvd4;
+        u32 rsvd5;
+};
+
+enum rtl8812_c2h_evt {
+        C2H_8812_DBG = 0,
+        C2H_8812_LB = 1,
+        C2H_8812_TXBF = 2,
+        C2H_8812_TX_REPORT = 3,
+        C2H_8812_BT_INFO = 9,
+        C2H_8812_BT_MP = 11,
+        C2H_8812_RA_RPT = 12,
+
+        C2H_8812_FW_SWCHNL = 0x10,
+        C2H_8812_IQK_FINISH = 0x11,
+        MAX_8812_C2HEVENT
+};
+
+enum rtl8821a_h2c_cmd {
+        H2C_8821AE_RSVDPAGE = 0,
+        H2C_8821AE_MSRRPT = 1,
+        H2C_8821AE_SCAN = 2,
+        H2C_8821AE_KEEP_ALIVE_CTRL = 3,
+        H2C_8821AE_DISCONNECT_DECISION = 4,
+        H2C_8821AE_INIT_OFFLOAD = 6,
+        H2C_8821AE_AP_OFFLOAD = 8,
+        H2C_8821AE_BCN_RSVDPAGE = 9,
+        H2C_8821AE_PROBERSP_RSVDPAGE = 10,
+
+        H2C_8821AE_SETPWRMODE = 0x20,
+        H2C_8821AE_PS_TUNING_PARA = 0x21,
+        H2C_8821AE_PS_TUNING_PARA2 = 0x22,
+        H2C_8821AE_PS_LPS_PARA = 0x23,
+        H2C_8821AE_P2P_PS_OFFLOAD = 024,
+
+        H2C_8821AE_WO_WLAN = 0x80,
+        H2C_8821AE_REMOTE_WAKE_CTRL = 0x81,
+        H2C_8821AE_AOAC_GLOBAL_INFO = 0x82,
+        H2C_8821AE_AOAC_RSVDPAGE = 0x83,
+
+        H2C_RSSI_21AE_REPORT = 0x42,
+        H2C_8821AE_RA_MASK = 0x40,
+        H2C_8821AE_SELECTIVE_SUSPEND_ROF_CMD,
+        H2C_8821AE_P2P_PS_MODE,
+        H2C_8821AE_PSD_RESULT,
+        /*Not defined CTW CMD for P2P yet*/
+        H2C_8821AE_P2P_PS_CTW_CMD,
+        MAX_8821AE_H2CCMD
+};
+
+#define pagenum_128(_len)       (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))
+
+#define SET_8812_H2CCMD_WOWLAN_FUNC_ENABLE(__cmd, __value)              \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __value)
+#define SET_8812_H2CCMD_WOWLAN_PATTERN_MATCH_ENABLE(__cmd, __value)     \
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __value)
+#define SET_8812_H2CCMD_WOWLAN_MAGIC_PKT_ENABLE(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE(__cmd, 2, 1, __value)
+#define SET_8812_H2CCMD_WOWLAN_UNICAST_PKT_ENABLE(__cmd, __value)       \
+        SET_BITS_TO_LE_1BYTE(__cmd, 3, 1, __value)
+#define SET_8812_H2CCMD_WOWLAN_ALL_PKT_DROP(__cmd, __value)             \
+        SET_BITS_TO_LE_1BYTE(__cmd, 4, 1, __value)
+#define SET_8812_H2CCMD_WOWLAN_GPIO_ACTIVE(__cmd, __value)              \
+        SET_BITS_TO_LE_1BYTE(__cmd, 5, 1, __value)
+#define SET_8812_H2CCMD_WOWLAN_REKEY_WAKE_UP(__cmd, __value)    \
+        SET_BITS_TO_LE_1BYTE(__cmd, 6, 1, __value)
+#define SET_8812_H2CCMD_WOWLAN_DISCONNECT_WAKE_UP(__cmd, __value)       \
+        SET_BITS_TO_LE_1BYTE(__cmd, 7, 1, __value)
+#define SET_8812_H2CCMD_WOWLAN_GPIONUM(__cmd, __value)          \
+        SET_BITS_TO_LE_1BYTE((__cmd) + 1, 0, 8, __value)
+#define SET_8812_H2CCMD_WOWLAN_GPIO_DURATION(__cmd, __value)    \
+        SET_BITS_TO_LE_1BYTE((__cmd) + 2, 0, 8, __value)
+
+#define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val)                  \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_PWRMODE_PARM_RLBM(__cmd, __value)            \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 4, __value)
+#define SET_H2CCMD_PWRMODE_PARM_SMART_PS(__cmd, __value)        \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 4, 4, __value)
+#define SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(__cmd, __value)  \
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+#define SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(__cmd, __value)         \
+        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __value)
+#define SET_H2CCMD_PWRMODE_PARM_PWR_STATE(__cmd, __value)       \
+        SET_BITS_TO_LE_1BYTE((__cmd)+4, 0, 8, __value)
+#define GET_8821AE_H2CCMD_PWRMODE_PARM_MODE(__cmd)              \
+        LE_BITS_TO_1BYTE(__cmd, 0, 8)
+
+#define SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(__ph2ccmd, __val)             \
+        SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(__ph2ccmd, __val)                \
+        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val)             \
+        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)
+#define SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(__ph2ccmd, __val)         \
+        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+3, 0, 8, __val)
+
+/* _MEDIA_STATUS_RPT_PARM_CMD1 */
+#define SET_H2CCMD_MSRRPT_PARM_OPMODE(__cmd, __value)   \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __value)
+#define SET_H2CCMD_MSRRPT_PARM_MACID_IND(__cmd, __value)        \
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __value)
+#define SET_H2CCMD_MSRRPT_PARM_MACID(__cmd, __value)    \
+        SET_BITS_TO_LE_1BYTE(__cmd+1, 0, 8, __value)
+#define SET_H2CCMD_MSRRPT_PARM_MACID_END(__cmd, __value)        \
+        SET_BITS_TO_LE_1BYTE(__cmd+2, 0, 8, __value)
+
+/* AP_OFFLOAD */
+#define SET_H2CCMD_AP_OFFLOAD_ON(__cmd, __value)        \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 8, __value)
+#define SET_H2CCMD_AP_OFFLOAD_HIDDEN(__cmd, __value)    \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+#define SET_H2CCMD_AP_OFFLOAD_DENYANY(__cmd, __value)   \
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+#define SET_H2CCMD_AP_OFFLOAD_WAKEUP_EVT_RPT(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __value)
+
+/* Keep Alive Control*/
+#define SET_8812_H2CCMD_KEEP_ALIVE_ENABLE(__cmd, __value)       \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __value)
+#define SET_8812_H2CCMD_KEEP_ALIVE_ACCPEPT_USER_DEFINED(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __value)
+#define SET_8812_H2CCMD_KEEP_ALIVE_PERIOD(__cmd, __value)       \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+
+/*REMOTE_WAKE_CTRL */
+#define SET_8812_H2CCMD_REMOTE_WAKECTRL_ENABLE(__cmd, __value)  \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __value)
+#define SET_8812_H2CCMD_REMOTE_WAKE_CTRL_ARP_OFFLOAD_EN(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __value)
+#define SET_8812_H2CCMD_REMOTE_WAKE_CTRL_NDP_OFFLOAD_EN(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE(__cmd, 2, 1, __value)
+#define SET_8812_H2CCMD_REMOTE_WAKE_CTRL_GTK_OFFLOAD_EN(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE(__cmd, 3, 1, __value)
+#define SET_8812_H2CCMD_REMOTE_WAKE_CTRL_REALWOWV2_EN(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE(__cmd, 6, 1, __value)
+
+/* GTK_OFFLOAD */
+#define SET_8812_H2CCMD_AOAC_GLOBAL_INFO_PAIRWISE_ENC_ALG(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 8, __value)
+#define SET_8812_H2CCMD_AOAC_GLOBAL_INFO_GROUP_ENC_ALG(__cmd, __value)  \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+
+/* AOAC_RSVDPAGE_LOC */
+#define SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(__cmd, __value)       \
+        SET_BITS_TO_LE_1BYTE((__cmd), 0, 8, __value)
+#define SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(__cmd, __value)     \
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value)
+#define SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_NEIGHBOR_ADV(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+#define SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_RSP(__cmd, __value)     \
+        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __value)
+#define SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_INFO(__cmd, __value)    \
+        SET_BITS_TO_LE_1BYTE((__cmd)+4, 0, 8, __value)
+#define SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE((__cmd)+5, 0, 8, __value)
+
+/* Disconnect_Decision_Control */
+#define SET_8812_H2CCMD_DISCONNECT_DECISION_CTRL_ENABLE(__cmd, __value) \
+        SET_BITS_TO_LE_1BYTE(__cmd, 0, 1, __value)
+#define SET_8812_H2CCMD_DISCONNECT_DECISION_CTRL_USER_SETTING(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE(__cmd, 1, 1, __value)
+#define SET_8812_H2CCMD_DISCONNECT_DECISION_CTRL_CHECK_PERIOD(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE((__cmd)+1, 0, 8, __value) /* unit: beacon period */
+#define SET_8812_H2CCMD_DISCONNECT_DECISION_CTRL_TRYPKT_NUM(__cmd, __value)\
+        SET_BITS_TO_LE_1BYTE((__cmd)+2, 0, 8, __value)
+
+int rtl8821ae_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw);
+#if (USE_SPECIFIC_FW_TO_SUPPORT_WOWLAN == 1)
+void rtl8821ae_set_fw_related_for_wowlan(struct ieee80211_hw *hw,
+                                         bool used_wowlan_fw);
+
+#endif
+void rtl8821ae_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
+                            u32 cmd_len, u8 *cmdbuffer);
+void rtl8821ae_firmware_selfreset(struct ieee80211_hw *hw);
+void rtl8821ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
+void rtl8821ae_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw,
+                                           u8 mstatus);
+void rtl8821ae_set_fw_ap_off_load_cmd(struct ieee80211_hw *hw,
+                                      u8 ap_offload_enable);
+void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
+                                  bool b_dl_finished, bool dl_whole_packet);
+void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
+                                  bool b_dl_finished, bool dl_whole_packet);
+void rtl8821ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw,
+                                      u8 p2p_ps_state);
+void rtl8821ae_set_fw_wowlan_mode(struct ieee80211_hw *hw, bool func_en);
+void rtl8821ae_set_fw_remote_wake_ctrl_cmd(struct ieee80211_hw *hw,
+                                           u8 enable);
+void rtl8821ae_set_fw_keep_alive_cmd(struct ieee80211_hw *hw, bool func_en);
+void rtl8821ae_set_fw_disconnect_decision_ctrl_cmd(struct ieee80211_hw *hw,
+                                                   bool enabled);
+void rtl8821ae_set_fw_global_info_cmd(struct ieee80211_hw *hw);
+void rtl8821ae_c2h_packet_handler(struct ieee80211_hw *hw,
+                                  u8 *buffer, u8 length);
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
new file mode 100644
index 000000000000..310d3163dc5b
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
@@ -0,0 +1,4218 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../efuse.h"
+#include "../base.h"
+#include "../regd.h"
+#include "../cam.h"
+#include "../ps.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "fw.h"
+#include "led.h"
+#include "hw.h"
+#include "../pwrseqcmd.h"
+#include "pwrseq.h"
+#include "../btcoexist/rtl_btc.h"
+
+#define LLT_CONFIG      5
+
+static void _rtl8821ae_return_beacon_queue_skb(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE];
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
+        while (skb_queue_len(&ring->queue)) {
+                struct rtl_tx_desc *entry = &ring->desc[ring->idx];
+                struct sk_buff *skb = __skb_dequeue(&ring->queue);
+
+                pci_unmap_single(rtlpci->pdev,
+                                 rtlpriv->cfg->ops->get_desc(
+                                 (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
+                                 skb->len, PCI_DMA_TODEVICE);
+                kfree_skb(skb);
+                ring->idx = (ring->idx + 1) % ring->entries;
+        }
+        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
+}
+
+static void _rtl8821ae_set_bcn_ctrl_reg(struct ieee80211_hw *hw,
+                                        u8 set_bits, u8 clear_bits)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtlpci->reg_bcn_ctrl_val |= set_bits;
+        rtlpci->reg_bcn_ctrl_val &= ~clear_bits;
+
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8)rtlpci->reg_bcn_ctrl_val);
+}
+
+void _rtl8821ae_stop_tx_beacon(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp1byte;
+
+        tmp1byte = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp1byte & (~BIT(6)));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0x64);
+        tmp1byte = rtl_read_byte(rtlpriv, REG_TBTT_PROHIBIT + 2);
+        tmp1byte &= ~(BIT(0));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 2, tmp1byte);
+}
+
+void _rtl8821ae_resume_tx_beacon(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp1byte;
+
+        tmp1byte = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp1byte | BIT(6));
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0xff);
+        tmp1byte = rtl_read_byte(rtlpriv, REG_TBTT_PROHIBIT + 2);
+        tmp1byte |= BIT(0);
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 2, tmp1byte);
+}
+
+static void _rtl8821ae_enable_bcn_sub_func(struct ieee80211_hw *hw)
+{
+        _rtl8821ae_set_bcn_ctrl_reg(hw, 0, BIT(1));
+}
+
+static void _rtl8821ae_disable_bcn_sub_func(struct ieee80211_hw *hw)
+{
+        _rtl8821ae_set_bcn_ctrl_reg(hw, BIT(1), 0);
+}
+
+static void _rtl8821ae_set_fw_clock_on(struct ieee80211_hw *hw,
+                                       u8 rpwm_val, bool b_need_turn_off_ckk)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool b_support_remote_wake_up;
+        u32 count = 0, isr_regaddr, content;
+        bool b_schedule_timer = b_need_turn_off_ckk;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
+                                        (u8 *)(&b_support_remote_wake_up));
+
+        if (!rtlhal->fw_ready)
+                return;
+        if (!rtlpriv->psc.fw_current_inpsmode)
+                return;
+
+        while (1) {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (rtlhal->fw_clk_change_in_progress) {
+                        while (rtlhal->fw_clk_change_in_progress) {
+                                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                                count++;
+                                udelay(100);
+                                if (count > 1000)
+                                        goto change_done;
+                                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                        }
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                } else {
+                        rtlhal->fw_clk_change_in_progress = false;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                        goto change_done;
+                }
+        }
+change_done:
+        if (IS_IN_LOW_POWER_STATE_8821AE(rtlhal->fw_ps_state)) {
+                rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM,
+                                        (u8 *)(&rpwm_val));
+                if (FW_PS_IS_ACK(rpwm_val)) {
+                        isr_regaddr = REG_HISR;
+                        content = rtl_read_dword(rtlpriv, isr_regaddr);
+                        while (!(content & IMR_CPWM) && (count < 500)) {
+                                udelay(50);
+                                count++;
+                                content = rtl_read_dword(rtlpriv, isr_regaddr);
+                        }
+
+                        if (content & IMR_CPWM) {
+                                rtl_write_word(rtlpriv, isr_regaddr, 0x0100);
+                                rtlhal->fw_ps_state = FW_PS_STATE_RF_ON_8821AE;
+                                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                         "Receive CPWM INT!!! Set rtlhal->FwPSState = %X\n",
+                                         rtlhal->fw_ps_state);
+                        }
+                }
+
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                rtlhal->fw_clk_change_in_progress = false;
+                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (b_schedule_timer)
+                        mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                                  jiffies + MSECS(10));
+        } else  {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                rtlhal->fw_clk_change_in_progress = false;
+                spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+        }
+}
+
+static void _rtl8821ae_set_fw_clock_off(struct ieee80211_hw *hw,
+                                        u8 rpwm_val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring;
+        enum rf_pwrstate rtstate;
+        bool b_schedule_timer = false;
+        u8 queue;
+
+        if (!rtlhal->fw_ready)
+                return;
+        if (!rtlpriv->psc.fw_current_inpsmode)
+                return;
+        if (!rtlhal->allow_sw_to_change_hwclc)
+                return;
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE, (u8 *)(&rtstate));
+        if (rtstate == ERFOFF || rtlpriv->psc.inactive_pwrstate == ERFOFF)
+                return;
+
+        for (queue = 0; queue < RTL_PCI_MAX_TX_QUEUE_COUNT; queue++) {
+                ring = &rtlpci->tx_ring[queue];
+                if (skb_queue_len(&ring->queue)) {
+                        b_schedule_timer = true;
+                        break;
+                }
+        }
+
+        if (b_schedule_timer) {
+                mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                          jiffies + MSECS(10));
+                return;
+        }
+
+        if (FW_PS_STATE(rtlhal->fw_ps_state) !=
+                FW_PS_STATE_RF_OFF_LOW_PWR_8821AE) {
+                spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                if (!rtlhal->fw_clk_change_in_progress) {
+                        rtlhal->fw_clk_change_in_progress = true;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                        rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val);
+                        rtl_write_word(rtlpriv, REG_HISR, 0x0100);
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                                      (u8 *)(&rpwm_val));
+                        spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
+                        rtlhal->fw_clk_change_in_progress = false;
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                } else {
+                        spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
+                        mod_timer(&rtlpriv->works.fw_clockoff_timer,
+                                  jiffies + MSECS(10));
+                }
+        }
+}
+
+static void _rtl8821ae_set_fw_ps_rf_on(struct ieee80211_hw *hw)
+{
+        u8 rpwm_val = 0;
+
+        rpwm_val |= (FW_PS_STATE_RF_OFF_8821AE | FW_PS_ACK);
+        _rtl8821ae_set_fw_clock_on(hw, rpwm_val, true);
+}
+
+static void _rtl8821ae_fwlps_leave(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool fw_current_inps = false;
+        u8 rpwm_val = 0, fw_pwrmode = FW_PS_ACTIVE_MODE;
+
+        if (ppsc->low_power_enable) {
+                rpwm_val = (FW_PS_STATE_ALL_ON_8821AE|FW_PS_ACK);/* RF on */
+                _rtl8821ae_set_fw_clock_on(hw, rpwm_val, false);
+                rtlhal->allow_sw_to_change_hwclc = false;
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                (u8 *)(&fw_pwrmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                (u8 *)(&fw_current_inps));
+        } else {
+                rpwm_val = FW_PS_STATE_ALL_ON_8821AE;   /* RF on */
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                (u8 *)(&rpwm_val));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                (u8 *)(&fw_pwrmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
+                                (u8 *)(&fw_current_inps));
+        }
+}
+
+static void _rtl8821ae_fwlps_enter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool fw_current_inps = true;
+        u8 rpwm_val;
+
+        if (ppsc->low_power_enable) {
+                rpwm_val = FW_PS_STATE_RF_OFF_LOW_PWR_8821AE;   /* RF off */
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                HW_VAR_FW_PSMODE_STATUS,
+                                (u8 *)(&fw_current_inps));
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                HW_VAR_H2C_FW_PWRMODE,
+                                (u8 *)(&ppsc->fwctrl_psmode));
+                rtlhal->allow_sw_to_change_hwclc = true;
+                _rtl8821ae_set_fw_clock_off(hw, rpwm_val);
+        } else {
+                rpwm_val = FW_PS_STATE_RF_OFF_8821AE;   /* RF off */
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                HW_VAR_FW_PSMODE_STATUS,
+                                (u8 *)(&fw_current_inps));
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                HW_VAR_H2C_FW_PWRMODE,
+                                (u8 *)(&ppsc->fwctrl_psmode));
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                                HW_VAR_SET_RPWM,
+                                (u8 *)(&rpwm_val));
+        }
+}
+
+static void _rtl8821ae_download_rsvd_page(struct ieee80211_hw *hw,
+                                          bool dl_whole_packets)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        u8 tmp_regcr, tmp_reg422, bcnvalid_reg;
+        u8 count = 0, dlbcn_count = 0;
+        bool send_beacon = false;
+
+        tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
+        rtl_write_byte(rtlpriv, REG_CR + 1, (tmp_regcr | BIT(0)));
+
+        _rtl8821ae_set_bcn_ctrl_reg(hw, 0, BIT(3));
+        _rtl8821ae_set_bcn_ctrl_reg(hw, BIT(4), 0);
+
+        tmp_reg422 = rtl_read_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2);
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2,
+                       tmp_reg422 & (~BIT(6)));
+        if (tmp_reg422 & BIT(6))
+                send_beacon = true;
+
+        do {
+                bcnvalid_reg = rtl_read_byte(rtlpriv, REG_TDECTRL + 2);
+                rtl_write_byte(rtlpriv, REG_TDECTRL + 2,
+                               (bcnvalid_reg | BIT(0)));
+                _rtl8821ae_return_beacon_queue_skb(hw);
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                        rtl8812ae_set_fw_rsvdpagepkt(hw, false,
+                                                     dl_whole_packets);
+                else
+                        rtl8821ae_set_fw_rsvdpagepkt(hw, false,
+                                                     dl_whole_packets);
+
+                bcnvalid_reg = rtl_read_byte(rtlpriv, REG_TDECTRL + 2);
+                count = 0;
+                while (!(bcnvalid_reg & BIT(0)) && count < 20) {
+                        count++;
+                        udelay(10);
+                        bcnvalid_reg = rtl_read_byte(rtlpriv, REG_TDECTRL + 2);
+                }
+                dlbcn_count++;
+        } while (!(bcnvalid_reg & BIT(0)) && dlbcn_count < 5);
+
+        if (!(bcnvalid_reg & BIT(0)))
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Download RSVD page failed!\n");
+        if (bcnvalid_reg & BIT(0) && rtlhal->enter_pnp_sleep) {
+                rtl_write_byte(rtlpriv, REG_TDECTRL + 2, bcnvalid_reg | BIT(0));
+                _rtl8821ae_return_beacon_queue_skb(hw);
+                if (send_beacon) {
+                        dlbcn_count = 0;
+                        do {
+                                rtl_write_byte(rtlpriv, REG_TDECTRL + 2,
+                                               bcnvalid_reg | BIT(0));
+
+                                _rtl8821ae_return_beacon_queue_skb(hw);
+
+                                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                                        rtl8812ae_set_fw_rsvdpagepkt(hw, true,
+                                                                     false);
+                                else
+                                        rtl8821ae_set_fw_rsvdpagepkt(hw, true,
+                                                                     false);
+
+                                /* check rsvd page download OK. */
+                                bcnvalid_reg = rtl_read_byte(rtlpriv,
+                                                             REG_TDECTRL + 2);
+                                count = 0;
+                                while (!(bcnvalid_reg & BIT(0)) && count < 20) {
+                                        count++;
+                                        udelay(10);
+                                        bcnvalid_reg =
+                                          rtl_read_byte(rtlpriv,
+                                                        REG_TDECTRL + 2);
+                                }
+                                dlbcn_count++;
+                        } while (!(bcnvalid_reg & BIT(0)) && dlbcn_count < 5);
+
+                        if (!(bcnvalid_reg & BIT(0)))
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "2 Download RSVD page failed!\n");
+                }
+        }
+
+        if (bcnvalid_reg & BIT(0))
+                rtl_write_byte(rtlpriv, REG_TDECTRL + 2, BIT(0));
+
+        _rtl8821ae_set_bcn_ctrl_reg(hw, BIT(3), 0);
+        _rtl8821ae_set_bcn_ctrl_reg(hw, 0, BIT(4));
+
+        if (send_beacon)
+                rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 2, tmp_reg422);
+
+        if (!rtlhal->enter_pnp_sleep) {
+                tmp_regcr = rtl_read_byte(rtlpriv, REG_CR + 1);
+                rtl_write_byte(rtlpriv, REG_CR + 1, (tmp_regcr & ~(BIT(0))));
+        }
+}
+
+void rtl8821ae_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+
+        switch (variable) {
+        case HW_VAR_ETHER_ADDR:
+                *((u32 *)(val)) = rtl_read_dword(rtlpriv, REG_MACID);
+                *((u16 *)(val+4)) = rtl_read_word(rtlpriv, REG_MACID + 4);
+                break;
+        case HW_VAR_BSSID:
+                *((u32 *)(val)) = rtl_read_dword(rtlpriv, REG_BSSID);
+                *((u16 *)(val+4)) = rtl_read_word(rtlpriv, REG_BSSID+4);
+                break;
+        case HW_VAR_MEDIA_STATUS:
+                val[0] = rtl_read_byte(rtlpriv, REG_CR+2) & 0x3;
+                break;
+        case HW_VAR_SLOT_TIME:
+                *((u8 *)(val)) = mac->slot_time;
+                break;
+        case HW_VAR_BEACON_INTERVAL:
+                *((u16 *)(val)) = rtl_read_word(rtlpriv, REG_BCN_INTERVAL);
+                break;
+        case HW_VAR_ATIM_WINDOW:
+                *((u16 *)(val)) =  rtl_read_word(rtlpriv, REG_ATIMWND);
+                break;
+        case HW_VAR_RCR:
+                *((u32 *)(val)) = rtlpci->receive_config;
+                break;
+        case HW_VAR_RF_STATE:
+                *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
+                break;
+        case HW_VAR_FWLPS_RF_ON:{
+                enum rf_pwrstate rfstate;
+                u32 val_rcr;
+
+                rtlpriv->cfg->ops->get_hw_reg(hw,
+                                              HW_VAR_RF_STATE,
+                                              (u8 *)(&rfstate));
+                if (rfstate == ERFOFF) {
+                        *((bool *)(val)) = true;
+                } else {
+                        val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
+                        val_rcr &= 0x00070000;
+                        if (val_rcr)
+                                *((bool *)(val)) = false;
+                        else
+                                *((bool *)(val)) = true;
+                }
+                break; }
+        case HW_VAR_FW_PSMODE_STATUS:
+                *((bool *)(val)) = ppsc->fw_current_inpsmode;
+                break;
+        case HW_VAR_CORRECT_TSF:{
+                u64 tsf;
+                u32 *ptsf_low = (u32 *)&tsf;
+                u32 *ptsf_high = ((u32 *)&tsf) + 1;
+
+                *ptsf_high = rtl_read_dword(rtlpriv, (REG_TSFTR + 4));
+                *ptsf_low = rtl_read_dword(rtlpriv, REG_TSFTR);
+
+                *((u64 *)(val)) = tsf;
+
+                break; }
+        case HAL_DEF_WOWLAN:
+                if (ppsc->wo_wlan_mode)
+                        *((bool *)(val)) = true;
+                else
+                        *((bool *)(val)) = false;
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process %x\n", variable);
+                break;
+        }
+}
+
+void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 idx;
+
+        switch (variable) {
+        case HW_VAR_ETHER_ADDR:{
+                        for (idx = 0; idx < ETH_ALEN; idx++) {
+                                rtl_write_byte(rtlpriv, (REG_MACID + idx),
+                                               val[idx]);
+                        }
+                        break;
+                }
+        case HW_VAR_BASIC_RATE:{
+                        u16 b_rate_cfg = ((u16 *)val)[0];
+                        b_rate_cfg = b_rate_cfg & 0x15f;
+                        rtl_write_word(rtlpriv, REG_RRSR, b_rate_cfg);
+                        break;
+                }
+        case HW_VAR_BSSID:{
+                        for (idx = 0; idx < ETH_ALEN; idx++) {
+                                rtl_write_byte(rtlpriv, (REG_BSSID + idx),
+                                               val[idx]);
+                        }
+                        break;
+                }
+        case HW_VAR_SIFS:
+                rtl_write_byte(rtlpriv, REG_SIFS_CTX + 1, val[0]);
+                rtl_write_byte(rtlpriv, REG_SIFS_TRX + 1, val[0]);
+
+                rtl_write_byte(rtlpriv, REG_SPEC_SIFS + 1, val[0]);
+                rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
+
+                rtl_write_byte(rtlpriv, REG_RESP_SIFS_OFDM + 1, val[0]);
+                rtl_write_byte(rtlpriv, REG_RESP_SIFS_OFDM, val[0]);
+                break;
+        case HW_VAR_R2T_SIFS:
+                rtl_write_byte(rtlpriv, REG_RESP_SIFS_OFDM + 1, val[0]);
+                break;
+        case HW_VAR_SLOT_TIME:{
+                u8 e_aci;
+
+                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                         "HW_VAR_SLOT_TIME %x\n", val[0]);
+
+                rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
+
+                for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_AC_PARAM,
+                                                      (u8 *)(&e_aci));
+                }
+                break; }
+        case HW_VAR_ACK_PREAMBLE:{
+                u8 reg_tmp;
+                u8 short_preamble = (bool)(*(u8 *)val);
+
+                reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL+2);
+                if (short_preamble) {
+                        reg_tmp |= BIT(1);
+                        rtl_write_byte(rtlpriv, REG_TRXPTCL_CTL + 2,
+                                       reg_tmp);
+                } else {
+                        reg_tmp &= (~BIT(1));
+                        rtl_write_byte(rtlpriv,
+                                REG_TRXPTCL_CTL + 2,
+                                reg_tmp);
+                }
+                break; }
+        case HW_VAR_WPA_CONFIG:
+                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val));
+                break;
+        case HW_VAR_AMPDU_MIN_SPACE:{
+                u8 min_spacing_to_set;
+                u8 sec_min_space;
+
+                min_spacing_to_set = *((u8 *)val);
+                if (min_spacing_to_set <= 7) {
+                        sec_min_space = 0;
+
+                        if (min_spacing_to_set < sec_min_space)
+                                min_spacing_to_set = sec_min_space;
+
+                        mac->min_space_cfg = ((mac->min_space_cfg &
+                                               0xf8) |
+                                              min_spacing_to_set);
+
+                        *val = min_spacing_to_set;
+
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                  mac->min_space_cfg);
+
+                        rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
+                                       mac->min_space_cfg);
+                }
+                break; }
+        case HW_VAR_SHORTGI_DENSITY:{
+                u8 density_to_set;
+
+                density_to_set = *((u8 *)val);
+                mac->min_space_cfg |= (density_to_set << 3);
+
+                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                         "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                          mac->min_space_cfg);
+
+                rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
+                               mac->min_space_cfg);
+
+                break; }
+        case HW_VAR_AMPDU_FACTOR:{
+                u32     ampdu_len =  (*((u8 *)val));
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        if (ampdu_len < VHT_AGG_SIZE_128K)
+                                ampdu_len =
+                                        (0x2000 << (*((u8 *)val))) - 1;
+                        else
+                                ampdu_len = 0x1ffff;
+                } else if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                        if (ampdu_len < HT_AGG_SIZE_64K)
+                                ampdu_len =
+                                        (0x2000 << (*((u8 *)val))) - 1;
+                        else
+                                ampdu_len = 0xffff;
+                }
+                ampdu_len |= BIT(31);
+
+                rtl_write_dword(rtlpriv,
+                        REG_AMPDU_MAX_LENGTH_8812, ampdu_len);
+                break; }
+        case HW_VAR_AC_PARAM:{
+                u8 e_aci = *((u8 *)val);
+
+                rtl8821ae_dm_init_edca_turbo(hw);
+                if (rtlpci->acm_method != EACMWAY2_SW)
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_ACM_CTRL,
+                                                      (u8 *)(&e_aci));
+                break; }
+        case HW_VAR_ACM_CTRL:{
+                u8 e_aci = *((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, REG_ACMHWCTRL);
+
+                acm_ctrl =
+                    acm_ctrl | ((rtlpci->acm_method == 2) ? 0x0 : 0x1);
+
+                if (acm) {
+                        switch (e_aci) {
+                        case AC0_BE:
+                                acm_ctrl |= ACMHW_BEQEN;
+                                break;
+                        case AC2_VI:
+                                acm_ctrl |= ACMHW_VIQEN;
+                                break;
+                        case AC3_VO:
+                                acm_ctrl |= ACMHW_VOQEN;
+                                break;
+                        default:
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                         acm);
+                                break;
+                        }
+                } else {
+                        switch (e_aci) {
+                        case AC0_BE:
+                                acm_ctrl &= (~ACMHW_BEQEN);
+                                break;
+                        case AC2_VI:
+                                acm_ctrl &= (~ACMHW_VIQEN);
+                                break;
+                        case AC3_VO:
+                                acm_ctrl &= (~ACMHW_BEQEN);
+                                break;
+                        default:
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                         "switch case not process\n");
+                                break;
+                        }
+                }
+
+                RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
+                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                         acm_ctrl);
+                rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
+                break; }
+        case HW_VAR_RCR:
+                rtl_write_dword(rtlpriv, REG_RCR, ((u32 *)(val))[0]);
+                rtlpci->receive_config = ((u32 *)(val))[0];
+                break;
+        case HW_VAR_RETRY_LIMIT:{
+                u8 retry_limit = ((u8 *)(val))[0];
+
+                rtl_write_word(rtlpriv, REG_RL,
+                               retry_limit << RETRY_LIMIT_SHORT_SHIFT |
+                               retry_limit << RETRY_LIMIT_LONG_SHIFT);
+                break; }
+        case HW_VAR_DUAL_TSF_RST:
+                rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, (BIT(0) | BIT(1)));
+                break;
+        case HW_VAR_EFUSE_BYTES:
+                rtlefuse->efuse_usedbytes = *((u16 *)val);
+                break;
+        case HW_VAR_EFUSE_USAGE:
+                rtlefuse->efuse_usedpercentage = *((u8 *)val);
+                break;
+        case HW_VAR_IO_CMD:
+                rtl8821ae_phy_set_io_cmd(hw, (*(enum io_type *)val));
+                break;
+        case HW_VAR_SET_RPWM:{
+                u8 rpwm_val;
+
+                rpwm_val = rtl_read_byte(rtlpriv, REG_PCIE_HRPWM);
+                udelay(1);
+
+                if (rpwm_val & BIT(7)) {
+                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
+                                       (*(u8 *)val));
+                } else {
+                        rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
+                                       ((*(u8 *)val) | BIT(7)));
+                }
+
+                break; }
+        case HW_VAR_H2C_FW_PWRMODE:
+                rtl8821ae_set_fw_pwrmode_cmd(hw, (*(u8 *)val));
+                break;
+        case HW_VAR_FW_PSMODE_STATUS:
+                ppsc->fw_current_inpsmode = *((bool *)val);
+                break;
+        case HW_VAR_INIT_RTS_RATE:
+                break;
+        case HW_VAR_RESUME_CLK_ON:
+                _rtl8821ae_set_fw_ps_rf_on(hw);
+                break;
+        case HW_VAR_FW_LPS_ACTION:{
+                bool b_enter_fwlps = *((bool *)val);
+
+                if (b_enter_fwlps)
+                        _rtl8821ae_fwlps_enter(hw);
+                 else
+                        _rtl8821ae_fwlps_leave(hw);
+                 break; }
+        case HW_VAR_H2C_FW_JOINBSSRPT:{
+                u8 mstatus = (*(u8 *)val);
+
+                if (mstatus == RT_MEDIA_CONNECT) {
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID,
+                                                      NULL);
+                        _rtl8821ae_download_rsvd_page(hw, false);
+                }
+                rtl8821ae_set_fw_media_status_rpt_cmd(hw, mstatus);
+
+                break; }
+        case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
+                rtl8821ae_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));
+                break;
+        case HW_VAR_AID:{
+                u16 u2btmp;
+                u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
+                u2btmp &= 0xC000;
+                rtl_write_word(rtlpriv, REG_BCN_PSR_RPT, (u2btmp |
+                               mac->assoc_id));
+                break; }
+        case HW_VAR_CORRECT_TSF:{
+                u8 btype_ibss = ((u8 *)(val))[0];
+
+                if (btype_ibss)
+                        _rtl8821ae_stop_tx_beacon(hw);
+
+                _rtl8821ae_set_bcn_ctrl_reg(hw, 0, BIT(3));
+
+                rtl_write_dword(rtlpriv, REG_TSFTR,
+                                (u32)(mac->tsf & 0xffffffff));
+                rtl_write_dword(rtlpriv, REG_TSFTR + 4,
+                                (u32)((mac->tsf >> 32) & 0xffffffff));
+
+                _rtl8821ae_set_bcn_ctrl_reg(hw, BIT(3), 0);
+
+                if (btype_ibss)
+                        _rtl8821ae_resume_tx_beacon(hw);
+                break; }
+        case HW_VAR_NAV_UPPER: {
+                u32     us_nav_upper = ((u32)*val);
+
+                if (us_nav_upper > HAL_92C_NAV_UPPER_UNIT * 0xFF) {
+                        RT_TRACE(rtlpriv, COMP_INIT , DBG_WARNING,
+                                 "The setting value (0x%08X us) of NAV_UPPER is larger than (%d * 0xFF)!!!\n",
+                                 us_nav_upper, HAL_92C_NAV_UPPER_UNIT);
+                        break;
+                }
+                rtl_write_byte(rtlpriv, REG_NAV_UPPER,
+                               ((u8)((us_nav_upper +
+                                HAL_92C_NAV_UPPER_UNIT - 1) /
+                                HAL_92C_NAV_UPPER_UNIT)));
+                break; }
+        case HW_VAR_KEEP_ALIVE: {
+                u8 array[2];
+                array[0] = 0xff;
+                array[1] = *((u8 *)val);
+                rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_KEEP_ALIVE_CTRL, 2,
+                                       array);
+                break; }
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process %x\n", variable);
+                break;
+        }
+}
+
+static bool _rtl8821ae_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        bool status = true;
+        long count = 0;
+        u32 value = _LLT_INIT_ADDR(address) | _LLT_INIT_DATA(data) |
+                    _LLT_OP(_LLT_WRITE_ACCESS);
+
+        rtl_write_dword(rtlpriv, REG_LLT_INIT, value);
+
+        do {
+                value = rtl_read_dword(rtlpriv, REG_LLT_INIT);
+                if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value))
+                        break;
+
+                if (count > POLLING_LLT_THRESHOLD) {
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Failed to polling write LLT done at address %d!\n",
+                                 address);
+                        status = false;
+                        break;
+                }
+        } while (++count);
+
+        return status;
+}
+
+static bool _rtl8821ae_llt_table_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        unsigned short i;
+        u8 txpktbuf_bndy;
+        u32 rqpn;
+        u8 maxpage;
+        bool status;
+
+        maxpage = 255;
+        txpktbuf_bndy = 0xF8;
+        rqpn = 0x80e70808;
+        if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE) {
+                txpktbuf_bndy = 0xFA;
+                rqpn = 0x80e90808;
+        }
+
+        rtl_write_byte(rtlpriv, REG_TRXFF_BNDY, txpktbuf_bndy);
+        rtl_write_word(rtlpriv, REG_TRXFF_BNDY + 2, MAX_RX_DMA_BUFFER_SIZE - 1);
+
+        rtl_write_byte(rtlpriv, REG_TDECTRL + 1, txpktbuf_bndy);
+
+        rtl_write_byte(rtlpriv, REG_TXPKTBUF_BCNQ_BDNY, txpktbuf_bndy);
+        rtl_write_byte(rtlpriv, REG_TXPKTBUF_MGQ_BDNY, txpktbuf_bndy);
+
+        rtl_write_byte(rtlpriv, REG_PBP, 0x31);
+        rtl_write_byte(rtlpriv, REG_RX_DRVINFO_SZ, 0x4);
+
+        for (i = 0; i < (txpktbuf_bndy - 1); i++) {
+                status = _rtl8821ae_llt_write(hw, i, i + 1);
+                if (!status)
+                        return status;
+        }
+
+        status = _rtl8821ae_llt_write(hw, (txpktbuf_bndy - 1), 0xFF);
+        if (!status)
+                return status;
+
+        for (i = txpktbuf_bndy; i < maxpage; i++) {
+                status = _rtl8821ae_llt_write(hw, i, (i + 1));
+                if (!status)
+                        return status;
+        }
+
+        status = _rtl8821ae_llt_write(hw, maxpage, txpktbuf_bndy);
+        if (!status)
+                return status;
+
+        rtl_write_dword(rtlpriv, REG_RQPN, rqpn);
+
+        rtl_write_byte(rtlpriv, REG_RQPN_NPQ, 0x00);
+
+        return true;
+}
+
+static void _rtl8821ae_gen_refresh_led_state(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_led *pled0 = &pcipriv->ledctl.sw_led0;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        if (rtlpriv->rtlhal.up_first_time)
+                return;
+
+        if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS)
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                        rtl8812ae_sw_led_on(hw, pled0);
+                else
+                        rtl8821ae_sw_led_on(hw, pled0);
+        else if (ppsc->rfoff_reason == RF_CHANGE_BY_INIT)
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                        rtl8812ae_sw_led_on(hw, pled0);
+                else
+                        rtl8821ae_sw_led_on(hw, pled0);
+        else
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                        rtl8812ae_sw_led_off(hw, pled0);
+                else
+                        rtl8821ae_sw_led_off(hw, pled0);
+}
+
+static bool _rtl8821ae_init_mac(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        u8 bytetmp = 0;
+        u16 wordtmp = 0;
+        bool mac_func_enable = rtlhal->mac_func_enable;
+
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x00);
+
+        /*Auto Power Down to CHIP-off State*/
+        bytetmp = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 1) & (~BIT(7));
+        rtl_write_byte(rtlpriv, REG_APS_FSMCO + 1, bytetmp);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                /* HW Power on sequence*/
+                if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK,
+                                              PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,
+                                              RTL8812_NIC_ENABLE_FLOW)) {
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "init 8812 MAC Fail as power on failure\n");
+                                return false;
+                }
+        } else {
+                /* HW Power on sequence */
+                if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_A_MSK,
+                                              PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,
+                                              RTL8821A_NIC_ENABLE_FLOW)){
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                "init 8821 MAC Fail as power on failure\n");
+                        return false;
+                }
+        }
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_APS_FSMCO) | BIT(4);
+        rtl_write_byte(rtlpriv, REG_APS_FSMCO, bytetmp);
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_CR);
+        bytetmp = 0xff;
+        rtl_write_byte(rtlpriv, REG_CR, bytetmp);
+        mdelay(2);
+
+        bytetmp = 0xff;
+        rtl_write_byte(rtlpriv, REG_HWSEQ_CTRL, bytetmp);
+        mdelay(2);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                bytetmp = rtl_read_byte(rtlpriv, REG_SYS_CFG + 3);
+                if (bytetmp & BIT(0)) {
+                        bytetmp = rtl_read_byte(rtlpriv, 0x7c);
+                        bytetmp |= BIT(6);
+                        rtl_write_byte(rtlpriv, 0x7c, bytetmp);
+                }
+        }
+
+        bytetmp = rtl_read_byte(rtlpriv, REG_GPIO_MUXCFG + 1);
+        bytetmp &= ~BIT(4);
+        rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG + 1, bytetmp);
+
+        rtl_write_word(rtlpriv, REG_CR, 0x2ff);
+
+        if (!mac_func_enable) {
+                if (!_rtl8821ae_llt_table_init(hw))
+                        return false;
+        }
+
+        rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff);
+        rtl_write_dword(rtlpriv, REG_HISRE, 0xffffffff);
+
+        /* Enable FW Beamformer Interrupt */
+        bytetmp = rtl_read_byte(rtlpriv, REG_FWIMR + 3);
+        rtl_write_byte(rtlpriv, REG_FWIMR + 3, bytetmp | BIT(6));
+
+        wordtmp = rtl_read_word(rtlpriv, REG_TRXDMA_CTRL);
+        wordtmp &= 0xf;
+        wordtmp |= 0xF5B1;
+        rtl_write_word(rtlpriv, REG_TRXDMA_CTRL, wordtmp);
+
+        rtl_write_byte(rtlpriv, REG_FWHW_TXQ_CTRL + 1, 0x1F);
+        rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
+        rtl_write_word(rtlpriv, REG_RXFLTMAP2, 0xFFFF);
+        /*low address*/
+        rtl_write_dword(rtlpriv, REG_BCNQ_DESA,
+                        rtlpci->tx_ring[BEACON_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_MGQ_DESA,
+                        rtlpci->tx_ring[MGNT_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_VOQ_DESA,
+                        rtlpci->tx_ring[VO_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_VIQ_DESA,
+                        rtlpci->tx_ring[VI_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_BEQ_DESA,
+                        rtlpci->tx_ring[BE_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_BKQ_DESA,
+                        rtlpci->tx_ring[BK_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_HQ_DESA,
+                        rtlpci->tx_ring[HIGH_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_RX_DESA,
+                        rtlpci->rx_ring[RX_MPDU_QUEUE].dma & DMA_BIT_MASK(32));
+
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 3, 0x77);
+
+        rtl_write_dword(rtlpriv, REG_INT_MIG, 0);
+
+        rtl_write_dword(rtlpriv, REG_MCUTST_1, 0);
+
+        rtl_write_byte(rtlpriv, REG_SECONDARY_CCA_CTRL, 0x3);
+        _rtl8821ae_gen_refresh_led_state(hw);
+
+        return true;
+}
+
+static void _rtl8821ae_hw_configure(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 reg_rrsr;
+
+        reg_rrsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+
+        rtl_write_dword(rtlpriv, REG_RRSR, reg_rrsr);
+        /* ARFB table 9 for 11ac 5G 2SS */
+        rtl_write_dword(rtlpriv, REG_ARFR0 + 4, 0xfffff000);
+        /* ARFB table 10 for 11ac 5G 1SS */
+        rtl_write_dword(rtlpriv, REG_ARFR1 + 4, 0x003ff000);
+        /* ARFB table 11 for 11ac 24G 1SS */
+        rtl_write_dword(rtlpriv, REG_ARFR2, 0x00000015);
+        rtl_write_dword(rtlpriv, REG_ARFR2 + 4, 0x003ff000);
+        /* ARFB table 12 for 11ac 24G 1SS */
+        rtl_write_dword(rtlpriv, REG_ARFR3, 0x00000015);
+        rtl_write_dword(rtlpriv, REG_ARFR3 + 4, 0xffcff000);
+        /* 0x420[7] = 0 , enable retry AMPDU in new AMPD not singal MPDU. */
+        rtl_write_word(rtlpriv, REG_FWHW_TXQ_CTRL, 0x1F00);
+        rtl_write_byte(rtlpriv, REG_AMPDU_MAX_TIME, 0x70);
+
+        /*Set retry limit*/
+        rtl_write_word(rtlpriv, REG_RL, 0x0707);
+
+        /* Set Data / Response auto rate fallack retry count*/
+        rtl_write_dword(rtlpriv, REG_DARFRC, 0x01000000);
+        rtl_write_dword(rtlpriv, REG_DARFRC + 4, 0x07060504);
+        rtl_write_dword(rtlpriv, REG_RARFRC, 0x01000000);
+        rtl_write_dword(rtlpriv, REG_RARFRC + 4, 0x07060504);
+
+        rtlpci->reg_bcn_ctrl_val = 0x1d;
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, rtlpci->reg_bcn_ctrl_val);
+
+        /* TBTT prohibit hold time. Suggested by designer TimChen. */
+        rtl_write_byte(rtlpriv, REG_TBTT_PROHIBIT + 1, 0xff);
+
+        /* AGGR_BK_TIME Reg51A 0x16 */
+        rtl_write_word(rtlpriv, REG_NAV_PROT_LEN, 0x0040);
+
+        /*For Rx TP. Suggested by SD1 Richard. Added by tynli. 2010.04.12.*/
+        rtl_write_dword(rtlpriv, REG_FAST_EDCA_CTRL, 0x03086666);
+
+        rtl_write_byte(rtlpriv, REG_HT_SINGLE_AMPDU, 0x80);
+        rtl_write_byte(rtlpriv, REG_RX_PKT_LIMIT, 0x20);
+        rtl_write_word(rtlpriv, REG_MAX_AGGR_NUM, 0x1F1F);
+}
+
+static u16 _rtl8821ae_mdio_read(struct rtl_priv *rtlpriv, u8 addr)
+{
+        u16 ret = 0;
+        u8 tmp = 0, count = 0;
+
+        rtl_write_byte(rtlpriv, REG_MDIO_CTL, addr | BIT(6));
+        tmp = rtl_read_byte(rtlpriv, REG_MDIO_CTL) & BIT(6);
+        count = 0;
+        while (tmp && count < 20) {
+                udelay(10);
+                tmp = rtl_read_byte(rtlpriv, REG_MDIO_CTL) & BIT(6);
+                count++;
+        }
+        if (0 == tmp)
+                ret = rtl_read_word(rtlpriv, REG_MDIO_RDATA);
+
+        return ret;
+}
+
+static void _rtl8821ae_mdio_write(struct rtl_priv *rtlpriv, u8 addr, u16 data)
+{
+        u8 tmp = 0, count = 0;
+
+        rtl_write_word(rtlpriv, REG_MDIO_WDATA, data);
+        rtl_write_byte(rtlpriv, REG_MDIO_CTL, addr | BIT(5));
+        tmp = rtl_read_byte(rtlpriv, REG_MDIO_CTL) & BIT(5);
+        count = 0;
+        while (tmp && count < 20) {
+                udelay(10);
+                tmp = rtl_read_byte(rtlpriv, REG_MDIO_CTL) & BIT(5);
+                count++;
+        }
+}
+
+static u8 _rtl8821ae_dbi_read(struct rtl_priv *rtlpriv, u16 addr)
+{
+        u16 read_addr = addr & 0xfffc;
+        u8 tmp = 0, count = 0, ret = 0;
+
+        rtl_write_word(rtlpriv, REG_DBI_ADDR, read_addr);
+        rtl_write_byte(rtlpriv, REG_DBI_FLAG, 0x2);
+        tmp = rtl_read_byte(rtlpriv, REG_DBI_FLAG);
+        count = 0;
+        while (tmp && count < 20) {
+                udelay(10);
+                tmp = rtl_read_byte(rtlpriv, REG_DBI_FLAG);
+                count++;
+        }
+        if (0 == tmp) {
+                read_addr = REG_DBI_RDATA + addr % 4;
+                ret = rtl_read_word(rtlpriv, read_addr);
+        }
+        return ret;
+}
+
+static void _rtl8821ae_dbi_write(struct rtl_priv *rtlpriv, u16 addr, u8 data)
+{
+        u8 tmp = 0, count = 0;
+        u16 wrtie_addr, remainder = addr % 4;
+
+        wrtie_addr = REG_DBI_WDATA + remainder;
+        rtl_write_byte(rtlpriv, wrtie_addr, data);
+
+        wrtie_addr = (addr & 0xfffc) | (BIT(0) << (remainder + 12));
+        rtl_write_word(rtlpriv, REG_DBI_ADDR, wrtie_addr);
+
+        rtl_write_byte(rtlpriv, REG_DBI_FLAG, 0x1);
+
+        tmp = rtl_read_byte(rtlpriv, REG_DBI_FLAG);
+        count = 0;
+        while (tmp && count < 20) {
+                udelay(10);
+                tmp = rtl_read_byte(rtlpriv, REG_DBI_FLAG);
+                count++;
+        }
+}
+
+static void _rtl8821ae_enable_aspm_back_door(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp;
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                if (_rtl8821ae_mdio_read(rtlpriv, 0x04) != 0x8544)
+                        _rtl8821ae_mdio_write(rtlpriv, 0x04, 0x8544);
+
+                if (_rtl8821ae_mdio_read(rtlpriv, 0x0b) != 0x0070)
+                        _rtl8821ae_mdio_write(rtlpriv, 0x0b, 0x0070);
+        }
+
+        tmp = _rtl8821ae_dbi_read(rtlpriv, 0x70f);
+        _rtl8821ae_dbi_write(rtlpriv, 0x70f, tmp | BIT(7));
+
+        tmp = _rtl8821ae_dbi_read(rtlpriv, 0x719);
+        _rtl8821ae_dbi_write(rtlpriv, 0x719, tmp | BIT(3) | BIT(4));
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                tmp  = _rtl8821ae_dbi_read(rtlpriv, 0x718);
+                _rtl8821ae_dbi_write(rtlpriv, 0x718, tmp|BIT(4));
+        }
+}
+
+void rtl8821ae_enable_hw_security_config(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 sec_reg_value;
+        u8 tmp;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                  rtlpriv->sec.pairwise_enc_algorithm,
+                  rtlpriv->sec.group_enc_algorithm);
+
+        if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                         "not open hw encryption\n");
+                return;
+        }
+
+        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_RXBCUSEDK | SCR_TXBCUSEDK);
+
+        tmp = rtl_read_byte(rtlpriv, REG_CR + 1);
+        rtl_write_byte(rtlpriv, REG_CR + 1, tmp | BIT(1));
+
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                 "The SECR-value %x\n", sec_reg_value);
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
+}
+
+/* Static MacID Mapping (cf. Used in MacIdDoStaticMapping) ---------- */
+#define MAC_ID_STATIC_FOR_DEFAULT_PORT                          0
+#define MAC_ID_STATIC_FOR_BROADCAST_MULTICAST           1
+#define MAC_ID_STATIC_FOR_BT_CLIENT_START                               2
+#define MAC_ID_STATIC_FOR_BT_CLIENT_END                         3
+/* ----------------------------------------------------------- */
+
+static void rtl8821ae_macid_initialize_mediastatus(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8      media_rpt[4] = {RT_MEDIA_CONNECT, 1,
+                MAC_ID_STATIC_FOR_BROADCAST_MULTICAST,
+                MAC_ID_STATIC_FOR_BT_CLIENT_END};
+
+        rtlpriv->cfg->ops->set_hw_reg(hw,
+                HW_VAR_H2C_FW_MEDIASTATUSRPT, media_rpt);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Initialize MacId media status: from %d to %d\n",
+                 MAC_ID_STATIC_FOR_BROADCAST_MULTICAST,
+                 MAC_ID_STATIC_FOR_BT_CLIENT_END);
+}
+
+static bool _rtl8821ae_check_pcie_dma_hang(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp;
+
+        /* write reg 0x350 Bit[26]=1. Enable debug port. */
+        tmp = rtl_read_byte(rtlpriv, REG_DBI_CTRL + 3);
+        if (!(tmp & BIT(2))) {
+                rtl_write_byte(rtlpriv, REG_DBI_CTRL + 3, (tmp | BIT(2)));
+                mdelay(100);
+        }
+
+        /* read reg 0x350 Bit[25] if 1 : RX hang */
+        /* read reg 0x350 Bit[24] if 1 : TX hang */
+        tmp = rtl_read_byte(rtlpriv, REG_DBI_CTRL + 3);
+        if ((tmp & BIT(0)) || (tmp & BIT(1))) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "CheckPcieDMAHang8821AE(): true! Reset PCIE DMA!\n");
+                return true;
+        } else {
+                return false;
+        }
+}
+
+static bool _rtl8821ae_reset_pcie_interface_dma(struct ieee80211_hw *hw,
+                                         bool mac_power_on,
+                                         bool in_watchdog)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp;
+        bool release_mac_rx_pause;
+        u8 backup_pcie_dma_pause;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+
+        /* 1. Disable register write lock. 0x1c[1] = 0 */
+        tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL);
+        tmp &= ~(BIT(1));
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, tmp);
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                /* write 0xCC bit[2] = 1'b1 */
+                tmp = rtl_read_byte(rtlpriv, REG_PMC_DBG_CTRL2);
+                tmp |= BIT(2);
+                rtl_write_byte(rtlpriv, REG_PMC_DBG_CTRL2, tmp);
+        }
+
+        /* 2. Check and pause TRX DMA */
+        /* write 0x284 bit[18] = 1'b1 */
+        /* write 0x301 = 0xFF */
+        tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+        if (tmp & BIT(2)) {
+                /* Already pause before the function for another purpose. */
+                release_mac_rx_pause = false;
+        } else {
+                rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, (tmp | BIT(2)));
+                release_mac_rx_pause = true;
+        }
+        backup_pcie_dma_pause = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG + 1);
+        if (backup_pcie_dma_pause != 0xFF)
+                rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0xFF);
+
+        if (mac_power_on) {
+                /* 3. reset TRX function */
+                /* write 0x100 = 0x00 */
+                rtl_write_byte(rtlpriv, REG_CR, 0);
+        }
+
+        /* 4. Reset PCIe DMA. 0x3[0] = 0 */
+        tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        tmp &= ~(BIT(0));
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, tmp);
+
+        /* 5. Enable PCIe DMA. 0x3[0] = 1 */
+        tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+        tmp |= BIT(0);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, tmp);
+
+        if (mac_power_on) {
+                /* 6. enable TRX function */
+                /* write 0x100 = 0xFF */
+                rtl_write_byte(rtlpriv, REG_CR, 0xFF);
+
+                /* We should init LLT & RQPN and
+                 * prepare Tx/Rx descrptor address later
+                 * because MAC function is reset.*/
+        }
+
+        /* 7. Restore PCIe autoload down bit */
+        /* 8812AE does not has the defination. */
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                /* write 0xF8 bit[17] = 1'b1 */
+                tmp = rtl_read_byte(rtlpriv, REG_MAC_PHY_CTRL_NORMAL + 2);
+                tmp |= BIT(1);
+                rtl_write_byte(rtlpriv, REG_MAC_PHY_CTRL_NORMAL + 2, tmp);
+        }
+
+        /* In MAC power on state, BB and RF maybe in ON state,
+         * if we release TRx DMA here.
+         * it will cause packets to be started to Tx/Rx,
+         * so we release Tx/Rx DMA later.*/
+        if (!mac_power_on/* || in_watchdog*/) {
+                /* 8. release TRX DMA */
+                /* write 0x284 bit[18] = 1'b0 */
+                /* write 0x301 = 0x00 */
+                if (release_mac_rx_pause) {
+                        tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+                        rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL,
+                                       tmp & (~BIT(2)));
+                }
+                rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1,
+                               backup_pcie_dma_pause);
+        }
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                /* 9. lock system register */
+                /* write 0xCC bit[2] = 1'b0 */
+                tmp = rtl_read_byte(rtlpriv, REG_PMC_DBG_CTRL2);
+                tmp &= ~(BIT(2));
+                rtl_write_byte(rtlpriv, REG_PMC_DBG_CTRL2, tmp);
+        }
+        return true;
+}
+
+static void _rtl8821ae_get_wakeup_reason(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
+        u8 fw_reason = 0;
+        struct timeval ts;
+
+        fw_reason = rtl_read_byte(rtlpriv, REG_MCUTST_WOWLAN);
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "WOL Read 0x1c7 = %02X\n",
+                 fw_reason);
+
+        ppsc->wakeup_reason = 0;
+
+        rtlhal->last_suspend_sec = ts.tv_sec;
+
+        switch (fw_reason) {
+        case FW_WOW_V2_PTK_UPDATE_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_PTK_UPDATE;
+                do_gettimeofday(&ts);
+                ppsc->last_wakeup_time = ts.tv_sec*1000 + ts.tv_usec/1000;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's a WOL PTK Key update event!\n");
+                break;
+        case FW_WOW_V2_GTK_UPDATE_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_GTK_UPDATE;
+                do_gettimeofday(&ts);
+                ppsc->last_wakeup_time = ts.tv_sec*1000 + ts.tv_usec/1000;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's a WOL GTK Key update event!\n");
+                break;
+        case FW_WOW_V2_DISASSOC_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_DISASSOC;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's a disassociation event!\n");
+                break;
+        case FW_WOW_V2_DEAUTH_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_DEAUTH;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's a deauth event!\n");
+                break;
+        case FW_WOW_V2_FW_DISCONNECT_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_AP_LOST;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's a Fw disconnect decision (AP lost) event!\n");
+        break;
+        case FW_WOW_V2_MAGIC_PKT_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_MAGIC_PKT;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's a magic packet event!\n");
+                break;
+        case FW_WOW_V2_UNICAST_PKT_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_UNICAST_PKT;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's an unicast packet event!\n");
+                break;
+        case FW_WOW_V2_PATTERN_PKT_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_PATTERN_PKT;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's a pattern match event!\n");
+                break;
+        case FW_WOW_V2_RTD3_SSID_MATCH_EVENT:
+                ppsc->wakeup_reason = WOL_REASON_RTD3_SSID_MATCH;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's an RTD3 Ssid match event!\n");
+                break;
+        case FW_WOW_V2_REALWOW_V2_WAKEUPPKT:
+                ppsc->wakeup_reason = WOL_REASON_REALWOW_V2_WAKEUPPKT;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's an RealWoW wake packet event!\n");
+                break;
+        case FW_WOW_V2_REALWOW_V2_ACKLOST:
+                ppsc->wakeup_reason = WOL_REASON_REALWOW_V2_ACKLOST;
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "It's an RealWoW ack lost event!\n");
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "WOL Read 0x1c7 = %02X, Unknown reason!\n",
+                          fw_reason);
+                break;
+        }
+}
+
+static void _rtl8821ae_init_trx_desc_hw_address(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        /*low address*/
+        rtl_write_dword(rtlpriv, REG_BCNQ_DESA,
+                        rtlpci->tx_ring[BEACON_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_MGQ_DESA,
+                        rtlpci->tx_ring[MGNT_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_VOQ_DESA,
+                        rtlpci->tx_ring[VO_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_VIQ_DESA,
+                        rtlpci->tx_ring[VI_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_BEQ_DESA,
+                        rtlpci->tx_ring[BE_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_BKQ_DESA,
+                        rtlpci->tx_ring[BK_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_HQ_DESA,
+                        rtlpci->tx_ring[HIGH_QUEUE].dma & DMA_BIT_MASK(32));
+        rtl_write_dword(rtlpriv, REG_RX_DESA,
+                        rtlpci->rx_ring[RX_MPDU_QUEUE].dma & DMA_BIT_MASK(32));
+}
+
+static bool _rtl8821ae_init_llt_table(struct ieee80211_hw *hw, u32 boundary)
+{
+        bool status = true;
+        u32 i;
+        u32 txpktbuf_bndy = boundary;
+        u32 last_entry_of_txpktbuf = LAST_ENTRY_OF_TX_PKT_BUFFER;
+
+        for (i = 0 ; i < (txpktbuf_bndy - 1) ; i++) {
+                status = _rtl8821ae_llt_write(hw, i , i + 1);
+                if (!status)
+                        return status;
+        }
+
+        status = _rtl8821ae_llt_write(hw, (txpktbuf_bndy - 1), 0xFF);
+        if (!status)
+                return status;
+
+        for (i = txpktbuf_bndy ; i < last_entry_of_txpktbuf ; i++) {
+                status = _rtl8821ae_llt_write(hw, i, (i + 1));
+                if (!status)
+                        return status;
+        }
+
+        status = _rtl8821ae_llt_write(hw, last_entry_of_txpktbuf,
+                                      txpktbuf_bndy);
+        if (!status)
+                return status;
+
+        return status;
+}
+
+static bool _rtl8821ae_dynamic_rqpn(struct ieee80211_hw *hw, u32 boundary,
+                             u16 npq_rqpn_value, u32 rqpn_val)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 tmp;
+        bool ret = true;
+        u16 count = 0, tmp16;
+        bool support_remote_wakeup;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
+                                      (u8 *)(&support_remote_wakeup));
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "boundary=0x%#X, NPQ_RQPNValue=0x%#X, RQPNValue=0x%#X\n",
+                  boundary, npq_rqpn_value, rqpn_val);
+
+        /* stop PCIe DMA
+         * 1. 0x301[7:0] = 0xFE */
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0xFE);
+
+        /* wait TXFF empty
+         * 2. polling till 0x41A[15:0]=0x07FF */
+        tmp16 = rtl_read_word(rtlpriv, REG_TXPKT_EMPTY);
+        while ((tmp16 & 0x07FF) != 0x07FF) {
+                udelay(100);
+                tmp16 = rtl_read_word(rtlpriv, REG_TXPKT_EMPTY);
+                count++;
+                if ((count % 200) == 0) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Tx queue is not empty for 20ms!\n");
+                }
+                if (count >= 1000) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Wait for Tx FIFO empty timeout!\n");
+                        break;
+                }
+        }
+
+        /* TX pause
+         * 3. reg 0x522=0xFF */
+        rtl_write_byte(rtlpriv, REG_TXPAUSE, 0xFF);
+
+        /* Wait TX State Machine OK
+         * 4. polling till reg 0x5FB~0x5F8 = 0x00000000 for 50ms */
+        count = 0;
+        while (rtl_read_byte(rtlpriv, REG_SCH_TXCMD) != 0) {
+                udelay(100);
+                count++;
+                if (count >= 500) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Wait for TX State Machine ready timeout !!\n");
+                        break;
+                }
+        }
+
+        /* stop RX DMA path
+         * 5.   0x284[18] = 1
+         * 6.   wait till 0x284[17] == 1
+         * wait RX DMA idle */
+        count = 0;
+        tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+        rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, (tmp | BIT(2)));
+        do {
+                tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+                udelay(10);
+                count++;
+        } while (!(tmp & BIT(1)) && count < 100);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Wait until Rx DMA Idle. count=%d REG[0x286]=0x%x\n",
+                  count, tmp);
+
+        /* reset BB
+         * 7.   0x02 [0] = 0 */
+        tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN);
+        tmp &= ~(BIT(0));
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, tmp);
+
+        /* Reset TRX MAC
+         * 8.    0x100 = 0x00
+         * Delay (1ms) */
+        rtl_write_byte(rtlpriv, REG_CR, 0x00);
+        udelay(1000);
+
+        /* Disable MAC Security Engine
+         * 9.   0x100 bit[9]=0 */
+        tmp = rtl_read_byte(rtlpriv, REG_CR + 1);
+        tmp &= ~(BIT(1));
+        rtl_write_byte(rtlpriv, REG_CR + 1, tmp);
+
+        /* To avoid DD-Tim Circuit hang
+         * 10.  0x553 bit[5]=1 */
+        tmp = rtl_read_byte(rtlpriv, REG_DUAL_TSF_RST);
+        rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST, (tmp | BIT(5)));
+
+        /* Enable MAC Security Engine
+         * 11.  0x100 bit[9]=1 */
+        tmp = rtl_read_byte(rtlpriv, REG_CR + 1);
+        rtl_write_byte(rtlpriv, REG_CR + 1, (tmp | BIT(1)));
+
+        /* Enable TRX MAC
+         * 12.   0x100 = 0xFF
+         *      Delay (1ms) */
+        rtl_write_byte(rtlpriv, REG_CR, 0xFF);
+        udelay(1000);
+
+        /* Enable BB
+         * 13.  0x02 [0] = 1 */
+        tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, (tmp | BIT(0)));
+
+        /* beacon setting
+         * 14,15. set beacon head page (reg 0x209 and 0x424) */
+        rtl_write_byte(rtlpriv, REG_TDECTRL + 1, (u8)boundary);
+        rtl_write_byte(rtlpriv, REG_TXPKTBUF_BCNQ_BDNY, (u8)boundary);
+        rtl_write_byte(rtlpriv, REG_TXPKTBUF_MGQ_BDNY, (u8)boundary);
+
+        /* 16.  WMAC_LBK_BF_HD 0x45D[7:0]
+         * WMAC_LBK_BF_HD */
+        rtl_write_byte(rtlpriv, REG_TXPKTBUF_WMAC_LBK_BF_HD,
+                       (u8)boundary);
+
+        rtl_write_word(rtlpriv, REG_TRXFF_BNDY, boundary);
+
+        /* init LLT
+         * 17. init LLT */
+        if (!_rtl8821ae_init_llt_table(hw, boundary)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING,
+                         "Failed to init LLT table!\n");
+                return false;
+        }
+
+        /* reallocate RQPN
+         * 18. reallocate RQPN and init LLT */
+        rtl_write_word(rtlpriv, REG_RQPN_NPQ, npq_rqpn_value);
+        rtl_write_dword(rtlpriv, REG_RQPN, rqpn_val);
+
+        /* release Tx pause
+         * 19. 0x522=0x00 */
+        rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
+
+        /* enable PCIE DMA
+         * 20. 0x301[7:0] = 0x00
+         * 21. 0x284[18] = 0 */
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0x00);
+        tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+        rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, (tmp&~BIT(2)));
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "End.\n");
+        return ret;
+}
+
+static void _rtl8821ae_simple_initialize_adapter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
+
+#if (USE_SPECIFIC_FW_TO_SUPPORT_WOWLAN == 1)
+        /* Re-download normal Fw. */
+        rtl8821ae_set_fw_related_for_wowlan(hw, false);
+#endif
+
+        /* Re-Initialize LLT table. */
+        if (rtlhal->re_init_llt_table) {
+                u32 rqpn = 0x80e70808;
+                u8 rqpn_npq = 0, boundary = 0xF8;
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        rqpn = 0x80e90808;
+                        boundary = 0xFA;
+                }
+                if (_rtl8821ae_dynamic_rqpn(hw, boundary, rqpn_npq, rqpn))
+                        rtlhal->re_init_llt_table = false;
+        }
+
+        ppsc->rfpwr_state = ERFON;
+}
+
+static void _rtl8821ae_enable_l1off(struct ieee80211_hw *hw)
+{
+        u8 tmp  = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "--->\n");
+
+        tmp = _rtl8821ae_dbi_read(rtlpriv, 0x160);
+        if (!(tmp & (BIT(2) | BIT(3)))) {
+                RT_TRACE(rtlpriv, COMP_POWER | COMP_INIT, DBG_LOUD,
+                         "0x160(%#x)return!!\n", tmp);
+                return;
+        }
+
+        tmp = _rtl8821ae_mdio_read(rtlpriv, 0x1b);
+        _rtl8821ae_mdio_write(rtlpriv, 0x1b, (tmp | BIT(4)));
+
+        tmp = _rtl8821ae_dbi_read(rtlpriv, 0x718);
+        _rtl8821ae_dbi_write(rtlpriv, 0x718, tmp | BIT(5));
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "<---\n");
+}
+
+static void _rtl8821ae_enable_ltr(struct ieee80211_hw *hw)
+{
+        u8 tmp  = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "--->\n");
+
+        /* Check 0x98[10] */
+        tmp = _rtl8821ae_dbi_read(rtlpriv, 0x99);
+        if (!(tmp & BIT(2))) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "<---0x99(%#x) return!!\n", tmp);
+                return;
+        }
+
+        /* LTR idle latency, 0x90 for 144us */
+        rtl_write_dword(rtlpriv, 0x798, 0x88908890);
+
+        /* LTR active latency, 0x3c for 60us */
+        rtl_write_dword(rtlpriv, 0x79c, 0x883c883c);
+
+        tmp = rtl_read_byte(rtlpriv, 0x7a4);
+        rtl_write_byte(rtlpriv, 0x7a4, (tmp | BIT(4)));
+
+        tmp = rtl_read_byte(rtlpriv, 0x7a4);
+        rtl_write_byte(rtlpriv, 0x7a4, (tmp & (~BIT(0))));
+        rtl_write_byte(rtlpriv, 0x7a4, (tmp | BIT(0)));
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "<---\n");
+}
+
+static bool _rtl8821ae_wowlan_initialize_adapter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        bool init_finished = true;
+        u8 tmp = 0;
+
+        /* Get Fw wake up reason. */
+        _rtl8821ae_get_wakeup_reason(hw);
+
+        /* Patch Pcie Rx DMA hang after S3/S4 several times.
+         * The root cause has not be found. */
+        if (_rtl8821ae_check_pcie_dma_hang(hw))
+                _rtl8821ae_reset_pcie_interface_dma(hw, true, false);
+
+        /* Prepare Tx/Rx Desc Hw address. */
+        _rtl8821ae_init_trx_desc_hw_address(hw);
+
+        /* Release Pcie Interface Rx DMA to allow wake packet DMA. */
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0xFE);
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Enable PCIE Rx DMA.\n");
+
+        /* Check wake up event.
+         * We should check wake packet bit before disable wowlan by H2C or
+         * Fw will clear the bit. */
+        tmp = rtl_read_byte(rtlpriv, REG_FTISR + 3);
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                 "Read REG_FTISR 0x13f = %#X\n", tmp);
+
+        /* Set the WoWLAN related function control disable. */
+        rtl8821ae_set_fw_wowlan_mode(hw, false);
+        rtl8821ae_set_fw_remote_wake_ctrl_cmd(hw, 0);
+
+        if (rtlhal->hw_rof_enable) {
+                tmp = rtl_read_byte(rtlpriv, REG_HSISR + 3);
+                if (tmp & BIT(1)) {
+                        /* Clear GPIO9 ISR */
+                        rtl_write_byte(rtlpriv, REG_HSISR + 3, tmp | BIT(1));
+                        init_finished = false;
+                } else {
+                        init_finished = true;
+                }
+        }
+
+        if (init_finished) {
+                _rtl8821ae_simple_initialize_adapter(hw);
+
+                /* Release Pcie Interface Tx DMA. */
+                rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0x00);
+                /* Release Pcie RX DMA */
+                rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, 0x02);
+
+                tmp = rtl_read_byte(rtlpriv, REG_CR + 1);
+                rtl_write_byte(rtlpriv, REG_CR + 1, (tmp & (~BIT(0))));
+
+                _rtl8821ae_enable_l1off(hw);
+                _rtl8821ae_enable_ltr(hw);
+        }
+
+        return init_finished;
+}
+
+static void _rtl8812ae_bb8812_config_1t(struct ieee80211_hw *hw)
+{
+        /* BB OFDM RX Path_A */
+        rtl_set_bbreg(hw, 0x808, 0xff, 0x11);
+        /* BB OFDM TX Path_A */
+        rtl_set_bbreg(hw, 0x80c, MASKLWORD, 0x1111);
+        /* BB CCK R/Rx Path_A */
+        rtl_set_bbreg(hw, 0xa04, 0x0c000000, 0x0);
+        /* MCS support */
+        rtl_set_bbreg(hw, 0x8bc, 0xc0000060, 0x4);
+        /* RF Path_B HSSI OFF */
+        rtl_set_bbreg(hw, 0xe00, 0xf, 0x4);
+        /* RF Path_B Power Down */
+        rtl_set_bbreg(hw, 0xe90, MASKDWORD, 0);
+        /* ADDA Path_B OFF */
+        rtl_set_bbreg(hw, 0xe60, MASKDWORD, 0);
+        rtl_set_bbreg(hw, 0xe64, MASKDWORD, 0);
+}
+
+static void _rtl8821ae_poweroff_adapter(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 u1b_tmp;
+
+        rtlhal->mac_func_enable = false;
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                /* Combo (PCIe + USB) Card and PCIe-MF Card */
+                /* 1. Run LPS WL RFOFF flow */
+                /* RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                "=====>CardDisableRTL8812E,RTL8821A_NIC_LPS_ENTER_FLOW\n");
+                */
+                rtl_hal_pwrseqcmdparsing(rtlpriv,
+                        PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                        PWR_INTF_PCI_MSK, RTL8821A_NIC_LPS_ENTER_FLOW);
+        }
+        /* 2. 0x1F[7:0] = 0 */
+        /* turn off RF */
+        /* rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x00); */
+        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) &&
+                rtlhal->fw_ready) {
+                rtl8821ae_firmware_selfreset(hw);
+        }
+
+        /* Reset MCU. Suggested by Filen. */
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp & (~BIT(2))));
+
+        /* g.   MCUFWDL 0x80[1:0]=0      */
+        /* reset MCU ready status */
+        rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                /* HW card disable configuration. */
+                rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                        PWR_INTF_PCI_MSK, RTL8821A_NIC_DISABLE_FLOW);
+        } else {
+                /* HW card disable configuration. */
+                rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                        PWR_INTF_PCI_MSK, RTL8812_NIC_DISABLE_FLOW);
+        }
+
+        /* Reset MCU IO Wrapper */
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, (u1b_tmp & (~BIT(0))));
+        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL + 1, u1b_tmp | BIT(0));
+
+        /* 7. RSV_CTRL 0x1C[7:0] = 0x0E */
+        /* lock ISO/CLK/Power control register */
+        rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x0e);
+}
+
+int rtl8821ae_hw_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        bool rtstatus = true;
+        int err;
+        u8 tmp_u1b;
+        bool support_remote_wakeup;
+        u32 nav_upper = WIFI_NAV_UPPER_US;
+
+        rtlhal->being_init_adapter = true;
+        rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
+                                      (u8 *)(&support_remote_wakeup));
+        rtlpriv->intf_ops->disable_aspm(hw);
+
+        /*YP wowlan not considered*/
+
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_CR);
+        if (tmp_u1b != 0 && tmp_u1b != 0xEA) {
+                rtlhal->mac_func_enable = true;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "MAC has already power on.\n");
+        } else {
+                rtlhal->mac_func_enable = false;
+                rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON_8821AE;
+        }
+
+        if (support_remote_wakeup &&
+                rtlhal->wake_from_pnp_sleep &&
+                rtlhal->mac_func_enable) {
+                if (_rtl8821ae_wowlan_initialize_adapter(hw)) {
+                        rtlhal->being_init_adapter = false;
+                        return 0;
+                }
+        }
+
+        if (_rtl8821ae_check_pcie_dma_hang(hw)) {
+                _rtl8821ae_reset_pcie_interface_dma(hw,
+                                                    rtlhal->mac_func_enable,
+                                                    false);
+                rtlhal->mac_func_enable = false;
+        }
+
+        /* Reset MAC/BB/RF status if it is not powered off
+         * before calling initialize Hw flow to prevent
+         * from interface and MAC status mismatch.
+         * 2013.06.21, by tynli. Suggested by SD1 JackieLau. */
+        if (rtlhal->mac_func_enable) {
+                _rtl8821ae_poweroff_adapter(hw);
+                rtlhal->mac_func_enable = false;
+        }
+
+        rtstatus = _rtl8821ae_init_mac(hw);
+        if (rtstatus != true) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
+                err = 1;
+                return err;
+        }
+
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_SYS_CFG);
+        tmp_u1b &= 0x7F;
+        rtl_write_byte(rtlpriv, REG_SYS_CFG, tmp_u1b);
+
+        err = rtl8821ae_download_fw(hw, false);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Failed to download FW. Init HW without FW now\n");
+                err = 1;
+                rtlhal->fw_ready = false;
+                return err;
+        } else {
+                rtlhal->fw_ready = true;
+        }
+        ppsc->fw_current_inpsmode = false;
+        rtlhal->fw_ps_state = FW_PS_STATE_ALL_ON_8821AE;
+        rtlhal->fw_clk_change_in_progress = false;
+        rtlhal->allow_sw_to_change_hwclc = false;
+        rtlhal->last_hmeboxnum = 0;
+
+        /*SIC_Init(Adapter);
+        if(rtlhal->AMPDUBurstMode)
+                rtl_write_byte(rtlpriv,REG_AMPDU_BURST_MODE_8812,  0x7F);*/
+
+        rtl8821ae_phy_mac_config(hw);
+        /* because last function modify RCR, so we update
+         * rcr var here, or TP will unstable for receive_config
+         * is wrong, RX RCR_ACRC32 will cause TP unstabel & Rx
+         * RCR_APP_ICV will cause mac80211 unassoc for cisco 1252
+        rtlpci->receive_config = rtl_read_dword(rtlpriv, REG_RCR);
+        rtlpci->receive_config &= ~(RCR_ACRC32 | RCR_AICV);
+        rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);*/
+        rtl8821ae_phy_bb_config(hw);
+
+        rtl8821ae_phy_rf_config(hw);
+
+        if (rtlpriv->phy.rf_type == RF_1T1R &&
+                rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                _rtl8812ae_bb8812_config_1t(hw);
+
+        _rtl8821ae_hw_configure(hw);
+
+        rtl8821ae_phy_switch_wirelessband(hw, BAND_ON_2_4G);
+
+        /*set wireless mode*/
+
+        rtlhal->mac_func_enable = true;
+
+        rtl_cam_reset_all_entry(hw);
+
+        rtl8821ae_enable_hw_security_config(hw);
+
+        ppsc->rfpwr_state = ERFON;
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ETHER_ADDR, mac->mac_addr);
+        _rtl8821ae_enable_aspm_back_door(hw);
+        rtlpriv->intf_ops->enable_aspm(hw);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE &&
+            (rtlhal->rfe_type == 1 || rtlhal->rfe_type == 5))
+                rtl_set_bbreg(hw, 0x900, 0x00000303, 0x0302);
+
+        rtl8821ae_bt_hw_init(hw);
+        rtlpriv->rtlhal.being_init_adapter = false;
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_NAV_UPPER, (u8 *)&nav_upper);
+
+        /* rtl8821ae_dm_check_txpower_tracking(hw); */
+        /* rtl8821ae_phy_lc_calibrate(hw); */
+        if (support_remote_wakeup)
+                rtl_write_byte(rtlpriv, REG_WOW_CTRL, 0);
+
+        /* Release Rx DMA*/
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+        if (tmp_u1b & BIT(2)) {
+                /* Release Rx DMA if needed*/
+                tmp_u1b &= ~BIT(2);
+                rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, tmp_u1b);
+        }
+
+        /* Release Tx/Rx PCIE DMA if*/
+        rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0);
+
+        rtl8821ae_dm_init(hw);
+        rtl8821ae_macid_initialize_mediastatus(hw);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "rtl8821ae_hw_init() <====\n");
+        return err;
+}
+
+static enum version_8821ae _rtl8821ae_read_chip_version(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        enum version_8821ae version = VERSION_UNKNOWN;
+        u32 value32;
+
+        value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "ReadChipVersion8812A 0xF0 = 0x%x\n", value32);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                rtlphy->rf_type = RF_2T2R;
+        else if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE)
+                rtlphy->rf_type = RF_1T1R;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "RF_Type is %x!!\n", rtlphy->rf_type);
+
+        if (value32 & TRP_VAUX_EN) {
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        if (rtlphy->rf_type == RF_2T2R)
+                                version = VERSION_TEST_CHIP_2T2R_8812;
+                        else
+                                version = VERSION_TEST_CHIP_1T1R_8812;
+                } else
+                        version = VERSION_TEST_CHIP_8821;
+        } else {
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        u32 rtl_id = ((value32 & CHIP_VER_RTL_MASK) >> 12) + 1;
+
+                        if (rtlphy->rf_type == RF_2T2R)
+                                version =
+                                        (enum version_8821ae)(CHIP_8812
+                                        | NORMAL_CHIP |
+                                        RF_TYPE_2T2R);
+                        else
+                                version = (enum version_8821ae)(CHIP_8812
+                                        | NORMAL_CHIP);
+
+                        version = (enum version_8821ae)(version | (rtl_id << 12));
+                } else if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                        u32 rtl_id = value32 & CHIP_VER_RTL_MASK;
+
+                        version = (enum version_8821ae)(CHIP_8821
+                                | NORMAL_CHIP | rtl_id);
+                }
+        }
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                /*WL_HWROF_EN.*/
+                value32 = rtl_read_dword(rtlpriv, REG_MULTI_FUNC_CTRL);
+                rtlhal->hw_rof_enable = ((value32 & WL_HWROF_EN) ? 1 : 0);
+        }
+
+        switch (version) {
+        case VERSION_TEST_CHIP_1T1R_8812:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: VERSION_TEST_CHIP_1T1R_8812\n");
+                break;
+        case VERSION_TEST_CHIP_2T2R_8812:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: VERSION_TEST_CHIP_2T2R_8812\n");
+                break;
+        case VERSION_NORMAL_TSMC_CHIP_1T1R_8812:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID:VERSION_NORMAL_TSMC_CHIP_1T1R_8812\n");
+                break;
+        case VERSION_NORMAL_TSMC_CHIP_2T2R_8812:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: VERSION_NORMAL_TSMC_CHIP_2T2R_8812\n");
+                break;
+        case VERSION_NORMAL_TSMC_CHIP_1T1R_8812_C_CUT:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: VERSION_NORMAL_TSMC_CHIP_1T1R_8812 C CUT\n");
+                break;
+        case VERSION_NORMAL_TSMC_CHIP_2T2R_8812_C_CUT:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: VERSION_NORMAL_TSMC_CHIP_2T2R_8812 C CUT\n");
+                break;
+        case VERSION_TEST_CHIP_8821:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: VERSION_TEST_CHIP_8821\n");
+                break;
+        case VERSION_NORMAL_TSMC_CHIP_8821:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: VERSION_NORMAL_TSMC_CHIP_8821 A CUT\n");
+                break;
+        case VERSION_NORMAL_TSMC_CHIP_8821_B_CUT:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: VERSION_NORMAL_TSMC_CHIP_8821 B CUT\n");
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Chip Version ID: Unknow (0x%X)\n", version);
+                break;
+        }
+
+        return version;
+}
+
+static int _rtl8821ae_set_media_status(struct ieee80211_hw *hw,
+                                     enum nl80211_iftype type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 bt_msr = rtl_read_byte(rtlpriv, MSR);
+        enum led_ctl_mode ledaction = LED_CTL_NO_LINK;
+        bt_msr &= 0xfc;
+
+        rtl_write_dword(rtlpriv, REG_BCN_CTRL, 0);
+        RT_TRACE(rtlpriv, COMP_BEACON, DBG_LOUD,
+                "clear 0x550 when set HW_VAR_MEDIA_STATUS\n");
+
+        if (type == NL80211_IFTYPE_UNSPECIFIED ||
+            type == NL80211_IFTYPE_STATION) {
+                _rtl8821ae_stop_tx_beacon(hw);
+                _rtl8821ae_enable_bcn_sub_func(hw);
+        } else if (type == NL80211_IFTYPE_ADHOC ||
+                type == NL80211_IFTYPE_AP) {
+                _rtl8821ae_resume_tx_beacon(hw);
+                _rtl8821ae_disable_bcn_sub_func(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
+                         type);
+        }
+
+        switch (type) {
+        case NL80211_IFTYPE_UNSPECIFIED:
+                bt_msr |= MSR_NOLINK;
+                ledaction = LED_CTL_LINK;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to NO LINK!\n");
+                break;
+        case NL80211_IFTYPE_ADHOC:
+                bt_msr |= MSR_ADHOC;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to Ad Hoc!\n");
+                break;
+        case NL80211_IFTYPE_STATION:
+                bt_msr |= MSR_INFRA;
+                ledaction = LED_CTL_LINK;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to STA!\n");
+                break;
+        case NL80211_IFTYPE_AP:
+                bt_msr |= MSR_AP;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Set Network type to AP!\n");
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Network type %d not support!\n", type);
+                return 1;
+        }
+
+        rtl_write_byte(rtlpriv, (MSR), bt_msr);
+        rtlpriv->cfg->ops->led_control(hw, ledaction);
+        if ((bt_msr & 0xfc) == MSR_AP)
+                rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
+        else
+                rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);
+
+        return 0;
+}
+
+void rtl8821ae_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u32 reg_rcr = rtlpci->receive_config;
+
+        if (rtlpriv->psc.rfpwr_state != ERFON)
+                return;
+
+        if (check_bssid) {
+                reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
+                rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
+                                              (u8 *)(&reg_rcr));
+                _rtl8821ae_set_bcn_ctrl_reg(hw, 0, BIT(4));
+        } else if (!check_bssid) {
+                reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN));
+                _rtl8821ae_set_bcn_ctrl_reg(hw, BIT(4), 0);
+                rtlpriv->cfg->ops->set_hw_reg(hw,
+                        HW_VAR_RCR, (u8 *)(&reg_rcr));
+        }
+}
+
+int rtl8821ae_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "rtl8821ae_set_network_type!\n");
+
+        if (_rtl8821ae_set_media_status(hw, type))
+                return -EOPNOTSUPP;
+
+        if (rtlpriv->mac80211.link_state == MAC80211_LINKED) {
+                if (type != NL80211_IFTYPE_AP)
+                        rtl8821ae_set_check_bssid(hw, true);
+        } else {
+                rtl8821ae_set_check_bssid(hw, false);
+        }
+
+        return 0;
+}
+
+/* don't set REG_EDCA_BE_PARAM here because mac80211 will send pkt when scan */
+void rtl8821ae_set_qos(struct ieee80211_hw *hw, int aci)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        rtl8821ae_dm_init_edca_turbo(hw);
+        switch (aci) {
+        case AC1_BK:
+                rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, 0xa44f);
+                break;
+        case AC0_BE:
+                /* rtl_write_dword(rtlpriv, REG_EDCA_BE_PARAM, u4b_ac_param); */
+                break;
+        case AC2_VI:
+                rtl_write_dword(rtlpriv, REG_EDCA_VI_PARAM, 0x5e4322);
+                break;
+        case AC3_VO:
+                rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, 0x2f3222);
+                break;
+        default:
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
+                break;
+        }
+}
+
+static void rtl8821ae_clear_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 tmp;
+        tmp = rtl_read_dword(rtlpriv, REG_HISR);
+        /*printk("clear interrupt first:\n");
+        printk("0x%x = 0x%08x\n",REG_HISR, tmp);*/
+        rtl_write_dword(rtlpriv, REG_HISR, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HISRE);
+        /*printk("0x%x = 0x%08x\n",REG_HISRE, tmp);*/
+        rtl_write_dword(rtlpriv, REG_HISRE, tmp);
+
+        tmp = rtl_read_dword(rtlpriv, REG_HSISR);
+        /*printk("0x%x = 0x%08x\n",REG_HSISR, tmp);*/
+        rtl_write_dword(rtlpriv, REG_HSISR, tmp);
+}
+
+void rtl8821ae_enable_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        rtl8821ae_clear_interrupt(hw);/*clear it here first*/
+
+        rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
+        rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
+        rtlpci->irq_enabled = true;
+        /* there are some C2H CMDs have been sent before
+        system interrupt is enabled, e.g., C2H, CPWM.
+        *So we need to clear all C2H events that FW has
+        notified, otherwise FW won't schedule any commands anymore.
+        */
+        /* rtl_write_byte(rtlpriv, REG_C2HEVT_CLEAR, 0); */
+        /*enable system interrupt*/
+        rtl_write_dword(rtlpriv, REG_HSIMR, rtlpci->sys_irq_mask & 0xFFFFFFFF);
+}
+
+void rtl8821ae_disable_interrupt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        rtl_write_dword(rtlpriv, REG_HIMR, IMR_DISABLED);
+        rtl_write_dword(rtlpriv, REG_HIMRE, IMR_DISABLED);
+        rtlpci->irq_enabled = false;
+        /*synchronize_irq(rtlpci->pdev->irq);*/
+}
+
+static void _rtl8821ae_clear_pci_pme_status(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u16 cap_hdr;
+        u8 cap_pointer;
+        u8 cap_id = 0xff;
+        u8 pmcs_reg;
+        u8 cnt = 0;
+
+        /* Get the Capability pointer first,
+         * the Capability Pointer is located at
+         * offset 0x34 from the Function Header */
+
+        pci_read_config_byte(rtlpci->pdev, 0x34, &cap_pointer);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "PCI configration 0x34 = 0x%2x\n", cap_pointer);
+
+        do {
+                pci_read_config_word(rtlpci->pdev, cap_pointer, &cap_hdr);
+                cap_id = cap_hdr & 0xFF;
+
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "in pci configration, cap_pointer%x = %x\n",
+                          cap_pointer, cap_id);
+
+                if (cap_id == 0x01) {
+                        break;
+                } else {
+                        /* point to next Capability */
+                        cap_pointer = (cap_hdr >> 8) & 0xFF;
+                        /* 0: end of pci capability, 0xff: invalid value */
+                        if (cap_pointer == 0x00 || cap_pointer == 0xff) {
+                                cap_id = 0xff;
+                                break;
+                        }
+                }
+        } while (cnt++ < 200);
+
+        if (cap_id == 0x01) {
+                /* Get the PM CSR (Control/Status Register),
+                 * The PME_Status is located at PM Capatibility offset 5, bit 7
+                 */
+                pci_read_config_byte(rtlpci->pdev, cap_pointer + 5, &pmcs_reg);
+
+                if (pmcs_reg & BIT(7)) {
+                        /* PME event occured, clear the PM_Status by write 1 */
+                        pmcs_reg = pmcs_reg | BIT(7);
+
+                        pci_write_config_byte(rtlpci->pdev, cap_pointer + 5,
+                                              pmcs_reg);
+                        /* Read it back to check */
+                        pci_read_config_byte(rtlpci->pdev, cap_pointer + 5,
+                                             &pmcs_reg);
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                                 "Clear PME status 0x%2x to 0x%2x\n",
+                                  cap_pointer + 5, pmcs_reg);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                                 "PME status(0x%2x) = 0x%2x\n",
+                                  cap_pointer + 5, pmcs_reg);
+                }
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING,
+                         "Cannot find PME Capability\n");
+        }
+}
+
+void rtl8821ae_card_disable(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
+        struct rtl_mac *mac = rtl_mac(rtlpriv);
+        enum nl80211_iftype opmode;
+        bool support_remote_wakeup;
+        u8 tmp;
+        u32 count = 0;
+
+        rtlpriv->cfg->ops->get_hw_reg(hw, HAL_DEF_WOWLAN,
+                                      (u8 *)(&support_remote_wakeup));
+
+        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+
+        if (!(support_remote_wakeup && mac->opmode == NL80211_IFTYPE_STATION)
+            || !rtlhal->enter_pnp_sleep) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Normal Power off\n");
+                mac->link_state = MAC80211_NOLINK;
+                opmode = NL80211_IFTYPE_UNSPECIFIED;
+                _rtl8821ae_set_media_status(hw, opmode);
+                _rtl8821ae_poweroff_adapter(hw);
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Wowlan Supported.\n");
+                /* 3 <1> Prepare for configuring wowlan related infomations */
+                /* Clear Fw WoWLAN event. */
+                rtl_write_byte(rtlpriv, REG_MCUTST_WOWLAN, 0x0);
+
+#if (USE_SPECIFIC_FW_TO_SUPPORT_WOWLAN == 1)
+                rtl8821ae_set_fw_related_for_wowlan(hw, true);
+#endif
+                /* Dynamically adjust Tx packet boundary
+                 * for download reserved page packet.
+                 * reserve 30 pages for rsvd page */
+                if (_rtl8821ae_dynamic_rqpn(hw, 0xE0, 0x3, 0x80c20d0d))
+                        rtlhal->re_init_llt_table = true;
+
+                /* 3 <2> Set Fw releted H2C cmd. */
+
+                /* Set WoWLAN related security information. */
+                rtl8821ae_set_fw_global_info_cmd(hw);
+
+                _rtl8821ae_download_rsvd_page(hw, true);
+
+                /* Just enable AOAC related functions when we connect to AP. */
+                printk("mac->link_state = %d\n", mac->link_state);
+                if (mac->link_state >= MAC80211_LINKED &&
+                    mac->opmode == NL80211_IFTYPE_STATION) {
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AID, NULL);
+                        rtl8821ae_set_fw_media_status_rpt_cmd(hw,
+                                                              RT_MEDIA_CONNECT);
+
+                        rtl8821ae_set_fw_wowlan_mode(hw, true);
+                        /* Enable Fw Keep alive mechanism. */
+                        rtl8821ae_set_fw_keep_alive_cmd(hw, true);
+
+                        /* Enable disconnect decision control. */
+                        rtl8821ae_set_fw_disconnect_decision_ctrl_cmd(hw, true);
+                }
+
+                /* 3 <3> Hw Configutations */
+
+                /* Wait untill Rx DMA Finished before host sleep.
+                 * FW Pause Rx DMA may happens when received packet doing dma.
+                 */
+                rtl_write_byte(rtlpriv, REG_RXDMA_CONTROL, BIT(2));
+
+                tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+                count = 0;
+                while (!(tmp & BIT(1)) && (count++ < 100)) {
+                        udelay(10);
+                        tmp = rtl_read_byte(rtlpriv, REG_RXDMA_CONTROL);
+                }
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Wait Rx DMA Finished before host sleep. count=%d\n",
+                          count);
+
+                /* reset trx ring */
+                rtlpriv->intf_ops->reset_trx_ring(hw);
+
+                rtl_write_byte(rtlpriv, REG_APS_FSMCO + 1, 0x0);
+
+                _rtl8821ae_clear_pci_pme_status(hw);
+                tmp = rtl_read_byte(rtlpriv, REG_SYS_CLKR);
+                rtl_write_byte(rtlpriv, REG_SYS_CLKR, tmp | BIT(3));
+                /* prevent 8051 to be reset by PERST */
+                rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x20);
+                rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x60);
+        }
+
+        if (rtlpriv->rtlhal.driver_is_goingto_unload ||
+            ppsc->rfoff_reason > RF_CHANGE_BY_PS)
+                rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
+        /* For wowlan+LPS+32k. */
+        if (support_remote_wakeup && rtlhal->enter_pnp_sleep) {
+                /* Set the WoWLAN related function control enable.
+                 * It should be the last H2C cmd in the WoWLAN flow. */
+                rtl8821ae_set_fw_remote_wake_ctrl_cmd(hw, 1);
+
+                /* Stop Pcie Interface Tx DMA. */
+                rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0xff);
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Stop PCIE Tx DMA.\n");
+
+                /* Wait for TxDMA idle. */
+                count = 0;
+                do {
+                        tmp = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG);
+                        udelay(10);
+                        count++;
+                } while ((tmp != 0) && (count < 100));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Wait Tx DMA Finished before host sleep. count=%d\n",
+                          count);
+
+                if (rtlhal->hw_rof_enable) {
+                        printk("hw_rof_enable\n");
+                        tmp = rtl_read_byte(rtlpriv, REG_HSISR + 3);
+                        rtl_write_byte(rtlpriv, REG_HSISR + 3, tmp | BIT(1));
+                }
+        }
+        /* after power off we should do iqk again */
+        rtlpriv->phy.iqk_initialized = false;
+}
+
+void rtl8821ae_interrupt_recognized(struct ieee80211_hw *hw,
+                                  u32 *p_inta, u32 *p_intb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        *p_inta = rtl_read_dword(rtlpriv, ISR) & rtlpci->irq_mask[0];
+        rtl_write_dword(rtlpriv, ISR, *p_inta);
+
+        *p_intb = rtl_read_dword(rtlpriv, REG_HISRE) & rtlpci->irq_mask[1];
+        rtl_write_dword(rtlpriv, REG_HISRE, *p_intb);
+}
+
+void rtl8821ae_set_beacon_related_registers(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u16 bcn_interval, atim_window;
+
+        bcn_interval = mac->beacon_interval;
+        atim_window = 2;        /*FIX MERGE */
+        rtl8821ae_disable_interrupt(hw);
+        rtl_write_word(rtlpriv, REG_ATIMWND, atim_window);
+        rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
+        rtl_write_word(rtlpriv, REG_BCNTCFG, 0x660f);
+        rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_CCK, 0x18);
+        rtl_write_byte(rtlpriv, REG_RXTSF_OFFSET_OFDM, 0x18);
+        rtl_write_byte(rtlpriv, 0x606, 0x30);
+        rtlpci->reg_bcn_ctrl_val |= BIT(3);
+        rtl_write_byte(rtlpriv, REG_BCN_CTRL, (u8)rtlpci->reg_bcn_ctrl_val);
+        rtl8821ae_enable_interrupt(hw);
+}
+
+void rtl8821ae_set_beacon_interval(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u16 bcn_interval = mac->beacon_interval;
+
+        RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
+                 "beacon_interval:%d\n", bcn_interval);
+        rtl8821ae_disable_interrupt(hw);
+        rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
+        rtl8821ae_enable_interrupt(hw);
+}
+
+void rtl8821ae_update_interrupt_mask(struct ieee80211_hw *hw,
+                                   u32 add_msr, u32 rm_msr)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
+                 "add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);
+
+        if (add_msr)
+                rtlpci->irq_mask[0] |= add_msr;
+        if (rm_msr)
+                rtlpci->irq_mask[0] &= (~rm_msr);
+        rtl8821ae_disable_interrupt(hw);
+        rtl8821ae_enable_interrupt(hw);
+}
+
+static u8 _rtl8821ae_get_chnl_group(u8 chnl)
+{
+        u8 group = 0;
+
+        if (chnl <= 14) {
+                if (1 <= chnl && chnl <= 2)
+                        group = 0;
+        else if (3 <= chnl && chnl <= 5)
+                        group = 1;
+        else if (6 <= chnl && chnl <= 8)
+                        group = 2;
+        else if (9 <= chnl && chnl <= 11)
+                        group = 3;
+        else /*if (12 <= chnl && chnl <= 14)*/
+                        group = 4;
+        } else {
+                if (36 <= chnl && chnl <= 42)
+                        group = 0;
+        else if (44 <= chnl && chnl <= 48)
+                        group = 1;
+        else if (50 <= chnl && chnl <= 58)
+                        group = 2;
+        else if (60 <= chnl && chnl <= 64)
+                        group = 3;
+        else if (100 <= chnl && chnl <= 106)
+                        group = 4;
+        else if (108 <= chnl && chnl <= 114)
+                        group = 5;
+        else if (116 <= chnl && chnl <= 122)
+                        group = 6;
+        else if (124 <= chnl && chnl <= 130)
+                        group = 7;
+        else if (132 <= chnl && chnl <= 138)
+                        group = 8;
+        else if (140 <= chnl && chnl <= 144)
+                        group = 9;
+        else if (149 <= chnl && chnl <= 155)
+                        group = 10;
+        else if (157 <= chnl && chnl <= 161)
+                        group = 11;
+        else if (165 <= chnl && chnl <= 171)
+                        group = 12;
+        else if (173 <= chnl && chnl <= 177)
+                        group = 13;
+                else
+                        /*RT_TRACE(rtlpriv, COMP_EFUSE,DBG_LOUD,
+                                "5G, Channel %d in Group not found\n",chnl);*/
+                        RT_ASSERT(!COMP_EFUSE,
+                                "5G, Channel %d in Group not found\n", chnl);
+        }
+        return group;
+}
+
+static void _rtl8821ae_read_power_value_fromprom(struct ieee80211_hw *hw,
+        struct txpower_info_2g *pwrinfo24g,
+        struct txpower_info_5g *pwrinfo5g,
+        bool autoload_fail,
+        u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        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*/
+                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++) {
+                        /*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;
+                        }
+                        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;
+                                }
+                        }
+                        /*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;
+                                } 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;
+                                }
+                        }
+                }
+                return;
+        }
+
+        rtl_priv(hw)->efuse.txpwr_fromeprom = true;
+
+        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;
+                }
+                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;
+                }
+                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;
+                                /*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->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->bw20_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0x0f);
+                                if (pwrinfo24g->bw20_diff[rfPath][TxCount] & BIT(3))
+                                        pwrinfo24g->bw20_diff[rfPath][TxCount] |= 0xF0;
+
+                                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->cck_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0x0f);
+                                if (pwrinfo24g->cck_diff[rfPath][TxCount] & BIT(3))
+                                        pwrinfo24g->cck_diff[rfPath][TxCount] |= 0xF0;
+
+                                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;
+                }
+
+                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->ofdm_diff[rfPath][0] = (hwinfo[eeAddr] & 0x0f);
+                                if (pwrinfo5g->ofdm_diff[rfPath][TxCount] & BIT(3))
+                                        pwrinfo5g->ofdm_diff[rfPath][TxCount] |= 0xF0;
+
+                                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->bw20_diff[rfPath][TxCount] = (hwinfo[eeAddr] & 0x0f);
+                                if (pwrinfo5g->bw20_diff[rfPath][TxCount] & BIT(3))
+                                        pwrinfo5g->bw20_diff[rfPath][TxCount] |= 0xF0;
+
+                                eeAddr++;
+                        }
+                }
+
+                pwrinfo5g->ofdm_diff[rfPath][1] =       (hwinfo[eeAddr] & 0xf0) >> 4;
+                pwrinfo5g->ofdm_diff[rfPath][2] =       (hwinfo[eeAddr] & 0x0f);
+
+                eeAddr++;
+
+                pwrinfo5g->ofdm_diff[rfPath][3] = (hwinfo[eeAddr] & 0x0f);
+
+                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 = 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;
+                        /* 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;
+
+                        eeAddr++;
+                }
+        }
+}
+#if 0
+static void _rtl8812ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
+                                                 bool autoload_fail,
+                                                 u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct txpower_info_2g pwrinfo24g;
+        struct txpower_info_5g pwrinfo5g;
+        u8 channel5g[CHANNEL_MAX_NUMBER_5G] = {
+                36, 38, 40, 42, 44, 46, 48, 50, 52, 54,
+                56, 58, 60, 62, 64, 100, 102, 104, 106,
+                108, 110, 112, 114, 116, 118, 120, 122,
+                124, 126, 128, 130, 132, 134, 136, 138,
+                140, 142, 144, 149, 151, 153, 155, 157,
+                159, 161, 163, 165, 167, 168, 169, 171, 173, 175, 177};
+        u8 channel5g_80m[CHANNEL_MAX_NUMBER_5G_80M] = {42, 58, 106, 122, 138, 155, 171};
+        u8 rf_path, index;
+        u8 i;
+
+        _rtl8821ae_read_power_value_fromprom(hw, &pwrinfo24g,
+                                        &pwrinfo5g, autoload_fail, hwinfo);
+
+        for (rf_path = 0; rf_path < 2; rf_path++) {
+                for (i = 0; i < CHANNEL_MAX_NUMBER_2G; i++) {
+                        index = _rtl8821ae_get_chnl_group(i + 1);
+
+                        if (i == CHANNEL_MAX_NUMBER_2G - 1) {
+                                rtlefuse->txpwrlevel_cck[rf_path][i] =
+                                        pwrinfo24g.index_cck_base[rf_path][5];
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
+                                        pwrinfo24g.index_bw40_base[rf_path][index];
+                        } else {
+                                rtlefuse->txpwrlevel_cck[rf_path][i] =
+                                        pwrinfo24g.index_cck_base[rf_path][index];
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
+                                        pwrinfo24g.index_bw40_base[rf_path][index];
+                        }
+                }
+
+                for (i = 0; i < CHANNEL_MAX_NUMBER_5G; i++) {
+                        index = _rtl8821ae_get_chnl_group(channel5g[i]);
+                        rtlefuse->txpwr_5g_bw40base[rf_path][i] =
+                                        pwrinfo5g.index_bw40_base[rf_path][index];
+                }
+                for (i = 0; i < CHANNEL_MAX_NUMBER_5G_80M; i++) {
+                        u8 upper, lower;
+                        index = _rtl8821ae_get_chnl_group(channel5g_80m[i]);
+                        upper = pwrinfo5g.index_bw40_base[rf_path][index];
+                        lower = pwrinfo5g.index_bw40_base[rf_path][index + 1];
+
+                        rtlefuse->txpwr_5g_bw80base[rf_path][i] = (upper + lower) / 2;
+                }
+                for (i = 0; i < MAX_TX_COUNT; i++) {
+                        rtlefuse->txpwr_cckdiff[rf_path][i] =
+                                pwrinfo24g.cck_diff[rf_path][i];
+                        rtlefuse->txpwr_legacyhtdiff[rf_path][i] =
+                                pwrinfo24g.ofdm_diff[rf_path][i];
+                        rtlefuse->txpwr_ht20diff[rf_path][i] =
+                                pwrinfo24g.bw20_diff[rf_path][i];
+                        rtlefuse->txpwr_ht40diff[rf_path][i] =
+                                pwrinfo24g.bw40_diff[rf_path][i];
+
+                        rtlefuse->txpwr_5g_ofdmdiff[rf_path][i] =
+                                pwrinfo5g.ofdm_diff[rf_path][i];
+                        rtlefuse->txpwr_5g_bw20diff[rf_path][i] =
+                                pwrinfo5g.bw20_diff[rf_path][i];
+                        rtlefuse->txpwr_5g_bw40diff[rf_path][i] =
+                                pwrinfo5g.bw40_diff[rf_path][i];
+                        rtlefuse->txpwr_5g_bw80diff[rf_path][i] =
+                                pwrinfo5g.bw80_diff[rf_path][i];
+                }
+        }
+
+        if (!autoload_fail) {
+                rtlefuse->eeprom_regulatory =
+                        hwinfo[EEPROM_RF_BOARD_OPTION] & 0x07;/*bit0~2*/
+                if (hwinfo[EEPROM_RF_BOARD_OPTION] == 0xFF)
+                        rtlefuse->eeprom_regulatory = 0;
+        } else {
+                rtlefuse->eeprom_regulatory = 0;
+        }
+
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
+        "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
+}
+#endif
+static void _rtl8821ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
+                                                 bool autoload_fail,
+                                                 u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct txpower_info_2g pwrinfo24g;
+        struct txpower_info_5g pwrinfo5g;
+        u8 channel5g[CHANNEL_MAX_NUMBER_5G] = {
+                36, 38, 40, 42, 44, 46, 48, 50, 52, 54,
+                56, 58, 60, 62, 64, 100, 102, 104, 106,
+                108, 110, 112, 114, 116, 118, 120, 122,
+                124, 126, 128, 130, 132, 134, 136, 138,
+                140, 142, 144, 149, 151, 153, 155, 157,
+                159, 161, 163, 165, 167, 168, 169, 171,
+                173, 175, 177};
+        u8 channel5g_80m[CHANNEL_MAX_NUMBER_5G_80M] = {
+                42, 58, 106, 122, 138, 155, 171};
+        u8 rf_path, index;
+        u8 i;
+
+        _rtl8821ae_read_power_value_fromprom(hw, &pwrinfo24g,
+                &pwrinfo5g, autoload_fail, hwinfo);
+
+        for (rf_path = 0; rf_path < 2; rf_path++) {
+                for (i = 0; i < CHANNEL_MAX_NUMBER_2G; i++) {
+                        index = _rtl8821ae_get_chnl_group(i + 1);
+
+                        if (i == CHANNEL_MAX_NUMBER_2G - 1) {
+                                rtlefuse->txpwrlevel_cck[rf_path][i] =
+                                        pwrinfo24g.index_cck_base[rf_path][5];
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
+                                        pwrinfo24g.index_bw40_base[rf_path][index];
+                        } else {
+                                rtlefuse->txpwrlevel_cck[rf_path][i] =
+                                        pwrinfo24g.index_cck_base[rf_path][index];
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =
+                                        pwrinfo24g.index_bw40_base[rf_path][index];
+                        }
+                }
+
+                for (i = 0; i < CHANNEL_MAX_NUMBER_5G; i++) {
+                        index = _rtl8821ae_get_chnl_group(channel5g[i]);
+                        rtlefuse->txpwr_5g_bw40base[rf_path][i] =
+                                pwrinfo5g.index_bw40_base[rf_path][index];
+                }
+                for (i = 0; i < CHANNEL_MAX_NUMBER_5G_80M; i++) {
+                        u8 upper, lower;
+                        index = _rtl8821ae_get_chnl_group(channel5g_80m[i]);
+                        upper = pwrinfo5g.index_bw40_base[rf_path][index];
+                        lower = pwrinfo5g.index_bw40_base[rf_path][index + 1];
+
+                        rtlefuse->txpwr_5g_bw80base[rf_path][i] = (upper + lower) / 2;
+                }
+                for (i = 0; i < MAX_TX_COUNT; i++) {
+                        rtlefuse->txpwr_cckdiff[rf_path][i] =
+                                pwrinfo24g.cck_diff[rf_path][i];
+                        rtlefuse->txpwr_legacyhtdiff[rf_path][i] =
+                                pwrinfo24g.ofdm_diff[rf_path][i];
+                        rtlefuse->txpwr_ht20diff[rf_path][i] =
+                                pwrinfo24g.bw20_diff[rf_path][i];
+                        rtlefuse->txpwr_ht40diff[rf_path][i] =
+                                pwrinfo24g.bw40_diff[rf_path][i];
+
+                        rtlefuse->txpwr_5g_ofdmdiff[rf_path][i] =
+                                pwrinfo5g.ofdm_diff[rf_path][i];
+                        rtlefuse->txpwr_5g_bw20diff[rf_path][i] =
+                                pwrinfo5g.bw20_diff[rf_path][i];
+                        rtlefuse->txpwr_5g_bw40diff[rf_path][i] =
+                                pwrinfo5g.bw40_diff[rf_path][i];
+                        rtlefuse->txpwr_5g_bw80diff[rf_path][i] =
+                                pwrinfo5g.bw80_diff[rf_path][i];
+                }
+        }
+        /*bit0~2*/
+        if (!autoload_fail) {
+                rtlefuse->eeprom_regulatory = hwinfo[EEPROM_RF_BOARD_OPTION] & 0x07;
+                if (hwinfo[EEPROM_RF_BOARD_OPTION] == 0xFF)
+                        rtlefuse->eeprom_regulatory = 0;
+        } else {
+                rtlefuse->eeprom_regulatory = 0;
+        }
+
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
+        "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
+}
+
+static void _rtl8812ae_read_pa_type(struct ieee80211_hw *hw, u8 *hwinfo,
+                                    bool autoload_fail)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+
+        if (!autoload_fail) {
+                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;
+                }
+                rtlhal->external_pa_2g = ((rtlhal->pa_type_2g & BIT(5)) &&
+                                          (rtlhal->pa_type_2g & BIT(4))) ?
+                                         1 : 0;
+                rtlhal->external_lna_2g = ((rtlhal->lna_type_2g & BIT(7)) &&
+                                           (rtlhal->lna_type_2g & BIT(3))) ?
+                                          1 : 0;
+
+                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;
+                }
+                rtlhal->external_pa_5g = ((rtlhal->pa_type_5g & BIT(1)) &&
+                                          (rtlhal->pa_type_5g & BIT(0))) ?
+                                         1 : 0;
+                rtlhal->external_lna_5g = ((rtlhal->lna_type_5g & BIT(7)) &&
+                                           (rtlhal->lna_type_5g & BIT(3))) ?
+                                          1 : 0;
+        } else {
+                rtlhal->external_pa_2g  = 0;
+                rtlhal->external_lna_2g = 0;
+                rtlhal->external_pa_5g  = 0;
+                rtlhal->external_lna_5g = 0;
+        }
+}
+
+static void _rtl8821ae_read_pa_type(struct ieee80211_hw *hw, u8 *hwinfo,
+                                    bool autoload_fail)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+
+        if (!autoload_fail) {
+                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;
+                }
+                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];
+                if (rtlhal->pa_type_5g == 0xFF && rtlhal->lna_type_5g == 0xFF) {
+                        rtlhal->pa_type_5g = 0;
+                        rtlhal->lna_type_5g = 0;
+                }
+                rtlhal->external_pa_5g = (rtlhal->pa_type_5g & BIT(1)) ? 1 : 0;
+                rtlhal->external_lna_5g = (rtlhal->lna_type_5g & BIT(7)) ? 1 : 0;
+        } else {
+                rtlhal->external_pa_2g  = 0;
+                rtlhal->external_lna_2g = 0;
+                rtlhal->external_pa_5g  = 0;
+                rtlhal->external_lna_5g = 0;
+        }
+}
+
+static void _rtl8821ae_read_rfe_type(struct ieee80211_hw *hw, u8 *hwinfo,
+                              bool autoload_fail)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+
+        if (!autoload_fail) {
+                if (hwinfo[EEPROM_RFE_OPTION] & BIT(7)) {
+                        if (rtlhal->external_lna_5g) {
+                                if (rtlhal->external_pa_5g) {
+                                        if (rtlhal->external_lna_2g &&
+                                            rtlhal->external_pa_2g)
+                                                rtlhal->rfe_type = 3;
+                                        else
+                                                rtlhal->rfe_type = 0;
+                                } else {
+                                        rtlhal->rfe_type = 2;
+                                }
+                        } else {
+                                rtlhal->rfe_type = 4;
+                        }
+                } else {
+                        rtlhal->rfe_type = hwinfo[EEPROM_RFE_OPTION] & 0x3F;
+
+                        if (rtlhal->rfe_type == 4 &&
+                            (rtlhal->external_pa_5g ||
+                             rtlhal->external_pa_2g ||
+                             rtlhal->external_lna_5g ||
+                             rtlhal->external_lna_2g)) {
+                                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                                        rtlhal->rfe_type = 2;
+                        }
+                }
+        } else {
+                rtlhal->rfe_type = 0x04;
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "RFE Type: 0x%2x\n", rtlhal->rfe_type);
+}
+
+static void _rtl8812ae_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
+                                              bool auto_load_fail, u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 value;
+
+        if (!auto_load_fail) {
+                value = *(u8 *)&hwinfo[EEPROM_RF_BOARD_OPTION];
+                if (((value & 0xe0) >> 5) == 0x1)
+                        rtlpriv->btcoexist.btc_info.btcoexist = 1;
+                else
+                        rtlpriv->btcoexist.btc_info.btcoexist = 0;
+                rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8812A;
+
+                value = hwinfo[EEPROM_RF_BT_SETTING];
+                rtlpriv->btcoexist.btc_info.ant_num = (value & 0x1);
+        } else {
+                rtlpriv->btcoexist.btc_info.btcoexist = 0;
+                rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8812A;
+                rtlpriv->btcoexist.btc_info.ant_num = ANT_X2;
+        }
+        /*move BT_InitHalVars() to init_sw_vars*/
+}
+
+static void _rtl8821ae_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
+                                              bool auto_load_fail, u8 *hwinfo)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 value;
+        u32 tmpu_32;
+
+        if (!auto_load_fail) {
+                tmpu_32 = rtl_read_dword(rtlpriv, REG_MULTI_FUNC_CTRL);
+                if (tmpu_32 & BIT(18))
+                        rtlpriv->btcoexist.btc_info.btcoexist = 1;
+                else
+                        rtlpriv->btcoexist.btc_info.btcoexist = 0;
+                rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8821A;
+
+                value = hwinfo[EEPROM_RF_BT_SETTING];
+                rtlpriv->btcoexist.btc_info.ant_num = (value & 0x1);
+        } else {
+                rtlpriv->btcoexist.btc_info.btcoexist = 0;
+                rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8821A;
+                rtlpriv->btcoexist.btc_info.ant_num = ANT_X2;
+        }
+        /*move BT_InitHalVars() to init_sw_vars*/
+}
+
+static void _rtl8821ae_read_adapter_info(struct ieee80211_hw *hw, bool b_pseudo_test)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        u16 i, usvalue;
+        u8 hwinfo[HWSET_MAX_SIZE];
+        u16 eeprom_id;
+
+        if (b_pseudo_test) {
+                ;/* need add */
+        }
+
+        if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {
+                rtl_efuse_shadow_map_update(hw);
+                memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
+                       HWSET_MAX_SIZE);
+        } else if (rtlefuse->epromtype == EEPROM_93C46) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "RTL819X Not boot from eeprom, check it !!");
+        }
+
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP\n",
+                      hwinfo, HWSET_MAX_SIZE);
+
+        eeprom_id = *((u16 *)&hwinfo[0]);
+        if (eeprom_id != RTL_EEPROM_ID) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
+                rtlefuse->autoload_failflag = true;
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
+                rtlefuse->autoload_failflag = false;
+        }
+
+        if (rtlefuse->autoload_failflag) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "RTL8812AE autoload_failflag, check it !!");
+                return;
+        }
+
+        rtlefuse->eeprom_version = *(u8 *)&hwinfo[EEPROM_VERSION];
+        if (rtlefuse->eeprom_version == 0xff)
+                        rtlefuse->eeprom_version = 0;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM version: 0x%2x\n", rtlefuse->eeprom_version);
+
+        rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
+        rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
+        rtlefuse->eeprom_svid = *(u16 *)&hwinfo[EEPROM_SVID];
+        rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROMId = 0x%4x\n", eeprom_id);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
+
+        /*customer ID*/
+        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        if (rtlefuse->eeprom_oemid == 0xFF)
+                rtlefuse->eeprom_oemid = 0;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
+
+        for (i = 0; i < 6; i += 2) {
+                usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
+                *((u16 *)(&rtlefuse->dev_addr[i])) = usvalue;
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "dev_addr: %pM\n", rtlefuse->dev_addr);
+
+        _rtl8821ae_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag,
+                                               hwinfo);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                _rtl8812ae_read_pa_type(hw, hwinfo, rtlefuse->autoload_failflag);
+                _rtl8812ae_read_bt_coexist_info_from_hwpg(hw,
+                                rtlefuse->autoload_failflag, hwinfo);
+        } else {
+                _rtl8821ae_read_pa_type(hw, hwinfo, rtlefuse->autoload_failflag);
+                _rtl8821ae_read_bt_coexist_info_from_hwpg(hw,
+                                rtlefuse->autoload_failflag, hwinfo);
+        }
+
+        _rtl8821ae_read_rfe_type(hw, hwinfo, rtlefuse->autoload_failflag);
+        /*board type*/
+        rtlefuse->board_type = ODM_BOARD_DEFAULT;
+        if (rtlhal->external_lna_2g != 0)
+                rtlefuse->board_type |= ODM_BOARD_EXT_LNA;
+        if (rtlhal->external_lna_5g != 0)
+                rtlefuse->board_type |= ODM_BOARD_EXT_LNA_5G;
+        if (rtlhal->external_pa_2g != 0)
+                rtlefuse->board_type |= ODM_BOARD_EXT_PA;
+        if (rtlhal->external_pa_5g != 0)
+                rtlefuse->board_type |= ODM_BOARD_EXT_PA_5G;
+
+        if (rtlpriv->btcoexist.btc_info.btcoexist == 1)
+                rtlefuse->board_type |= ODM_BOARD_BT;
+
+        rtlhal->board_type = rtlefuse->board_type;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "board_type = 0x%x\n", rtlefuse->board_type);
+
+        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        if (rtlefuse->eeprom_channelplan == 0xff)
+                rtlefuse->eeprom_channelplan = 0x7F;
+
+        /* set channel paln to world wide 13 */
+        /* rtlefuse->channel_plan = (u8)rtlefuse->eeprom_channelplan; */
+
+        /*parse xtal*/
+        rtlefuse->crystalcap = hwinfo[EEPROM_XTAL_8821AE];
+        if (rtlefuse->crystalcap == 0xFF)
+                rtlefuse->crystalcap = 0x20;
+
+        rtlefuse->eeprom_thermalmeter = *(u8 *)&hwinfo[EEPROM_THERMAL_METER];
+        if ((rtlefuse->eeprom_thermalmeter == 0xff) ||
+            rtlefuse->autoload_failflag) {
+                rtlefuse->apk_thermalmeterignore = true;
+                rtlefuse->eeprom_thermalmeter = 0xff;
+        }
+
+        rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
+
+        if (!rtlefuse->autoload_failflag) {
+                rtlefuse->antenna_div_cfg =
+                  (hwinfo[EEPROM_RF_BOARD_OPTION] & 0x18) >> 3;
+                if (hwinfo[EEPROM_RF_BOARD_OPTION] == 0xff)
+                        rtlefuse->antenna_div_cfg = 0;
+
+                if (rtlpriv->btcoexist.btc_info.btcoexist == 1 &&
+                    rtlpriv->btcoexist.btc_info.ant_num == ANT_X1)
+                        rtlefuse->antenna_div_cfg = 0;
+
+                rtlefuse->antenna_div_type = hwinfo[EEPROM_RF_ANTENNA_OPT_88E];
+                if (rtlefuse->antenna_div_type == 0xff)
+                        rtlefuse->antenna_div_type = FIXED_HW_ANTDIV;
+        } else {
+                rtlefuse->antenna_div_cfg = 0;
+                rtlefuse->antenna_div_type = 0;
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                "SWAS: bHwAntDiv = %x, TRxAntDivType = %x\n",
+                rtlefuse->antenna_div_cfg, rtlefuse->antenna_div_type);
+
+        pcipriv->ledctl.led_opendrain = true;
+
+        if (rtlhal->oem_id == RT_CID_DEFAULT) {
+                switch (rtlefuse->eeprom_oemid) {
+                case RT_CID_DEFAULT:
+                        break;
+                case EEPROM_CID_TOSHIBA:
+                        rtlhal->oem_id = RT_CID_TOSHIBA;
+                        break;
+                case EEPROM_CID_CCX:
+                        rtlhal->oem_id = RT_CID_CCX;
+                        break;
+                case EEPROM_CID_QMI:
+                        rtlhal->oem_id = RT_CID_819X_QMI;
+                        break;
+                case EEPROM_CID_WHQL:
+                        break;
+                default:
+                        break;
+                }
+        }
+}
+
+/*static void _rtl8821ae_hal_customized_behavior(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        pcipriv->ledctl.led_opendrain = true;
+        switch (rtlhal->oem_id) {
+        case RT_CID_819X_HP:
+                pcipriv->ledctl.led_opendrain = true;
+                break;
+        case RT_CID_819X_LENOVO:
+        case RT_CID_DEFAULT:
+        case RT_CID_TOSHIBA:
+        case RT_CID_CCX:
+        case RT_CID_819X_ACER:
+        case RT_CID_WHQL:
+        default:
+                break;
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
+                 "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
+}*/
+
+void rtl8821ae_read_eeprom_info(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp_u1b;
+
+        rtlhal->version = _rtl8821ae_read_chip_version(hw);
+        if (get_rf_type(rtlphy) == RF_1T1R)
+                rtlpriv->dm.rfpath_rxenable[0] = true;
+        else
+                rtlpriv->dm.rfpath_rxenable[0] =
+                    rtlpriv->dm.rfpath_rxenable[1] = true;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
+                                                rtlhal->version);
+
+        tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
+        if (tmp_u1b & BIT(4)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
+                rtlefuse->epromtype = EEPROM_93C46;
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
+                rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
+        }
+
+        if (tmp_u1b & BIT(5)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
+                rtlefuse->autoload_failflag = false;
+                _rtl8821ae_read_adapter_info(hw, false);
+        } else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
+        }
+        /*hal_ReadRFType_8812A()*/
+        /* _rtl8821ae_hal_customized_behavior(hw); */
+}
+
+static void rtl8821ae_update_hal_rate_table(struct ieee80211_hw *hw,
+                struct ieee80211_sta *sta)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 ratr_value;
+        u8 ratr_index = 0;
+        u8 b_nmode = mac->ht_enable;
+        u8 mimo_ps = IEEE80211_SMPS_OFF;
+        u16 shortgi_rate;
+        u32 tmp_ratr_value;
+        u8 curtxbw_40mhz = mac->bw_40;
+        u8 b_curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
+                                1 : 0;
+        u8 b_curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
+                                1 : 0;
+        enum wireless_mode wirelessmode = mac->mode;
+
+        if (rtlhal->current_bandtype == BAND_ON_5G)
+                ratr_value = sta->supp_rates[1] << 4;
+        else
+                ratr_value = sta->supp_rates[0];
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_value = 0xfff;
+        ratr_value |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
+                        sta->ht_cap.mcs.rx_mask[0] << 12);
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                if (ratr_value & 0x0000000c)
+                        ratr_value &= 0x0000000d;
+                else
+                        ratr_value &= 0x0000000f;
+                break;
+        case WIRELESS_MODE_G:
+                ratr_value &= 0x00000FF5;
+                break;
+        case WIRELESS_MODE_N_24G:
+        case WIRELESS_MODE_N_5G:
+                b_nmode = 1;
+                if (mimo_ps == IEEE80211_SMPS_STATIC) {
+                        ratr_value &= 0x0007F005;
+                } else {
+                        u32 ratr_mask;
+
+                        if (get_rf_type(rtlphy) == RF_1T2R ||
+                            get_rf_type(rtlphy) == RF_1T1R)
+                                ratr_mask = 0x000ff005;
+                        else
+                                ratr_mask = 0x0f0ff005;
+
+                        ratr_value &= ratr_mask;
+                }
+                break;
+        default:
+                if (rtlphy->rf_type == RF_1T2R)
+                        ratr_value &= 0x000ff0ff;
+                else
+                        ratr_value &= 0x0f0ff0ff;
+
+                break;
+        }
+
+        if ((rtlpriv->btcoexist.bt_coexistence) &&
+             (rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4) &&
+             (rtlpriv->btcoexist.bt_cur_state) &&
+             (rtlpriv->btcoexist.bt_ant_isolation) &&
+             ((rtlpriv->btcoexist.bt_service == BT_SCO) ||
+             (rtlpriv->btcoexist.bt_service == BT_BUSY)))
+                ratr_value &= 0x0fffcfc0;
+        else
+                ratr_value &= 0x0FFFFFFF;
+
+        if (b_nmode && ((curtxbw_40mhz &&
+                         b_curshortgi_40mhz) || (!curtxbw_40mhz &&
+                                                 b_curshortgi_20mhz))) {
+                ratr_value |= 0x10000000;
+                tmp_ratr_value = (ratr_value >> 12);
+
+                for (shortgi_rate = 15; shortgi_rate > 0; shortgi_rate--) {
+                        if ((1 << shortgi_rate) & tmp_ratr_value)
+                                break;
+                }
+
+                shortgi_rate = (shortgi_rate << 12) | (shortgi_rate << 8) |
+                    (shortgi_rate << 4) | (shortgi_rate);
+        }
+
+        rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
+
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "%x\n", rtl_read_dword(rtlpriv, REG_ARFR0));
+}
+
+static u8 _rtl8821ae_mrate_idx_to_arfr_id(
+        struct ieee80211_hw *hw, u8 rate_index,
+        enum wireless_mode wirelessmode)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 ret = 0;
+        switch (rate_index) {
+        case RATR_INX_WIRELESS_NGB:
+                if (rtlphy->rf_type == RF_1T1R)
+                        ret = 1;
+                else
+                        ret = 0;
+                ; break;
+        case RATR_INX_WIRELESS_N:
+        case RATR_INX_WIRELESS_NG:
+                if (rtlphy->rf_type == RF_1T1R)
+                        ret = 5;
+                else
+                        ret = 4;
+                ; break;
+        case RATR_INX_WIRELESS_NB:
+                if (rtlphy->rf_type == RF_1T1R)
+                        ret = 3;
+                else
+                        ret = 2;
+                ; break;
+        case RATR_INX_WIRELESS_GB:
+                ret = 6;
+                break;
+        case RATR_INX_WIRELESS_G:
+                ret = 7;
+                break;
+        case RATR_INX_WIRELESS_B:
+                ret = 8;
+                break;
+        case RATR_INX_WIRELESS_MC:
+                if ((wirelessmode == WIRELESS_MODE_B)
+                        || (wirelessmode == WIRELESS_MODE_G)
+                        || (wirelessmode == WIRELESS_MODE_N_24G)
+                        || (wirelessmode == WIRELESS_MODE_AC_24G))
+                        ret = 6;
+                else
+                        ret = 7;
+        case RATR_INX_WIRELESS_AC_5N:
+                if (rtlphy->rf_type == RF_1T1R)
+                        ret = 10;
+                else
+                        ret = 9;
+                break;
+        case RATR_INX_WIRELESS_AC_24N:
+                if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80) {
+                        if (rtlphy->rf_type == RF_1T1R)
+                                ret = 10;
+                        else
+                                ret = 9;
+                } else {
+                        if (rtlphy->rf_type == RF_1T1R)
+                                ret = 11;
+                        else
+                                ret = 12;
+                }
+                break;
+        default:
+                ret = 0; break;
+        }
+        return ret;
+}
+
+static u32 _rtl8821ae_rate_to_bitmap_2ssvht(__le16 vht_rate)
+{
+        u8 i, j, tmp_rate;
+        u32 rate_bitmap = 0;
+
+        for (i = j = 0; i < 4; i += 2, j += 10) {
+                tmp_rate = (le16_to_cpu(vht_rate) >> i) & 3;
+
+                switch (tmp_rate) {
+                case 2:
+                        rate_bitmap = rate_bitmap | (0x03ff << j);
+                        break;
+                case 1:
+                        rate_bitmap = rate_bitmap | (0x01ff << j);
+                        break;
+                case 0:
+                        rate_bitmap = rate_bitmap | (0x00ff << j);
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        return rate_bitmap;
+}
+
+static u32 _rtl8821ae_set_ra_vht_ratr_bitmap(struct ieee80211_hw *hw,
+                                             enum wireless_mode wirelessmode,
+                                             u32 ratr_bitmap)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 ret_bitmap = ratr_bitmap;
+
+        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40
+                || rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80)
+                ret_bitmap = ratr_bitmap;
+        else if (wirelessmode == WIRELESS_MODE_AC_5G
+                || wirelessmode == WIRELESS_MODE_AC_24G) {
+                if (rtlphy->rf_type == RF_1T1R)
+                        ret_bitmap = ratr_bitmap & (~BIT21);
+                else
+                        ret_bitmap = ratr_bitmap & (~(BIT31|BIT21));
+        }
+
+        return ret_bitmap;
+}
+
+static u8 _rtl8821ae_get_vht_eni(enum wireless_mode wirelessmode,
+                        u32 ratr_bitmap)
+{
+        u8 ret = 0;
+        if (wirelessmode < WIRELESS_MODE_N_24G)
+                ret =  0;
+        else if (wirelessmode == WIRELESS_MODE_AC_24G) {
+                if (ratr_bitmap & 0xfff00000)   /* Mix , 2SS */
+                        ret = 3;
+                else                                    /* Mix, 1SS */
+                        ret = 2;
+        } else if (wirelessmode == WIRELESS_MODE_AC_5G) {
+                        ret = 1;
+        } /* VHT */
+
+        return ret << 4;
+}
+
+static u8 _rtl8821ae_get_ra_ldpc(struct ieee80211_hw *hw,
+                             u8 mac_id, struct rtl_sta_info *sta_entry,
+                             enum wireless_mode wirelessmode)
+{
+        u8 b_ldpc = 0;
+        /*not support ldpc, do not open*/
+        return b_ldpc << 2;
+}
+
+static u8 _rtl8821ae_get_ra_rftype(struct ieee80211_hw *hw,
+                          enum wireless_mode wirelessmode,
+                          u32 ratr_bitmap)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 rf_type = RF_1T1R;
+
+        if (rtlphy->rf_type == RF_1T1R)
+                rf_type = RF_1T1R;
+        else if (wirelessmode == WIRELESS_MODE_AC_5G
+                || wirelessmode == WIRELESS_MODE_AC_24G
+                || wirelessmode == WIRELESS_MODE_AC_ONLY) {
+                if (ratr_bitmap & 0xffc00000)
+                        rf_type = RF_2T2R;
+        } else if (wirelessmode == WIRELESS_MODE_N_5G
+                || wirelessmode == WIRELESS_MODE_N_24G) {
+                if (ratr_bitmap & 0xfff00000)
+                        rf_type = RF_2T2R;
+        }
+
+        return rf_type;
+}
+
+static bool _rtl8821ae_get_ra_shortgi(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
+                              u8 mac_id)
+{
+        bool b_short_gi = false;
+        u8 b_curshortgi_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
+                                1 : 0;
+        u8 b_curshortgi_20mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
+                                1 : 0;
+        u8 b_curshortgi_80mhz = 0;
+        b_curshortgi_80mhz = (sta->vht_cap.cap &
+                              IEEE80211_VHT_CAP_SHORT_GI_80) ? 1 : 0;
+
+        if (mac_id == MAC_ID_STATIC_FOR_BROADCAST_MULTICAST)
+                        b_short_gi = false;
+
+        if (b_curshortgi_40mhz || b_curshortgi_80mhz
+                || b_curshortgi_20mhz)
+                b_short_gi = true;
+
+        return b_short_gi;
+}
+
+static void rtl8821ae_update_hal_rate_mask(struct ieee80211_hw *hw,
+                struct ieee80211_sta *sta, u8 rssi_level)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_sta_info *sta_entry = NULL;
+        u32 ratr_bitmap;
+        u8 ratr_index;
+        enum wireless_mode wirelessmode = 0;
+        u8 curtxbw_40mhz = (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
+                                ? 1 : 0;
+        bool b_shortgi = false;
+        u8 rate_mask[7];
+        u8 macid = 0;
+        u8 mimo_ps = IEEE80211_SMPS_OFF;
+        u8 rf_type;
+
+        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+        wirelessmode = sta_entry->wireless_mode;
+
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_LOUD,
+                 "wireless mode = 0x%x\n", wirelessmode);
+        if (mac->opmode == NL80211_IFTYPE_STATION ||
+                mac->opmode == NL80211_IFTYPE_MESH_POINT) {
+                curtxbw_40mhz = mac->bw_40;
+        } else if (mac->opmode == NL80211_IFTYPE_AP ||
+                mac->opmode == NL80211_IFTYPE_ADHOC)
+                macid = sta->aid + 1;
+        if (wirelessmode == WIRELESS_MODE_N_5G ||
+            wirelessmode == WIRELESS_MODE_AC_5G)
+                ratr_bitmap = sta->supp_rates[NL80211_BAND_5GHZ];
+        else
+                ratr_bitmap = sta->supp_rates[NL80211_BAND_2GHZ];
+
+        if (mac->opmode == NL80211_IFTYPE_ADHOC)
+                ratr_bitmap = 0xfff;
+
+        if (wirelessmode == WIRELESS_MODE_N_24G
+                || wirelessmode == WIRELESS_MODE_N_5G)
+                ratr_bitmap |= (sta->ht_cap.mcs.rx_mask[1] << 20 |
+                                sta->ht_cap.mcs.rx_mask[0] << 12);
+        else if (wirelessmode == WIRELESS_MODE_AC_24G
+                || wirelessmode == WIRELESS_MODE_AC_5G
+                || wirelessmode == WIRELESS_MODE_AC_ONLY)
+                ratr_bitmap |= _rtl8821ae_rate_to_bitmap_2ssvht(
+                                sta->vht_cap.vht_mcs.rx_mcs_map) << 12;
+
+        b_shortgi = _rtl8821ae_get_ra_shortgi(hw, sta, macid);
+        rf_type = _rtl8821ae_get_ra_rftype(hw, wirelessmode, ratr_bitmap);
+
+/*mac id owner*/
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                ratr_index = RATR_INX_WIRELESS_B;
+                if (ratr_bitmap & 0x0000000c)
+                        ratr_bitmap &= 0x0000000d;
+                else
+                        ratr_bitmap &= 0x0000000f;
+                break;
+        case WIRELESS_MODE_G:
+                ratr_index = RATR_INX_WIRELESS_GB;
+
+                if (rssi_level == 1)
+                        ratr_bitmap &= 0x00000f00;
+                else if (rssi_level == 2)
+                        ratr_bitmap &= 0x00000ff0;
+                else
+                        ratr_bitmap &= 0x00000ff5;
+                break;
+        case WIRELESS_MODE_A:
+                ratr_index = RATR_INX_WIRELESS_G;
+                ratr_bitmap &= 0x00000ff0;
+                break;
+        case WIRELESS_MODE_N_24G:
+        case WIRELESS_MODE_N_5G:
+                if (wirelessmode == WIRELESS_MODE_N_24G)
+                        ratr_index = RATR_INX_WIRELESS_NGB;
+                else
+                        ratr_index = RATR_INX_WIRELESS_NG;
+
+                if (mimo_ps == IEEE80211_SMPS_STATIC
+                        || mimo_ps == IEEE80211_SMPS_DYNAMIC) {
+                        if (rssi_level == 1)
+                                ratr_bitmap &= 0x000f0000;
+                        else if (rssi_level == 2)
+                                ratr_bitmap &= 0x000ff000;
+                        else
+                                ratr_bitmap &= 0x000ff005;
+                } else {
+                        if (rf_type == RF_1T1R) {
+                                if (curtxbw_40mhz) {
+                                        if (rssi_level == 1)
+                                                ratr_bitmap &= 0x000f0000;
+                                        else if (rssi_level == 2)
+                                                ratr_bitmap &= 0x000ff000;
+                                        else
+                                                ratr_bitmap &= 0x000ff015;
+                                } else {
+                                        if (rssi_level == 1)
+                                                ratr_bitmap &= 0x000f0000;
+                                        else if (rssi_level == 2)
+                                                ratr_bitmap &= 0x000ff000;
+                                        else
+                                                ratr_bitmap &= 0x000ff005;
+                                }
+                        } else {
+                                if (curtxbw_40mhz) {
+                                        if (rssi_level == 1)
+                                                ratr_bitmap &= 0x0fff0000;
+                                        else if (rssi_level == 2)
+                                                ratr_bitmap &= 0x0ffff000;
+                                        else
+                                                ratr_bitmap &= 0x0ffff015;
+                                } else {
+                                        if (rssi_level == 1)
+                                                ratr_bitmap &= 0x0fff0000;
+                                        else if (rssi_level == 2)
+                                                ratr_bitmap &= 0x0ffff000;
+                                        else
+                                                ratr_bitmap &= 0x0ffff005;
+                                }
+                        }
+                }
+                break;
+
+        case WIRELESS_MODE_AC_24G:
+                ratr_index = RATR_INX_WIRELESS_AC_24N;
+                if (rssi_level == 1)
+                        ratr_bitmap &= 0xfc3f0000;
+                else if (rssi_level == 2)
+                        ratr_bitmap &= 0xfffff000;
+                else
+                        ratr_bitmap &= 0xffffffff;
+                break;
+
+        case WIRELESS_MODE_AC_5G:
+                ratr_index = RATR_INX_WIRELESS_AC_5N;
+
+                if (rf_type == RF_1T1R) {
+                        if (rssi_level == 1)    /*add by Gary for ac-series*/
+                                ratr_bitmap &= 0x003f8000;
+                        else if (rssi_level == 2)
+                                ratr_bitmap &= 0x003ff000;
+                        else
+                                ratr_bitmap &= 0x003ff010;
+                } else {
+                        if (rssi_level == 1)
+                                ratr_bitmap &= 0xfe3f8000;
+                        else if (rssi_level == 2)
+                                ratr_bitmap &= 0xfffff000;
+                        else
+                                ratr_bitmap &= 0xfffff010;
+                }
+                break;
+
+        default:
+                ratr_index = RATR_INX_WIRELESS_NGB;
+
+                if (rf_type == RF_1T2R)
+                        ratr_bitmap &= 0x000ff0ff;
+                else
+                        ratr_bitmap &= 0x0f8ff0ff;
+                break;
+        }
+
+        ratr_index = _rtl8821ae_mrate_idx_to_arfr_id(hw, ratr_index, wirelessmode);
+        sta_entry->ratr_index = ratr_index;
+        ratr_bitmap = _rtl8821ae_set_ra_vht_ratr_bitmap(hw, wirelessmode,
+                                                        ratr_bitmap);
+
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_LOUD,
+                 "ratr_bitmap :%x\n", ratr_bitmap);
+
+        /* *(u32 *)& rate_mask = EF4BYTE((ratr_bitmap & 0x0fffffff) |
+                                       (ratr_index << 28)); */
+
+        rate_mask[0] = macid;
+        rate_mask[1] = ratr_index | (b_shortgi ? 0x80 : 0x00);
+        rate_mask[2] = rtlphy->current_chan_bw
+                           | _rtl8821ae_get_vht_eni(wirelessmode, ratr_bitmap)
+                           | _rtl8821ae_get_ra_ldpc(hw, macid, sta_entry, wirelessmode);
+
+        rate_mask[3] = (u8)(ratr_bitmap & 0x000000ff);
+        rate_mask[4] = (u8)((ratr_bitmap & 0x0000ff00) >> 8);
+        rate_mask[5] = (u8)((ratr_bitmap & 0x00ff0000) >> 16);
+        rate_mask[6] = (u8)((ratr_bitmap & 0xff000000) >> 24);
+
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x:%x:%x\n",
+                 ratr_index, ratr_bitmap,
+                 rate_mask[0], rate_mask[1],
+                 rate_mask[2], rate_mask[3],
+                 rate_mask[4], rate_mask[5],
+                 rate_mask[6]);
+        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RA_MASK, 7, rate_mask);
+        _rtl8821ae_set_bcn_ctrl_reg(hw, BIT(3), 0);
+}
+
+void rtl8821ae_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                struct ieee80211_sta *sta, u8 rssi_level)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        if (rtlpriv->dm.useramask)
+                rtl8821ae_update_hal_rate_mask(hw, sta, rssi_level);
+        else
+                /*RT_TRACE(rtlpriv, COMP_RATR,DBG_LOUD,
+                           "rtl8821ae_update_hal_rate_tbl() Error! 8821ae FW RA Only");*/
+                rtl8821ae_update_hal_rate_table(hw, sta);
+}
+
+void rtl8821ae_update_channel_access_setting(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u8 wireless_mode = mac->mode;
+        u8 sifs_timer, r2t_sifs;
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
+                                      (u8 *)&mac->slot_time);
+        if (wireless_mode == WIRELESS_MODE_G)
+                sifs_timer = 0x0a;
+        else
+                sifs_timer = 0x0e;
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SIFS, (u8 *)&sifs_timer);
+
+        r2t_sifs = 0xa;
+
+        if (wireless_mode == WIRELESS_MODE_AC_5G &&
+            (mac->vht_ldpc_cap & LDPC_VHT_ENABLE_RX) &&
+            (mac->vht_stbc_cap & STBC_VHT_ENABLE_RX)) {
+                if (mac->vendor == PEER_ATH)
+                        r2t_sifs = 0x8;
+                else
+                        r2t_sifs = 0xa;
+        } else if (wireless_mode == WIRELESS_MODE_AC_5G) {
+                r2t_sifs = 0xa;
+        }
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_R2T_SIFS, (u8 *)&r2t_sifs);
+}
+
+bool rtl8821ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;
+        u8 u1tmp = 0;
+        bool b_actuallyset = false;
+
+        if (rtlpriv->rtlhal.being_init_adapter)
+                return false;
+
+        if (ppsc->swrf_processing)
+                return false;
+
+        spin_lock(&rtlpriv->locks.rf_ps_lock);
+        if (ppsc->rfchange_inprogress) {
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+                return false;
+        } else {
+                ppsc->rfchange_inprogress = true;
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+        }
+
+        cur_rfstate = ppsc->rfpwr_state;
+
+        rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2,
+                        rtl_read_byte(rtlpriv,
+                                        REG_GPIO_IO_SEL_2) & ~(BIT(1)));
+
+        u1tmp = rtl_read_byte(rtlpriv, REG_GPIO_PIN_CTRL_2);
+
+        if (rtlphy->polarity_ctl)
+                e_rfpowerstate_toset = (u1tmp & BIT(1)) ? ERFOFF : ERFON;
+        else
+                e_rfpowerstate_toset = (u1tmp & BIT(1)) ? ERFON : ERFOFF;
+
+        if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {
+                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                         "GPIOChangeRF  - HW Radio ON, RF ON\n");
+
+                e_rfpowerstate_toset = ERFON;
+                ppsc->hwradiooff = false;
+                b_actuallyset = true;
+        } else if ((!ppsc->hwradiooff)
+                   && (e_rfpowerstate_toset == ERFOFF)) {
+                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                         "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
+
+                e_rfpowerstate_toset = ERFOFF;
+                ppsc->hwradiooff = true;
+                b_actuallyset = true;
+        }
+
+        if (b_actuallyset) {
+                spin_lock(&rtlpriv->locks.rf_ps_lock);
+                ppsc->rfchange_inprogress = false;
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+        } else {
+                if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC)
+                        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+
+                spin_lock(&rtlpriv->locks.rf_ps_lock);
+                ppsc->rfchange_inprogress = false;
+                spin_unlock(&rtlpriv->locks.rf_ps_lock);
+        }
+
+        *valid = 1;
+        return !ppsc->hwradiooff;
+}
+
+void rtl8821ae_set_key(struct ieee80211_hw *hw, u32 key_index,
+                     u8 *p_macaddr, bool is_group, u8 enc_algo,
+                     bool is_wepkey, bool clear_all)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 *macaddr = p_macaddr;
+        u32 entry_id = 0;
+        bool is_pairwise = false;
+
+        static u8 cam_const_addr[4][6] = {
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x02},
+                {0x00, 0x00, 0x00, 0x00, 0x00, 0x03}
+        };
+        static u8 cam_const_broad[] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
+
+        if (clear_all) {
+                u8 idx = 0;
+                u8 cam_offset = 0;
+                u8 clear_number = 5;
+
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
+
+                for (idx = 0; idx < clear_number; idx++) {
+                        rtl_cam_mark_invalid(hw, cam_offset + idx);
+                        rtl_cam_empty_entry(hw, cam_offset + idx);
+
+                        if (idx < 5) {
+                                memset(rtlpriv->sec.key_buf[idx], 0,
+                                       MAX_KEY_LEN);
+                                rtlpriv->sec.key_len[idx] = 0;
+                        }
+                }
+        } else {
+                switch (enc_algo) {
+                case WEP40_ENCRYPTION:
+                        enc_algo = CAM_WEP40;
+                        break;
+                case WEP104_ENCRYPTION:
+                        enc_algo = CAM_WEP104;
+                        break;
+                case TKIP_ENCRYPTION:
+                        enc_algo = CAM_TKIP;
+                        break;
+                case AESCCMP_ENCRYPTION:
+                        enc_algo = CAM_AES;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                                 "switch case not process\n");
+                        enc_algo = CAM_TKIP;
+                        break;
+                }
+
+                if (is_wepkey || rtlpriv->sec.use_defaultkey) {
+                        macaddr = cam_const_addr[key_index];
+                        entry_id = key_index;
+                } else {
+                        if (is_group) {
+                                macaddr = cam_const_broad;
+                                entry_id = key_index;
+                        } else {
+                                if (mac->opmode == NL80211_IFTYPE_AP) {
+                                        entry_id = rtl_cam_get_free_entry(hw, p_macaddr);
+                                        if (entry_id >=  TOTAL_CAM_ENTRY) {
+                                                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
+                                                         "Can not find free hwsecurity cam entry\n");
+                                                return;
+                                        }
+                                } else {
+                                        entry_id = CAM_PAIRWISE_KEY_POSITION;
+                                }
+
+                                key_index = PAIRWISE_KEYIDX;
+                                is_pairwise = true;
+                        }
+                }
+
+                if (rtlpriv->sec.key_len[key_index] == 0) {
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
+                        if (mac->opmode == NL80211_IFTYPE_AP)
+                                rtl_cam_del_entry(hw, p_macaddr);
+                        rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                 "add one entry\n");
+                        if (is_pairwise) {
+                                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                         "set Pairwise key\n");
+
+                                rtl_cam_add_one_entry(hw, macaddr, key_index,
+                                                      entry_id, enc_algo,
+                                                      CAM_CONFIG_NO_USEDK,
+                                                      rtlpriv->sec.key_buf[key_index]);
+                        } else {
+                                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                                         "set group key\n");
+
+                                if (mac->opmode == NL80211_IFTYPE_ADHOC) {
+                                        rtl_cam_add_one_entry(hw,
+                                                        rtlefuse->dev_addr,
+                                                        PAIRWISE_KEYIDX,
+                                                        CAM_PAIRWISE_KEY_POSITION,
+                                                        enc_algo,
+                                                        CAM_CONFIG_NO_USEDK,
+                                                        rtlpriv->sec.key_buf
+                                                        [entry_id]);
+                                }
+
+                                rtl_cam_add_one_entry(hw, macaddr, key_index,
+                                                entry_id, enc_algo,
+                                                CAM_CONFIG_NO_USEDK,
+                                                rtlpriv->sec.key_buf[entry_id]);
+                        }
+                }
+        }
+}
+
+void rtl8821ae_bt_reg_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        /* 0:Low, 1:High, 2:From Efuse. */
+        rtlpriv->btcoexist.reg_bt_iso = 2;
+        /* 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter. */
+        rtlpriv->btcoexist.reg_bt_sco = 3;
+        /* 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. */
+        rtlpriv->btcoexist.reg_bt_sco = 0;
+}
+
+void rtl8821ae_bt_hw_init(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->cfg->ops->get_btc_status())
+                rtlpriv->btcoexist.btc_ops->btc_init_hw_config(rtlpriv);
+}
+
+void rtl8821ae_suspend(struct ieee80211_hw *hw)
+{
+}
+
+void rtl8821ae_resume(struct ieee80211_hw *hw)
+{
+}
+
+/* Turn on AAP (RCR:bit 0) for promicuous mode. */
+void rtl8821ae_allow_all_destaddr(struct ieee80211_hw *hw,
+        bool allow_all_da, bool write_into_reg)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        if (allow_all_da) /* Set BIT0 */
+                rtlpci->receive_config |= RCR_AAP;
+        else /* Clear BIT0 */
+                rtlpci->receive_config &= ~RCR_AAP;
+
+        if (write_into_reg)
+                rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
+
+        RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
+                "receive_config=0x%08X, write_into_reg=%d\n",
+                rtlpci->receive_config, write_into_reg);
+}
+
+/* WKFMCAMAddAllEntry8812 */
+void rtl8821ae_add_wowlan_pattern(struct ieee80211_hw *hw,
+                                  struct rtl_wow_pattern *rtl_pattern,
+                                  u8 index)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 cam = 0;
+        u8 addr = 0;
+        u16 rxbuf_addr;
+        u8 tmp, count = 0;
+        u16 cam_start;
+        u16 offset;
+
+        /* Count the WFCAM entry start offset. */
+
+        /* RX page size = 128 byte */
+        offset = MAX_RX_DMA_BUFFER_SIZE_8812 / 128;
+        /* We should start from the boundry */
+        cam_start = offset * 128;
+
+        /* Enable Rx packet buffer access. */
+        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,
+                 * we can access 8 bytes in Rx packet buffer.
+                 * CAM start offset (unit: 1 byte) =  index*WKFMCAM_SIZE
+                 * 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
+                 *      * per entry offset of a WKFM CAM: Addr*4 bytes
+                 */
+                rxbuf_addr = (cam_start + index * WKFMCAM_SIZE + addr * 4) >> 3;
+                /* Set R/W start offset */
+                rtl_write_word(rtlpriv, REG_PKTBUF_DBG_CTRL, rxbuf_addr);
+
+                if (addr == 0) {
+                        cam = BIT(31) | rtl_pattern->crc;
+
+                        if (rtl_pattern->type == UNICAST_PATTERN)
+                                cam |= BIT(24);
+                        else if (rtl_pattern->type == MULTICAST_PATTERN)
+                                cam |= BIT(25);
+                        else if (rtl_pattern->type == BROADCAST_PATTERN)
+                                cam |= BIT(26);
+
+                        rtl_write_dword(rtlpriv, REG_PKTBUF_DBG_DATA_L, cam);
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
+                                 "WRITE entry[%d] 0x%x: %x\n", addr,
+                                  REG_PKTBUF_DBG_DATA_L, cam);
+
+                        /* Write to Rx packet buffer. */
+                        rtl_write_word(rtlpriv, REG_RXPKTBUF_CTRL, 0x0f01);
+                } else if (addr == 2 || addr == 4) {/* WKFM[127:0] */
+                        cam = rtl_pattern->mask[addr - 2];
+
+                        rtl_write_dword(rtlpriv, REG_PKTBUF_DBG_DATA_L, cam);
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
+                                 "WRITE entry[%d] 0x%x: %x\n", addr,
+                                  REG_PKTBUF_DBG_DATA_L, cam);
+
+                        rtl_write_word(rtlpriv, REG_RXPKTBUF_CTRL, 0x0f01);
+                } else if (addr == 3 || addr == 5) {/* WKFM[127:0] */
+                        cam = rtl_pattern->mask[addr - 2];
+
+                        rtl_write_dword(rtlpriv, REG_PKTBUF_DBG_DATA_H, cam);
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
+                                 "WRITE entry[%d] 0x%x: %x\n", addr,
+                                  REG_PKTBUF_DBG_DATA_H, cam);
+
+                        rtl_write_word(rtlpriv, REG_RXPKTBUF_CTRL, 0xf001);
+                }
+
+                count = 0;
+                do {
+                        tmp = rtl_read_byte(rtlpriv, REG_RXPKTBUF_CTRL);
+                        udelay(2);
+                        count++;
+                } while (tmp && count < 100);
+
+                RT_ASSERT((count < 100),
+                          "Write wake up frame mask FAIL %d value!\n", tmp);
+        }
+        /* Disable Rx packet buffer access. */
+        rtl_write_byte(rtlpriv, REG_PKT_BUFF_ACCESS_CTRL,
+                       DISABLE_TRXPKT_BUF_ACCESS);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.h b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.h
new file mode 100644
index 000000000000..a3553e3abaa1
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.h
@@ -0,0 +1,70 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_HW_H__
+#define __RTL8821AE_HW_H__
+
+void rtl8821ae_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
+void rtl8821ae_read_eeprom_info(struct ieee80211_hw *hw);
+
+void rtl8821ae_interrupt_recognized(struct ieee80211_hw *hw,
+                                    u32 *p_inta, u32 *p_intb);
+int rtl8821ae_hw_init(struct ieee80211_hw *hw);
+void rtl8821ae_card_disable(struct ieee80211_hw *hw);
+void rtl8821ae_enable_interrupt(struct ieee80211_hw *hw);
+void rtl8821ae_disable_interrupt(struct ieee80211_hw *hw);
+int rtl8821ae_set_network_type(struct ieee80211_hw *hw,
+                               enum nl80211_iftype type);
+void rtl8821ae_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid);
+void rtl8821ae_set_qos(struct ieee80211_hw *hw, int aci);
+void rtl8821ae_set_beacon_related_registers(struct ieee80211_hw *hw);
+void rtl8821ae_set_beacon_interval(struct ieee80211_hw *hw);
+void rtl8821ae_update_interrupt_mask(struct ieee80211_hw *hw,
+                                     u32 add_msr, u32 rm_msr);
+void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val);
+void rtl8821ae_update_hal_rate_tbl(struct ieee80211_hw *hw,
+                                   struct ieee80211_sta *sta,
+                                   u8 rssi_level);
+void rtl8821ae_update_channel_access_setting(struct ieee80211_hw *hw);
+bool rtl8821ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid);
+void rtl8821ae_enable_hw_security_config(struct ieee80211_hw *hw);
+void rtl8821ae_set_key(struct ieee80211_hw *hw, u32 key_index,
+                       u8 *p_macaddr, bool is_group, u8 enc_algo,
+                       bool is_wepkey, bool clear_all);
+
+void rtl8821ae_bt_reg_init(struct ieee80211_hw *hw);
+void rtl8821ae_bt_hw_init(struct ieee80211_hw *hw);
+void rtl8821ae_suspend(struct ieee80211_hw *hw);
+void rtl8821ae_resume(struct ieee80211_hw *hw);
+void rtl8821ae_allow_all_destaddr(struct ieee80211_hw *hw,
+                                  bool allow_all_da,
+                                  bool write_into_reg);
+void _rtl8821ae_stop_tx_beacon(struct ieee80211_hw *hw);
+void _rtl8821ae_resume_tx_beacon(struct ieee80211_hw *hw);
+void rtl8821ae_add_wowlan_pattern(struct ieee80211_hw *hw,
+                                  struct rtl_wow_pattern *rtl_pattern,
+                                  u8 index);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/led.c b/drivers/net/wireless/rtlwifi/rtl8821ae/led.c
new file mode 100644
index 000000000000..ba1946a0280e
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/led.c
@@ -0,0 +1,237 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "reg.h"
+#include "led.h"
+
+static void _rtl8821ae_init_led(struct ieee80211_hw *hw,
+                                struct rtl_led *pled,
+                                enum rtl_led_pin ledpin)
+{
+        pled->hw = hw;
+        pled->ledpin = ledpin;
+        pled->ledon = false;
+}
+
+void rtl8821ae_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
+{
+        u8 ledcfg;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
+                 "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
+
+        switch (pled->ledpin) {
+        case LED_PIN_GPIO0:
+                break;
+        case LED_PIN_LED0:
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
+                ledcfg &= ~BIT(6);
+                rtl_write_byte(rtlpriv,
+                               REG_LEDCFG2, (ledcfg & 0xf0) | BIT(5));
+                break;
+        case LED_PIN_LED1:
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1);
+                rtl_write_byte(rtlpriv, REG_LEDCFG1, ledcfg & 0x10);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
+                break;
+        }
+        pled->ledon = true;
+}
+
+void rtl8812ae_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
+{
+        u16     ledreg = REG_LEDCFG1;
+        u8      ledcfg = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        switch (pled->ledpin) {
+        case LED_PIN_LED0:
+                ledreg = REG_LEDCFG1;
+                break;
+
+        case LED_PIN_LED1:
+                ledreg = REG_LEDCFG2;
+                break;
+
+        case LED_PIN_GPIO0:
+        default:
+                break;
+        }
+
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
+                 "In SwLedOn, LedAddr:%X LEDPIN=%d\n",
+                 ledreg, pled->ledpin);
+
+        ledcfg =  rtl_read_byte(rtlpriv, ledreg);
+        ledcfg |= BIT(5); /*Set 0x4c[21]*/
+        ledcfg &= ~(BIT(7) | BIT(6) | BIT(3) | BIT(2) | BIT(1) | BIT(0));
+                /*Clear 0x4c[23:22] and 0x4c[19:16]*/
+        rtl_write_byte(rtlpriv, ledreg, ledcfg); /*SW control led0 on.*/
+        pled->ledon = true;
+}
+
+void rtl8821ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        u8 ledcfg;
+
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
+                 "LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin);
+
+        ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
+
+        switch (pled->ledpin) {
+        case LED_PIN_GPIO0:
+                break;
+        case LED_PIN_LED0:
+                ledcfg &= 0xf0;
+                if (pcipriv->ledctl.led_opendrain) {
+                        ledcfg &= 0x90; /* Set to software control. */
+                        rtl_write_byte(rtlpriv, REG_LEDCFG2, (ledcfg|BIT(3)));
+                        ledcfg = rtl_read_byte(rtlpriv, REG_MAC_PINMUX_CFG);
+                        ledcfg &= 0xFE;
+                        rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG, ledcfg);
+                } else {
+                        ledcfg &= ~BIT(6);
+                        rtl_write_byte(rtlpriv, REG_LEDCFG2,
+                                       (ledcfg | BIT(3) | BIT(5)));
+                }
+                break;
+        case LED_PIN_LED1:
+                ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG1);
+                ledcfg &= 0x10; /* Set to software control. */
+                rtl_write_byte(rtlpriv, REG_LEDCFG1, ledcfg|BIT(3));
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "switch case not process\n");
+                break;
+        }
+        pled->ledon = false;
+}
+
+void rtl8812ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
+{
+        u16 ledreg = REG_LEDCFG1;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+
+        switch (pled->ledpin) {
+        case LED_PIN_LED0:
+                ledreg = REG_LEDCFG1;
+                break;
+
+        case LED_PIN_LED1:
+                ledreg = REG_LEDCFG2;
+                break;
+
+        case LED_PIN_GPIO0:
+        default:
+                break;
+        }
+
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
+                 "In SwLedOff,LedAddr:%X LEDPIN=%d\n",
+                 ledreg, pled->ledpin);
+        /*Open-drain arrangement for controlling the LED*/
+        if (pcipriv->ledctl.led_opendrain) {
+                u8 ledcfg = rtl_read_byte(rtlpriv, ledreg);
+
+                ledreg &= 0xd0; /* Set to software control.*/
+                rtl_write_byte(rtlpriv, ledreg, (ledcfg | BIT(3)));
+
+                /*Open-drain arrangement*/
+                ledcfg = rtl_read_byte(rtlpriv, REG_MAC_PINMUX_CFG);
+                ledcfg &= 0xFE;/*Set GPIO[8] to input mode*/
+                rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG, ledcfg);
+        } else {
+                rtl_write_byte(rtlpriv, ledreg, 0x28);
+        }
+
+        pled->ledon = false;
+}
+
+void rtl8821ae_init_sw_leds(struct ieee80211_hw *hw)
+{
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+
+        _rtl8821ae_init_led(hw, &pcipriv->ledctl.sw_led0, LED_PIN_LED0);
+        _rtl8821ae_init_led(hw, &pcipriv->ledctl.sw_led1, LED_PIN_LED1);
+}
+
+static void _rtl8821ae_sw_led_control(struct ieee80211_hw *hw,
+                                      enum led_ctl_mode ledaction)
+{
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_led *pLed0 = &pcipriv->ledctl.sw_led0;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        switch (ledaction) {
+        case LED_CTL_POWER_ON:
+        case LED_CTL_LINK:
+        case LED_CTL_NO_LINK:
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                        rtl8812ae_sw_led_on(hw, pLed0);
+                else
+                        rtl8821ae_sw_led_on(hw, pLed0);
+                break;
+        case LED_CTL_POWER_OFF:
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                        rtl8812ae_sw_led_off(hw, pLed0);
+                else
+                        rtl8821ae_sw_led_off(hw, pLed0);
+                break;
+        default:
+                break;
+        }
+}
+
+void rtl8821ae_led_control(struct ieee80211_hw *hw,
+                           enum led_ctl_mode ledaction)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+
+        if ((ppsc->rfoff_reason > RF_CHANGE_BY_PS) &&
+            (ledaction == LED_CTL_TX ||
+             ledaction == LED_CTL_RX ||
+             ledaction == LED_CTL_SITE_SURVEY ||
+             ledaction == LED_CTL_LINK ||
+             ledaction == LED_CTL_NO_LINK ||
+             ledaction == LED_CTL_START_TO_LINK ||
+             ledaction == LED_CTL_POWER_ON)) {
+                return;
+        }
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d,\n",
+                 ledaction);
+        _rtl8821ae_sw_led_control(hw, ledaction);
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/led.h b/drivers/net/wireless/rtlwifi/rtl8821ae/led.h
new file mode 100644
index 000000000000..038e64e18ae8
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/led.h
@@ -0,0 +1,37 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_LED_H__
+#define __RTL8821AE_LED_H__
+
+void rtl8821ae_init_sw_leds(struct ieee80211_hw *hw);
+void rtl8821ae_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl8812ae_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl8821ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl8812ae_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled);
+void rtl8821ae_led_control(struct ieee80211_hw *hw,
+                           enum led_ctl_mode ledaction);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/rtlwifi/rtl8821ae/phy.c
new file mode 100644
index 000000000000..9786313dc62f
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/phy.c
@@ -0,0 +1,4855 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../ps.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "rf.h"
+#include "dm.h"
+#include "table.h"
+#include "trx.h"
+#include "../btcoexist/halbt_precomp.h"
+#include "hw.h"
+#include "../efuse.h"
+
+#define READ_NEXT_PAIR(array_table, v1, v2, i) \
+        do { \
+                i += 2; \
+                v1 = array_table[i]; \
+                v2 = array_table[i+1]; \
+        } while (0)
+
+static u32 _rtl8821ae_phy_rf_serial_read(struct ieee80211_hw *hw,
+                                         enum radio_path rfpath, u32 offset);
+static void _rtl8821ae_phy_rf_serial_write(struct ieee80211_hw *hw,
+                                           enum radio_path rfpath, u32 offset,
+                                           u32 data);
+static u32 _rtl8821ae_phy_calculate_bit_shift(u32 bitmask);
+static bool _rtl8821ae_phy_bb8821a_config_parafile(struct ieee80211_hw *hw);
+/*static bool _rtl8812ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);*/
+static bool _rtl8821ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
+static bool _rtl8821ae_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
+                                                     u8 configtype);
+static bool _rtl8821ae_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
+                                                       u8 configtype);
+static void phy_init_bb_rf_register_definition(struct ieee80211_hw *hw);
+
+static long _rtl8821ae_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
+                                            enum wireless_mode wirelessmode,
+                                            u8 txpwridx);
+static void rtl8821ae_phy_set_rf_on(struct ieee80211_hw *hw);
+static void rtl8821ae_phy_set_io(struct ieee80211_hw *hw);
+
+static void rtl8812ae_fixspur(struct ieee80211_hw *hw,
+                              enum ht_channel_width band_width, u8 channel)
+{
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        /*C cut Item12 ADC FIFO CLOCK*/
+        if (IS_VENDOR_8812A_C_CUT(rtlhal->version)) {
+                if (band_width == HT_CHANNEL_WIDTH_20_40 && channel == 11)
+                        rtl_set_bbreg(hw, RRFMOD, 0xC00, 0x3);
+                        /* 0x8AC[11:10] = 2'b11*/
+                else
+                        rtl_set_bbreg(hw, RRFMOD, 0xC00, 0x2);
+                        /* 0x8AC[11:10] = 2'b10*/
+
+                /* <20120914, Kordan> A workarould to resolve
+                 * 2480Mhz spur by setting ADC clock as 160M. (Asked by Binson)
+                 */
+                if (band_width == HT_CHANNEL_WIDTH_20 &&
+                    (channel == 13 || channel == 14)) {
+                        rtl_set_bbreg(hw, RRFMOD, 0x300, 0x3);
+                        /*0x8AC[9:8] = 2'b11*/
+                        rtl_set_bbreg(hw, RADC_BUF_CLK, BIT(30), 1);
+                        /* 0x8C4[30] = 1*/
+                } else if (band_width == HT_CHANNEL_WIDTH_20_40 &&
+                           channel == 11) {
+                        rtl_set_bbreg(hw, RADC_BUF_CLK, BIT(30), 1);
+                        /*0x8C4[30] = 1*/
+                } else if (band_width != HT_CHANNEL_WIDTH_80) {
+                        rtl_set_bbreg(hw, RRFMOD, 0x300, 0x2);
+                        /*0x8AC[9:8] = 2'b10*/
+                        rtl_set_bbreg(hw, RADC_BUF_CLK, BIT(30), 0);
+                        /*0x8C4[30] = 0*/
+                }
+        } else if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                /* <20120914, Kordan> A workarould to resolve
+                 * 2480Mhz spur by setting ADC clock as 160M.
+                 */
+                if (band_width == HT_CHANNEL_WIDTH_20 &&
+                    (channel == 13 || channel == 14))
+                        rtl_set_bbreg(hw, RRFMOD, 0x300, 0x3);
+                        /*0x8AC[9:8] = 11*/
+                else if (channel  <= 14) /*2.4G only*/
+                        rtl_set_bbreg(hw, RRFMOD, 0x300, 0x2);
+                        /*0x8AC[9:8] = 10*/
+        }
+}
+
+u32 rtl8821ae_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr,
+                               u32 bitmask)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 returnvalue, originalvalue, bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x)\n",
+                 regaddr, bitmask);
+        originalvalue = rtl_read_dword(rtlpriv, regaddr);
+        bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
+        returnvalue = (originalvalue & bitmask) >> bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
+                 bitmask, regaddr, originalvalue);
+        return returnvalue;
+}
+
+void rtl8821ae_phy_set_bb_reg(struct ieee80211_hw *hw,
+                              u32 regaddr, u32 bitmask, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 originalvalue, bitshift;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
+
+        if (bitmask != MASKDWORD) {
+                originalvalue = rtl_read_dword(rtlpriv, regaddr);
+                bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
+                data = ((originalvalue & (~bitmask)) |
+                        ((data << bitshift) & bitmask));
+        }
+
+        rtl_write_dword(rtlpriv, regaddr, data);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
+}
+
+u32 rtl8821ae_phy_query_rf_reg(struct ieee80211_hw *hw,
+                               enum radio_path rfpath, u32 regaddr,
+                               u32 bitmask)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 original_value, readback_value, bitshift;
+        unsigned long flags;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
+
+        spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+
+        original_value = _rtl8821ae_phy_rf_serial_read(hw, rfpath, regaddr);
+        bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
+        readback_value = (original_value & bitmask) >> bitshift;
+
+        spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
+
+        return readback_value;
+}
+
+void rtl8821ae_phy_set_rf_reg(struct ieee80211_hw *hw,
+                           enum radio_path rfpath,
+                           u32 regaddr, u32 bitmask, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 original_value, bitshift;
+        unsigned long flags;
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                  regaddr, bitmask, data, rfpath);
+
+        spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+
+        if (bitmask != RFREG_OFFSET_MASK) {
+                original_value =
+                   _rtl8821ae_phy_rf_serial_read(hw, rfpath, regaddr);
+                bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
+                data = ((original_value & (~bitmask)) | (data << bitshift));
+        }
+
+        _rtl8821ae_phy_rf_serial_write(hw, rfpath, regaddr, data);
+
+        spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
+}
+
+static u32 _rtl8821ae_phy_rf_serial_read(struct ieee80211_hw *hw,
+                                         enum radio_path rfpath, u32 offset)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        bool is_pi_mode = false;
+        u32 retvalue = 0;
+
+        /* 2009/06/17 MH We can not execute IO for power
+        save or other accident mode.*/
+        if (RT_CANNOT_IO(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "return all one\n");
+                return 0xFFFFFFFF;
+        }
+        /* <20120809, Kordan> CCA OFF(when entering),
+                asked by James to avoid reading the wrong value.
+            <20120828, Kordan> Toggling CCA would affect RF 0x0, skip it!*/
+        if (offset != 0x0 &&
+            !((rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) ||
+            (IS_VENDOR_8812A_C_CUT(rtlhal->version))))
+                rtl_set_bbreg(hw, RCCAONSEC, 0x8, 1);
+        offset &= 0xff;
+
+        if (rfpath == RF90_PATH_A)
+                is_pi_mode = (bool)rtl_get_bbreg(hw, 0xC00, 0x4);
+        else if (rfpath == RF90_PATH_B)
+                is_pi_mode = (bool)rtl_get_bbreg(hw, 0xE00, 0x4);
+
+        rtl_set_bbreg(hw, RHSSIREAD_8821AE, 0xff, offset);
+
+        if ((rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) ||
+            (IS_VENDOR_8812A_C_CUT(rtlhal->version)))
+                udelay(20);
+
+        if (is_pi_mode) {
+                if (rfpath == RF90_PATH_A)
+                        retvalue =
+                          rtl_get_bbreg(hw, RA_PIREAD_8821A, BLSSIREADBACKDATA);
+                else if (rfpath == RF90_PATH_B)
+                        retvalue =
+                          rtl_get_bbreg(hw, RB_PIREAD_8821A, BLSSIREADBACKDATA);
+        } else {
+                if (rfpath == RF90_PATH_A)
+                        retvalue =
+                          rtl_get_bbreg(hw, RA_SIREAD_8821A, BLSSIREADBACKDATA);
+                else if (rfpath == RF90_PATH_B)
+                        retvalue =
+                          rtl_get_bbreg(hw, RB_SIREAD_8821A, BLSSIREADBACKDATA);
+        }
+
+        /*<20120809, Kordan> CCA ON(when exiting),
+         * asked by James to avoid reading the wrong value.
+         *   <20120828, Kordan> Toggling CCA would affect RF 0x0, skip it!
+         */
+        if (offset != 0x0 &&
+            !((rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) ||
+            (IS_VENDOR_8812A_C_CUT(rtlhal->version))))
+                rtl_set_bbreg(hw, RCCAONSEC, 0x8, 0);
+        return retvalue;
+}
+
+static void _rtl8821ae_phy_rf_serial_write(struct ieee80211_hw *hw,
+                                           enum radio_path rfpath, u32 offset,
+                                           u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
+        u32 data_and_addr;
+        u32 newoffset;
+
+        if (RT_CANNOT_IO(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "stop\n");
+                return;
+        }
+        offset &= 0xff;
+        newoffset = offset;
+        data_and_addr = ((newoffset << 20) |
+                         (data & 0x000fffff)) & 0x0fffffff;
+        rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
+}
+
+static u32 _rtl8821ae_phy_calculate_bit_shift(u32 bitmask)
+{
+        u32 i;
+
+        for (i = 0; i <= 31; i++) {
+                if (((bitmask >> i) & 0x1) == 1)
+                        break;
+        }
+        return i;
+}
+
+bool rtl8821ae_phy_mac_config(struct ieee80211_hw *hw)
+{
+        bool rtstatus = 0;
+
+        rtstatus = _rtl8821ae_phy_config_mac_with_headerfile(hw);
+
+        return rtstatus;
+}
+
+bool rtl8821ae_phy_bb_config(struct ieee80211_hw *hw)
+{
+        bool rtstatus = true;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 regval;
+        u8 crystal_cap;
+
+        phy_init_bb_rf_register_definition(hw);
+
+        regval = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN);
+        regval |= FEN_PCIEA;
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, regval);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN,
+                       regval | FEN_BB_GLB_RSTN | FEN_BBRSTB);
+
+        rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x7);
+        rtl_write_byte(rtlpriv, REG_OPT_CTRL + 2, 0x7);
+
+        rtstatus = _rtl8821ae_phy_bb8821a_config_parafile(hw);
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                crystal_cap = rtlefuse->crystalcap & 0x3F;
+                rtl_set_bbreg(hw, REG_MAC_PHY_CTRL, 0x7FF80000,
+                              (crystal_cap | (crystal_cap << 6)));
+        } else {
+                crystal_cap = rtlefuse->crystalcap & 0x3F;
+                rtl_set_bbreg(hw, REG_MAC_PHY_CTRL, 0xFFF000,
+                              (crystal_cap | (crystal_cap << 6)));
+        }
+        rtlphy->reg_837 = rtl_read_byte(rtlpriv, 0x837);
+
+        return rtstatus;
+}
+
+bool rtl8821ae_phy_rf_config(struct ieee80211_hw *hw)
+{
+        return rtl8821ae_phy_rf6052_config(hw);
+}
+
+u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8  band,
+                           u8 rf_path)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtlpriv);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        char reg_swing_2g = -1;/* 0xff; */
+        char reg_swing_5g = -1;/* 0xff; */
+        char swing_2g = -1 * reg_swing_2g;
+        char swing_5g = -1 * reg_swing_5g;
+        u32  out = 0x200;
+        const char auto_temp = -1;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
+                 "===> PHY_GetTxBBSwing_8812A, bbSwing_2G: %d, bbSwing_5G: %d,autoload_failflag=%d.\n",
+                 (int)swing_2g, (int)swing_5g,
+                 (int)rtlefuse->autoload_failflag);
+
+        if (rtlefuse->autoload_failflag) {
+                if (band == BAND_ON_2_4G) {
+                        rtldm->swing_diff_2g = swing_2g;
+                        if (swing_2g == 0) {
+                                out = 0x200; /* 0 dB */
+                        } else if (swing_2g == -3) {
+                                out = 0x16A; /* -3 dB */
+                        } else if (swing_2g == -6) {
+                                out = 0x101; /* -6 dB */
+                        } else if (swing_2g == -9) {
+                                out = 0x0B6; /* -9 dB */
+                        } else {
+                                rtldm->swing_diff_2g = 0;
+                                out = 0x200;
+                        }
+                } else if (band == BAND_ON_5G) {
+                        rtldm->swing_diff_5g = swing_5g;
+                        if (swing_5g == 0) {
+                                out = 0x200; /* 0 dB */
+                        } else if (swing_5g == -3) {
+                                out = 0x16A; /* -3 dB */
+                        } else if (swing_5g == -6) {
+                                out = 0x101; /* -6 dB */
+                        } else if (swing_5g == -9) {
+                                out = 0x0B6; /* -9 dB */
+                        } else {
+                                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                                        rtldm->swing_diff_5g = -3;
+                                        out = 0x16A;
+                                } else {
+                                        rtldm->swing_diff_5g = 0;
+                                        out = 0x200;
+                                }
+                        }
+                } else {
+                        rtldm->swing_diff_2g = -3;
+                        rtldm->swing_diff_5g = -3;
+                        out = 0x16A; /* -3 dB */
+                }
+        } else {
+            u32 swing = 0, swing_a = 0, swing_b = 0;
+
+            if (band == BAND_ON_2_4G) {
+                        if (reg_swing_2g == auto_temp) {
+                                efuse_shadow_read(hw, 1, 0xC6, (u32 *)&swing);
+                                swing = (swing == 0xFF) ? 0x00 : swing;
+                        } else if (swing_2g ==  0) {
+                                swing = 0x00; /* 0 dB */
+                        } else if (swing_2g == -3) {
+                                swing = 0x05; /* -3 dB */
+                        } else if (swing_2g == -6) {
+                                swing = 0x0A; /* -6 dB */
+                        } else if (swing_2g == -9) {
+                                swing = 0xFF; /* -9 dB */
+                        } else {
+                                swing = 0x00;
+                        }
+                } else {
+                        if (reg_swing_5g == auto_temp) {
+                                efuse_shadow_read(hw, 1, 0xC7, (u32 *)&swing);
+                                swing = (swing == 0xFF) ? 0x00 : swing;
+                        } else if (swing_5g ==  0) {
+                                swing = 0x00; /* 0 dB */
+                        } else if (swing_5g == -3) {
+                                swing = 0x05; /* -3 dB */
+                        } else if (swing_5g == -6) {
+                                swing = 0x0A; /* -6 dB */
+                        } else if (swing_5g == -9) {
+                                swing = 0xFF; /* -9 dB */
+                        } else {
+                                swing = 0x00;
+                        }
+                }
+
+                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",
+                         swing_a, swing_b);
+
+                /* 3 Path-A */
+                if (swing_a == 0x0) {
+                        if (band == BAND_ON_2_4G)
+                                rtldm->swing_diff_2g = 0;
+                        else
+                                rtldm->swing_diff_5g = 0;
+                        out = 0x200; /* 0 dB */
+                } else if (swing_a == 0x1) {
+                        if (band == BAND_ON_2_4G)
+                                rtldm->swing_diff_2g = -3;
+                        else
+                                rtldm->swing_diff_5g = -3;
+                        out = 0x16A; /* -3 dB */
+                } else if (swing_a == 0x2) {
+                        if (band == BAND_ON_2_4G)
+                                rtldm->swing_diff_2g = -6;
+                        else
+                                rtldm->swing_diff_5g = -6;
+                        out = 0x101; /* -6 dB */
+                } else if (swing_a == 0x3) {
+                        if (band == BAND_ON_2_4G)
+                                rtldm->swing_diff_2g = -9;
+                        else
+                                rtldm->swing_diff_5g = -9;
+                        out = 0x0B6; /* -9 dB */
+                }
+                /* 3 Path-B */
+                if (swing_b == 0x0) {
+                        if (band == BAND_ON_2_4G)
+                                rtldm->swing_diff_2g = 0;
+                        else
+                                rtldm->swing_diff_5g = 0;
+                        out = 0x200; /* 0 dB */
+                } else if (swing_b == 0x1) {
+                        if (band == BAND_ON_2_4G)
+                                rtldm->swing_diff_2g = -3;
+                        else
+                                rtldm->swing_diff_5g = -3;
+                        out = 0x16A; /* -3 dB */
+                } else if (swing_b == 0x2) {
+                        if (band == BAND_ON_2_4G)
+                                rtldm->swing_diff_2g = -6;
+                        else
+                                rtldm->swing_diff_5g = -6;
+                        out = 0x101; /* -6 dB */
+                } else if (swing_b == 0x3) {
+                        if (band == BAND_ON_2_4G)
+                                rtldm->swing_diff_2g = -9;
+                        else
+                                rtldm->swing_diff_5g = -9;
+                        out = 0x0B6; /* -9 dB */
+                }
+        }
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
+                 "<=== PHY_GetTxBBSwing_8812A, out = 0x%X\n", out);
+         return out;
+}
+
+void rtl8821ae_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_dm *rtldm = rtl_dm(rtlpriv);
+        u8 current_band = rtlhal->current_bandtype;
+        u32 txpath, rxpath;
+        char bb_diff_between_band;
+
+        txpath = rtl8821ae_phy_query_bb_reg(hw, RTXPATH, 0xf0);
+        rxpath = rtl8821ae_phy_query_bb_reg(hw, RCCK_RX, 0x0f000000);
+        rtlhal->current_bandtype = (enum band_type) band;
+        /* reconfig BB/RF according to wireless mode */
+        if (rtlhal->current_bandtype == BAND_ON_2_4G) {
+                /* BB & RF Config */
+                rtl_set_bbreg(hw, ROFDMCCKEN, BOFDMEN|BCCKEN, 0x03);
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                        /* 0xCB0[15:12] = 0x7 (LNA_On)*/
+                        rtl_set_bbreg(hw, RA_RFE_PINMUX, 0xF000, 0x7);
+                        /* 0xCB0[7:4] = 0x7 (PAPE_A)*/
+                        rtl_set_bbreg(hw, RA_RFE_PINMUX, 0xF0, 0x7);
+                }
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        /*0x834[1:0] = 0x1*/
+                        rtl_set_bbreg(hw, 0x834, 0x3, 0x1);
+                }
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                        /* 0xC1C[11:8] = 0 */
+                        rtl_set_bbreg(hw, RA_TXSCALE, 0xF00, 0);
+                } else {
+                        /* 0x82C[1:0] = 2b'00 */
+                        rtl_set_bbreg(hw, 0x82c, 0x3, 0);
+                }
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        rtl_set_bbreg(hw, RA_RFE_PINMUX, BMASKDWORD,
+                                      0x77777777);
+                        rtl_set_bbreg(hw, RB_RFE_PINMUX, BMASKDWORD,
+                                      0x77777777);
+                        rtl_set_bbreg(hw, RA_RFE_INV, 0x3ff00000, 0x000);
+                        rtl_set_bbreg(hw, RB_RFE_INV, 0x3ff00000, 0x000);
+                }
+
+                rtl_set_bbreg(hw, RTXPATH, 0xf0, 0x1);
+                rtl_set_bbreg(hw, RCCK_RX, 0x0f000000, 0x1);
+
+                rtl_write_byte(rtlpriv, REG_CCK_CHECK, 0x0);
+        } else {/* 5G band */
+                u16 count, reg_41a;
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                        /*0xCB0[15:12] = 0x5 (LNA_On)*/
+                        rtl_set_bbreg(hw, RA_RFE_PINMUX, 0xF000, 0x5);
+                        /*0xCB0[7:4] = 0x4 (PAPE_A)*/
+                        rtl_set_bbreg(hw, RA_RFE_PINMUX, 0xF0, 0x4);
+                }
+                /*CCK_CHECK_en*/
+                rtl_write_byte(rtlpriv, REG_CCK_CHECK, 0x80);
+
+                count = 0;
+                reg_41a = rtl_read_word(rtlpriv, REG_TXPKT_EMPTY);
+                RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
+                         "Reg41A value %d", reg_41a);
+                reg_41a &= 0x30;
+                while ((reg_41a != 0x30) && (count < 50)) {
+                        udelay(50);
+                        RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD, "Delay 50us\n");
+
+                        reg_41a = rtl_read_word(rtlpriv, REG_TXPKT_EMPTY);
+                        reg_41a &= 0x30;
+                        count++;
+                        RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
+                                 "Reg41A value %d", reg_41a);
+                }
+                if (count != 0)
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                 "PHY_SwitchWirelessBand8812(): Switch to 5G Band. Count = %d reg41A=0x%x\n",
+                                 count, reg_41a);
+
+                /* 2012/02/01, Sinda add registry to switch workaround
+                without long-run verification for scan issue. */
+                rtl_set_bbreg(hw, ROFDMCCKEN, BOFDMEN|BCCKEN, 0x03);
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        /*0x834[1:0] = 0x2*/
+                        rtl_set_bbreg(hw, 0x834, 0x3, 0x2);
+                }
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                        /* AGC table select */
+                        /* 0xC1C[11:8] = 1*/
+                        rtl_set_bbreg(hw, RA_TXSCALE, 0xF00, 1);
+                } else
+                        /* 0x82C[1:0] = 2'b00 */
+                        rtl_set_bbreg(hw, 0x82c, 0x3, 1);
+
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        rtl_set_bbreg(hw, RA_RFE_PINMUX, BMASKDWORD,
+                                      0x77337777);
+                        rtl_set_bbreg(hw, RB_RFE_PINMUX, BMASKDWORD,
+                                      0x77337777);
+                        rtl_set_bbreg(hw, RA_RFE_INV, 0x3ff00000, 0x010);
+                        rtl_set_bbreg(hw, RB_RFE_INV, 0x3ff00000, 0x010);
+                }
+
+                rtl_set_bbreg(hw, RTXPATH, 0xf0, 0);
+                rtl_set_bbreg(hw, RCCK_RX, 0x0f000000, 0xf);
+
+                RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
+                         "==>PHY_SwitchWirelessBand8812() BAND_ON_5G settings OFDM index 0x%x\n",
+                         rtlpriv->dm.ofdm_index[RF90_PATH_A]);
+        }
+
+        if ((rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) ||
+            (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)) {
+                /* 0xC1C[31:21] */
+                rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
+                              phy_get_tx_swing_8812A(hw, band, RF90_PATH_A));
+                /* 0xE1C[31:21] */
+                rtl_set_bbreg(hw, RB_TXSCALE, 0xFFE00000,
+                              phy_get_tx_swing_8812A(hw, band, RF90_PATH_B));
+
+                /* <20121005, Kordan> When TxPowerTrack is ON,
+                 *      we should take care of the change of BB swing.
+                 *   That is, reset all info to trigger Tx power tracking.
+                 */
+                if (band != current_band) {
+                        bb_diff_between_band =
+                                (rtldm->swing_diff_2g - rtldm->swing_diff_5g);
+                        bb_diff_between_band = (band == BAND_ON_2_4G) ?
+                                                bb_diff_between_band :
+                                                (-1 * bb_diff_between_band);
+                        rtldm->default_ofdm_index += bb_diff_between_band * 2;
+                }
+                rtl8821ae_dm_clear_txpower_tracking_state(hw);
+        }
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
+                 "<==rtl8821ae_phy_switch_wirelessband():Switch Band OK.\n");
+        return;
+}
+
+static bool _rtl8821ae_check_condition(struct ieee80211_hw *hw,
+                                       const u32 condition)
+{
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u32 _board = rtlefuse->board_type; /*need efuse define*/
+        u32 _interface = 0x01; /* ODM_ITRF_PCIE */
+        u32 _platform = 0x08;/* ODM_WIN */
+        u32 cond = condition;
+
+        if (condition == 0xCDCDCDCD)
+                return true;
+
+        cond = condition & 0xFF;
+        if ((_board != cond) && cond != 0xFF)
+                return false;
+
+        cond = condition & 0xFF00;
+        cond = cond >> 8;
+        if ((_interface & cond) == 0 && cond != 0x07)
+                return false;
+
+        cond = condition & 0xFF0000;
+        cond = cond >> 16;
+        if ((_platform & cond) == 0 && cond != 0x0F)
+                return false;
+        return true;
+}
+
+static void _rtl8821ae_config_rf_reg(struct ieee80211_hw *hw,
+                                     u32 addr, u32 data,
+                                     enum radio_path rfpath, u32 regaddr)
+{
+        if (addr == 0xfe || addr == 0xffe) {
+                /* In order not to disturb BT music when
+                 * wifi init.(1ant NIC only)
+                 */
+                mdelay(50);
+        } else {
+                rtl_set_rfreg(hw, rfpath, regaddr, RFREG_OFFSET_MASK, data);
+                udelay(1);
+        }
+}
+
+static void _rtl8821ae_config_rf_radio_a(struct ieee80211_hw *hw,
+                                         u32 addr, u32 data)
+{
+        u32 content = 0x1000; /*RF Content: radio_a_txt*/
+        u32 maskforphyset = (u32)(content & 0xE000);
+
+        _rtl8821ae_config_rf_reg(hw, addr, data,
+                                 RF90_PATH_A, addr | maskforphyset);
+}
+
+static void _rtl8821ae_config_rf_radio_b(struct ieee80211_hw *hw,
+                                         u32 addr, u32 data)
+{
+        u32 content = 0x1001; /*RF Content: radio_b_txt*/
+        u32 maskforphyset = (u32)(content & 0xE000);
+
+        _rtl8821ae_config_rf_reg(hw, addr, data,
+                                 RF90_PATH_B, addr | maskforphyset);
+}
+
+static void _rtl8821ae_config_bb_reg(struct ieee80211_hw *hw,
+                                     u32 addr, u32 data)
+{
+        if (addr == 0xfe)
+                mdelay(50);
+        else if (addr == 0xfd)
+                mdelay(5);
+        else if (addr == 0xfc)
+                mdelay(1);
+        else if (addr == 0xfb)
+                udelay(50);
+        else if (addr == 0xfa)
+                udelay(5);
+        else if (addr == 0xf9)
+                udelay(1);
+        else
+                rtl_set_bbreg(hw, addr, MASKDWORD, data);
+
+        udelay(1);
+}
+
+static void _rtl8821ae_phy_init_tx_power_by_rate(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 band, rfpath, txnum, rate_section;
+
+        for (band = BAND_ON_2_4G; band <= BAND_ON_5G; ++band)
+                for (rfpath = 0; rfpath < TX_PWR_BY_RATE_NUM_RF; ++rfpath)
+                        for (txnum = 0; txnum < TX_PWR_BY_RATE_NUM_RF; ++txnum)
+                                for (rate_section = 0;
+                                     rate_section < TX_PWR_BY_RATE_NUM_SECTION;
+                                     ++rate_section)
+                                        rtlphy->tx_power_by_rate_offset[band]
+                                            [rfpath][txnum][rate_section] = 0;
+}
+
+static void _rtl8821ae_phy_set_txpower_by_rate_base(struct ieee80211_hw *hw,
+                                          u8 band, u8 path,
+                                          u8 rate_section,
+                                          u8 txnum, u8 value)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        if (path > RF90_PATH_D) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                        "Invalid Rf Path %d in phy_SetTxPowerByRatBase()\n", path);
+                return;
+        }
+
+        if (band == BAND_ON_2_4G) {
+                switch (rate_section) {
+                case CCK:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][0] = value;
+                        break;
+                case OFDM:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][1] = value;
+                        break;
+                case HT_MCS0_MCS7:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][2] = value;
+                        break;
+                case HT_MCS8_MCS15:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][3] = value;
+                        break;
+                case VHT_1SSMCS0_1SSMCS9:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][4] = value;
+                        break;
+                case VHT_2SSMCS0_2SSMCS9:
+                        rtlphy->txpwr_by_rate_base_24g[path][txnum][5] = value;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Invalid RateSection %d in Band 2.4G,Rf Path %d, %dTx in PHY_SetTxPowerByRateBase()\n",
+                                 rate_section, path, txnum);
+                        break;
+                };
+        } else if (band == BAND_ON_5G) {
+                switch (rate_section) {
+                case OFDM:
+                        rtlphy->txpwr_by_rate_base_5g[path][txnum][0] = value;
+                        break;
+                case HT_MCS0_MCS7:
+                        rtlphy->txpwr_by_rate_base_5g[path][txnum][1] = value;
+                        break;
+                case HT_MCS8_MCS15:
+                        rtlphy->txpwr_by_rate_base_5g[path][txnum][2] = value;
+                        break;
+                case VHT_1SSMCS0_1SSMCS9:
+                        rtlphy->txpwr_by_rate_base_5g[path][txnum][3] = value;
+                        break;
+                case VHT_2SSMCS0_2SSMCS9:
+                        rtlphy->txpwr_by_rate_base_5g[path][txnum][4] = value;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                "Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in PHY_SetTxPowerByRateBase()\n",
+                                rate_section, path, txnum);
+                        break;
+                };
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                        "Invalid Band %d in PHY_SetTxPowerByRateBase()\n", band);
+        }
+}
+
+static u8 _rtl8821ae_phy_get_txpower_by_rate_base(struct ieee80211_hw *hw,
+                                                  u8 band, u8 path,
+                                                  u8 txnum, u8 rate_section)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 value = 0;
+
+        if (path > RF90_PATH_D) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Invalid Rf Path %d in PHY_GetTxPowerByRateBase()\n",
+                         path);
+                return 0;
+        }
+
+        if (band == BAND_ON_2_4G) {
+                switch (rate_section) {
+                case CCK:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][0];
+                        break;
+                case OFDM:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][1];
+                        break;
+                case HT_MCS0_MCS7:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][2];
+                        break;
+                case HT_MCS8_MCS15:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][3];
+                        break;
+                case VHT_1SSMCS0_1SSMCS9:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][4];
+                        break;
+                case VHT_2SSMCS0_2SSMCS9:
+                        value = rtlphy->txpwr_by_rate_base_24g[path][txnum][5];
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
+                                 rate_section, path, txnum);
+                        break;
+                };
+        } else if (band == BAND_ON_5G) {
+                switch (rate_section) {
+                case OFDM:
+                        value = rtlphy->txpwr_by_rate_base_5g[path][txnum][0];
+                        break;
+                case HT_MCS0_MCS7:
+                        value = rtlphy->txpwr_by_rate_base_5g[path][txnum][1];
+                        break;
+                case HT_MCS8_MCS15:
+                        value = rtlphy->txpwr_by_rate_base_5g[path][txnum][2];
+                        break;
+                case VHT_1SSMCS0_1SSMCS9:
+                        value = rtlphy->txpwr_by_rate_base_5g[path][txnum][3];
+                        break;
+                case VHT_2SSMCS0_2SSMCS9:
+                        value = rtlphy->txpwr_by_rate_base_5g[path][txnum][4];
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                 "Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
+                                 rate_section, path, txnum);
+                        break;
+                };
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "Invalid Band %d in PHY_GetTxPowerByRateBase()\n", band);
+        }
+
+        return value;
+}
+
+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;
+        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);
+                _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);
+                _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);
+                _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);
+                _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);
+                _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);
+                _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);
+                _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);
+                _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);
+                _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);
+                _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);
+                _rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
+        }
+}
+
+static void _phy_convert_txpower_dbm_to_relative_value(u32 *data, u8 start,
+                                                u8 end, u8 base_val)
+{
+        char i = 0;
+        u8 temp_value = 0;
+        u32 temp_data = 0;
+
+        for (i = 3; i >= 0; --i) {
+                if (i >= start && i <= end) {
+                        /* Get the exact value */
+                        temp_value = (u8)(*data >> (i * 8)) & 0xF;
+                        temp_value += ((u8)((*data >> (i * 8 + 4)) & 0xF)) * 10;
+
+                        /* Change the value to a relative value */
+                        temp_value = (temp_value > base_val) ? temp_value -
+                                        base_val : base_val - temp_value;
+                } else {
+                        temp_value = (u8)(*data >> (i * 8)) & 0xFF;
+                }
+                temp_data <<= 8;
+                temp_data |= temp_value;
+        }
+        *data = temp_data;
+}
+
+static void _rtl8812ae_phy_cross_reference_ht_and_vht_txpower_limit(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 regulation, bw, channel, rate_section;
+        char temp_pwrlmt = 0;
+
+        for (regulation = 0; regulation < MAX_REGULATION_NUM; ++regulation) {
+                for (bw = 0; bw < MAX_5G_BANDWITH_NUM; ++bw) {
+                        for (channel = 0; channel < CHANNEL_MAX_NUMBER_5G; ++channel) {
+                                for (rate_section = 0; rate_section < MAX_RATE_SECTION_NUM; ++rate_section) {
+                                        temp_pwrlmt = rtlphy->txpwr_limit_5g[regulation]
+                                                [bw][rate_section][channel][RF90_PATH_A];
+                                        if (temp_pwrlmt == MAX_POWER_INDEX) {
+                                                if (bw == 0 || bw == 1) { /*5G 20M 40M VHT and HT can cross reference*/
+                                                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                                                "No power limit table of the specified band %d, bandwidth %d, ratesection %d, channel %d, rf path %d\n",
+                                                                1, bw, rate_section, channel, RF90_PATH_A);
+                                                        if (rate_section == 2) {
+                                                                rtlphy->txpwr_limit_5g[regulation][bw][2][channel][RF90_PATH_A] =
+                                                                        rtlphy->txpwr_limit_5g[regulation][bw][4][channel][RF90_PATH_A];
+                                                        } else if (rate_section == 4) {
+                                                                rtlphy->txpwr_limit_5g[regulation][bw][4][channel][RF90_PATH_A] =
+                                                                        rtlphy->txpwr_limit_5g[regulation][bw][2][channel][RF90_PATH_A];
+                                                        } else if (rate_section == 3) {
+                                                                rtlphy->txpwr_limit_5g[regulation][bw][3][channel][RF90_PATH_A] =
+                                                                        rtlphy->txpwr_limit_5g[regulation][bw][5][channel][RF90_PATH_A];
+                                                        } else if (rate_section == 5) {
+                                                                rtlphy->txpwr_limit_5g[regulation][bw][5][channel][RF90_PATH_A] =
+                                                                        rtlphy->txpwr_limit_5g[regulation][bw][3][channel][RF90_PATH_A];
+                                                        }
+
+                                                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "use other value %d", temp_pwrlmt);
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+}
+
+static u8 _rtl8812ae_phy_get_txpower_by_rate_base_index(struct ieee80211_hw *hw,
+                                                   enum band_type band, u8 rate)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 index = 0;
+        if (band == BAND_ON_2_4G) {
+                switch (rate) {
+                case MGN_1M:
+                case MGN_2M:
+                case MGN_5_5M:
+                case MGN_11M:
+                        index = 0;
+                        break;
+
+                case MGN_6M:
+                case MGN_9M:
+                case MGN_12M:
+                case MGN_18M:
+                case MGN_24M:
+                case MGN_36M:
+                case MGN_48M:
+                case MGN_54M:
+                        index = 1;
+                        break;
+
+                case MGN_MCS0:
+                case MGN_MCS1:
+                case MGN_MCS2:
+                case MGN_MCS3:
+                case MGN_MCS4:
+                case MGN_MCS5:
+                case MGN_MCS6:
+                case MGN_MCS7:
+                        index = 2;
+                        break;
+
+                case MGN_MCS8:
+                case MGN_MCS9:
+                case MGN_MCS10:
+                case MGN_MCS11:
+                case MGN_MCS12:
+                case MGN_MCS13:
+                case MGN_MCS14:
+                case MGN_MCS15:
+                        index = 3;
+                        break;
+
+                default:
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                "Wrong rate 0x%x to obtain index in 2.4G in PHY_GetTxPowerByRateBaseIndex()\n",
+                                rate);
+                        break;
+                }
+        } else if (band == BAND_ON_5G) {
+                switch (rate) {
+                case MGN_6M:
+                case MGN_9M:
+                case MGN_12M:
+                case MGN_18M:
+                case MGN_24M:
+                case MGN_36M:
+                case MGN_48M:
+                case MGN_54M:
+                        index = 0;
+                        break;
+
+                case MGN_MCS0:
+                case MGN_MCS1:
+                case MGN_MCS2:
+                case MGN_MCS3:
+                case MGN_MCS4:
+                case MGN_MCS5:
+                case MGN_MCS6:
+                case MGN_MCS7:
+                        index = 1;
+                        break;
+
+                case MGN_MCS8:
+                case MGN_MCS9:
+                case MGN_MCS10:
+                case MGN_MCS11:
+                case MGN_MCS12:
+                case MGN_MCS13:
+                case MGN_MCS14:
+                case MGN_MCS15:
+                        index = 2;
+                        break;
+
+                case MGN_VHT1SS_MCS0:
+                case MGN_VHT1SS_MCS1:
+                case MGN_VHT1SS_MCS2:
+                case MGN_VHT1SS_MCS3:
+                case MGN_VHT1SS_MCS4:
+                case MGN_VHT1SS_MCS5:
+                case MGN_VHT1SS_MCS6:
+                case MGN_VHT1SS_MCS7:
+                case MGN_VHT1SS_MCS8:
+                case MGN_VHT1SS_MCS9:
+                        index = 3;
+                        break;
+
+                case MGN_VHT2SS_MCS0:
+                case MGN_VHT2SS_MCS1:
+                case MGN_VHT2SS_MCS2:
+                case MGN_VHT2SS_MCS3:
+                case MGN_VHT2SS_MCS4:
+                case MGN_VHT2SS_MCS5:
+                case MGN_VHT2SS_MCS6:
+                case MGN_VHT2SS_MCS7:
+                case MGN_VHT2SS_MCS8:
+                case MGN_VHT2SS_MCS9:
+                        index = 4;
+                        break;
+
+                default:
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                "Wrong rate 0x%x to obtain index in 5G in PHY_GetTxPowerByRateBaseIndex()\n",
+                                rate);
+                        break;
+                }
+        }
+
+        return index;
+}
+
+static void _rtl8812ae_phy_convert_txpower_limit_to_power_index(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 bw40_pwr_base_dbm2_4G, bw40_pwr_base_dbm5G;
+        u8 regulation, bw, channel, rate_section;
+        u8 base_index2_4G = 0;
+        u8 base_index5G = 0;
+        char temp_value = 0, temp_pwrlmt = 0;
+        u8 rf_path = 0;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                "=====> _rtl8812ae_phy_convert_txpower_limit_to_power_index()\n");
+
+        _rtl8812ae_phy_cross_reference_ht_and_vht_txpower_limit(hw);
+
+        for (regulation = 0; regulation < MAX_REGULATION_NUM; ++regulation) {
+                for (bw = 0; bw < MAX_2_4G_BANDWITH_NUM; ++bw) {
+                        for (channel = 0; channel < CHANNEL_MAX_NUMBER_2G; ++channel) {
+                                for (rate_section = 0; rate_section < MAX_RATE_SECTION_NUM; ++rate_section) {
+                                        /* obtain the base dBm values in 2.4G band
+                                         CCK => 11M, OFDM => 54M, HT 1T => MCS7, HT 2T => MCS15*/
+                                        if (rate_section == 0) { /*CCK*/
+                                                base_index2_4G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_2_4G, MGN_11M);
+                                        } else if (rate_section == 1) { /*OFDM*/
+                                                base_index2_4G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_2_4G, MGN_54M);
+                                        } else if (rate_section == 2) { /*HT IT*/
+                                                base_index2_4G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_2_4G, MGN_MCS7);
+                                        } else if (rate_section == 3) { /*HT 2T*/
+                                                base_index2_4G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_2_4G, MGN_MCS15);
+                                        }
+
+                                        temp_pwrlmt = rtlphy->txpwr_limit_2_4g[regulation]
+                                                [bw][rate_section][channel][RF90_PATH_A];
+
+                                        for (rf_path = RF90_PATH_A;
+                                                rf_path < MAX_RF_PATH_NUM;
+                                                ++rf_path) {
+                                                if (rate_section == 3)
+                                                        bw40_pwr_base_dbm2_4G =
+                                                        rtlphy->txpwr_by_rate_base_24g[rf_path][RF_2TX][base_index2_4G];
+                                                else
+                                                        bw40_pwr_base_dbm2_4G =
+                                                        rtlphy->txpwr_by_rate_base_24g[rf_path][RF_1TX][base_index2_4G];
+
+                                                if (temp_pwrlmt != MAX_POWER_INDEX) {
+                                                        temp_value = temp_pwrlmt - bw40_pwr_base_dbm2_4G;
+                                                        rtlphy->txpwr_limit_2_4g[regulation]
+                                                                [bw][rate_section][channel][rf_path] =
+                                                                temp_value;
+                                                }
+
+                                                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",
+                                                        regulation, bw, rate_section, channel,
+                                                        rtlphy->txpwr_limit_2_4g[regulation][bw]
+                                                        [rate_section][channel][rf_path], (temp_pwrlmt == 63)
+                                                        ? 0 : temp_pwrlmt/2, channel, rf_path,
+                                                        bw40_pwr_base_dbm2_4G);
+                                        }
+                                }
+                        }
+                }
+        }
+        for (regulation = 0; regulation < MAX_REGULATION_NUM; ++regulation) {
+                for (bw = 0; bw < MAX_5G_BANDWITH_NUM; ++bw) {
+                        for (channel = 0; channel < CHANNEL_MAX_NUMBER_5G; ++channel) {
+                                for (rate_section = 0; rate_section < MAX_RATE_SECTION_NUM; ++rate_section) {
+                                        /* obtain the base dBm values in 5G band
+                                         OFDM => 54M, HT 1T => MCS7, HT 2T => MCS15,
+                                        VHT => 1SSMCS7, VHT 2T => 2SSMCS7*/
+                                        if (rate_section == 1) { /*OFDM*/
+                                                base_index5G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_5G, MGN_54M);
+                                        } else if (rate_section == 2) { /*HT 1T*/
+                                                base_index5G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_5G, MGN_MCS7);
+                                        } else if (rate_section == 3) { /*HT 2T*/
+                                                base_index5G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_5G, MGN_MCS15);
+                                        } else if (rate_section == 4) { /*VHT 1T*/
+                                                base_index5G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_5G, MGN_VHT1SS_MCS7);
+                                        } else if (rate_section == 5) { /*VHT 2T*/
+                                                base_index5G =
+                                                        _rtl8812ae_phy_get_txpower_by_rate_base_index(hw,
+                                                        BAND_ON_5G, MGN_VHT2SS_MCS7);
+                                        }
+
+                                        temp_pwrlmt = rtlphy->txpwr_limit_5g[regulation]
+                                                [bw][rate_section][channel]
+                                                [RF90_PATH_A];
+
+                                        for (rf_path = RF90_PATH_A;
+                                             rf_path < MAX_RF_PATH_NUM;
+                                             ++rf_path) {
+                                                if (rate_section == 3 || rate_section == 5)
+                                                        bw40_pwr_base_dbm5G =
+                                                        rtlphy->txpwr_by_rate_base_5g[rf_path]
+                                                        [RF_2TX][base_index5G];
+                                                else
+                                                        bw40_pwr_base_dbm5G =
+                                                        rtlphy->txpwr_by_rate_base_5g[rf_path]
+                                                        [RF_1TX][base_index5G];
+
+                                                if (temp_pwrlmt != MAX_POWER_INDEX) {
+                                                        temp_value =
+                                                                temp_pwrlmt - bw40_pwr_base_dbm5G;
+                                                        rtlphy->txpwr_limit_5g[regulation]
+                                                                [bw][rate_section][channel]
+                                                                [rf_path] = temp_value;
+                                                }
+
+                                                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",
+                                                        regulation, bw, rate_section,
+                                                        channel, rtlphy->txpwr_limit_5g[regulation]
+                                                        [bw][rate_section][channel][rf_path],
+                                                        temp_pwrlmt, channel, rf_path, bw40_pwr_base_dbm5G);
+                                        }
+                                }
+                        }
+                }
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "<===== _rtl8812ae_phy_convert_txpower_limit_to_power_index()\n");
+}
+
+static void _rtl8821ae_phy_init_txpower_limit(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 i, j, k, l, m;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "=====> _rtl8821ae_phy_init_txpower_limit()!\n");
+
+        for (i = 0; i < MAX_REGULATION_NUM; ++i) {
+                for (j = 0; j < MAX_2_4G_BANDWITH_NUM; ++j)
+                        for (k = 0; k < MAX_RATE_SECTION_NUM; ++k)
+                                for (m = 0; m < CHANNEL_MAX_NUMBER_2G; ++m)
+                                        for (l = 0; l < MAX_RF_PATH_NUM; ++l)
+                                                rtlphy->txpwr_limit_2_4g
+                                                                [i][j][k][m][l]
+                                                        = MAX_POWER_INDEX;
+        }
+        for (i = 0; i < MAX_REGULATION_NUM; ++i) {
+                for (j = 0; j < MAX_5G_BANDWITH_NUM; ++j)
+                        for (k = 0; k < MAX_RATE_SECTION_NUM; ++k)
+                                for (m = 0; m < CHANNEL_MAX_NUMBER_5G; ++m)
+                                        for (l = 0; l < MAX_RF_PATH_NUM; ++l)
+                                                rtlphy->txpwr_limit_5g
+                                                                [i][j][k][m][l]
+                                                        = MAX_POWER_INDEX;
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "<===== _rtl8821ae_phy_init_txpower_limit()!\n");
+}
+
+static void _rtl8821ae_phy_convert_txpower_dbm_to_relative_value(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        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);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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],
+                        0, 3, base);
+
+                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],
+                        0, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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);
+
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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],
+                        0, 3, base);
+
+                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],
+                        0, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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],
+                        0, 1, base);
+
+                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],
+                        2, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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],
+                        0, 3, base);
+
+                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],
+                        0, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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],
+                        0, 3, base);
+
+                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],
+                        0, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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],
+                        0, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &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],
+                        0, 3, base);
+                _phy_convert_txpower_dbm_to_relative_value(
+                        &rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][11],
+                        0, 3, base);
+        }
+
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
+                "<===_rtl8821ae_phy_convert_txpower_dbm_to_relative_value()\n");
+}
+
+static void _rtl8821ae_phy_txpower_by_rate_configuration(struct ieee80211_hw *hw)
+{
+        _rtl8821ae_phy_store_txpower_by_rate_base(hw);
+        _rtl8821ae_phy_convert_txpower_dbm_to_relative_value(hw);
+}
+
+/* string is in decimal */
+static bool _rtl8812ae_get_integer_from_string(char *str, u8 *pint)
+{
+        u16 i = 0;
+        *pint = 0;
+
+        while (str[i] != '\0') {
+                if (str[i] >= '0' && str[i] <= '9') {
+                        *pint *= 10;
+                        *pint += (str[i] - '0');
+                } else {
+                        return false;
+                }
+                ++i;
+        }
+
+        return true;
+}
+
+static bool _rtl8812ae_eq_n_byte(u8 *str1, u8 *str2, u32 num)
+{
+        if (num == 0)
+                return false;
+        while (num > 0) {
+                num--;
+                if (str1[num] != str2[num])
+                        return false;
+        }
+        return true;
+}
+
+static char _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(struct ieee80211_hw *hw,
+                                              u8 band, u8 channel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        char channel_index = -1;
+        u8 channel_5g[CHANNEL_MAX_NUMBER_5G] = {
+                36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64,
+                100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122,
+                124, 126, 128, 130, 132, 134, 136, 138, 140, 142, 144, 149,
+                151, 153, 155, 157, 159, 161, 163, 165, 167, 168, 169, 171,
+                173, 175, 177};
+        u8  i = 0;
+        if (band == BAND_ON_2_4G)
+                channel_index = channel - 1;
+        else if (band == BAND_ON_5G) {
+                for (i = 0; i < sizeof(channel_5g)/sizeof(u8); ++i) {
+                        if (channel_5g[i] == channel)
+                                channel_index = i;
+                }
+        } else
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Invalid Band %d in %s",
+                         band,  __func__);
+
+        if (channel_index == -1)
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "Invalid Channel %d of Band %d in %s", channel,
+                         band, __func__);
+
+        return channel_index;
+}
+
+static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, u8 *pregulation,
+                                      u8 *pband, u8 *pbandwidth,
+                                      u8 *prate_section, u8 *prf_path,
+                                      u8 *pchannel, u8 *ppower_limit)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 regulation = 0, bandwidth = 0, rate_section = 0, channel;
+        u8 channel_index;
+        char power_limit = 0, prev_power_limit, ret;
+
+        if (!_rtl8812ae_get_integer_from_string((char *)pchannel, &channel) ||
+            !_rtl8812ae_get_integer_from_string((char *)ppower_limit,
+                                                &power_limit)) {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Illegal index of pwr_lmt table [chnl %d][val %d]\n",
+                          channel, power_limit);
+        }
+
+        power_limit = power_limit > MAX_POWER_INDEX ?
+                      MAX_POWER_INDEX : power_limit;
+
+        if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("FCC"), 3))
+                regulation = 0;
+        else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("MKK"), 3))
+                regulation = 1;
+        else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("ETSI"), 4))
+                regulation = 2;
+        else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("WW13"), 4))
+                regulation = 3;
+
+        if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("CCK"), 3))
+                rate_section = 0;
+        else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("OFDM"), 4))
+                rate_section = 1;
+        else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("HT"), 2) &&
+                 _rtl8812ae_eq_n_byte(prf_path, (u8 *)("1T"), 2))
+                rate_section = 2;
+        else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("HT"), 2) &&
+                 _rtl8812ae_eq_n_byte(prf_path, (u8 *)("2T"), 2))
+                rate_section = 3;
+        else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("VHT"), 3) &&
+                 _rtl8812ae_eq_n_byte(prf_path, (u8 *)("1T"), 2))
+                rate_section = 4;
+        else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("VHT"), 3) &&
+                 _rtl8812ae_eq_n_byte(prf_path, (u8 *)("2T"), 2))
+                rate_section = 5;
+
+        if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("20M"), 3))
+                bandwidth = 0;
+        else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("40M"), 3))
+                bandwidth = 1;
+        else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("80M"), 3))
+                bandwidth = 2;
+        else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("160M"), 4))
+                bandwidth = 3;
+
+        if (_rtl8812ae_eq_n_byte(pband, (u8 *)("2.4G"), 4)) {
+                ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
+                                                               BAND_ON_2_4G,
+                                                               channel);
+
+                if (ret == -1)
+                        return;
+
+                channel_index = ret;
+
+                prev_power_limit = rtlphy->txpwr_limit_2_4g[regulation]
+                                                [bandwidth][rate_section]
+                                                [channel_index][RF90_PATH_A];
+
+                if (power_limit < prev_power_limit)
+                        rtlphy->txpwr_limit_2_4g[regulation][bandwidth]
+                                [rate_section][channel_index][RF90_PATH_A] =
+                                                                   power_limit;
+
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "2.4G [regula %d][bw %d][sec %d][chnl %d][val %d]\n",
+                          regulation, bandwidth, rate_section, channel_index,
+                          rtlphy->txpwr_limit_2_4g[regulation][bandwidth]
+                                [rate_section][channel_index][RF90_PATH_A]);
+        } else if (_rtl8812ae_eq_n_byte(pband, (u8 *)("5G"), 2)) {
+                ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
+                                                               BAND_ON_5G,
+                                                               channel);
+
+                if (ret == -1)
+                        return;
+
+                channel_index = ret;
+
+                prev_power_limit = rtlphy->txpwr_limit_5g[regulation][bandwidth]
+                                                [rate_section][channel_index]
+                                                [RF90_PATH_A];
+
+                if (power_limit < prev_power_limit)
+                        rtlphy->txpwr_limit_5g[regulation][bandwidth]
+                        [rate_section][channel_index][RF90_PATH_A] = power_limit;
+
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "5G: [regul %d][bw %d][sec %d][chnl %d][val %d]\n",
+                          regulation, bandwidth, rate_section, channel,
+                          rtlphy->txpwr_limit_5g[regulation][bandwidth]
+                                [rate_section][channel_index][RF90_PATH_A]);
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                         "Cannot recognize the band info in %s\n", pband);
+                return;
+        }
+}
+
+static void _rtl8812ae_phy_config_bb_txpwr_lmt(struct ieee80211_hw *hw,
+                                          u8 *regulation, u8 *band,
+                                          u8 *bandwidth, u8 *rate_section,
+                                          u8 *rf_path, u8 *channel,
+                                          u8 *power_limit)
+{
+        _rtl8812ae_phy_set_txpower_limit(hw, regulation, band, bandwidth,
+                                         rate_section, rf_path, channel,
+                                         power_limit);
+}
+
+static void _rtl8821ae_phy_read_and_config_txpwr_lmt(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        u32 i = 0;
+        u32 array_len;
+        u8 **array;
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                array_len = RTL8812AE_TXPWR_LMT_ARRAY_LEN;
+                array = RTL8812AE_TXPWR_LMT;
+        } else {
+                array_len = RTL8821AE_TXPWR_LMT_ARRAY_LEN;
+                array = RTL8821AE_TXPWR_LMT;
+        }
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "\n");
+
+        for (i = 0; i < array_len; i += 7) {
+                u8 *regulation = array[i];
+                u8 *band = array[i+1];
+                u8 *bandwidth = array[i+2];
+                u8 *rate = array[i+3];
+                u8 *rf_path = array[i+4];
+                u8 *chnl = array[i+5];
+                u8 *val = array[i+6];
+
+                _rtl8812ae_phy_config_bb_txpwr_lmt(hw, regulation, band,
+                                                   bandwidth, rate, rf_path,
+                                                   chnl, val);
+        }
+}
+
+static bool _rtl8821ae_phy_bb8821a_config_parafile(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));
+        bool rtstatus;
+
+        _rtl8821ae_phy_init_txpower_limit(hw);
+
+        /* RegEnableTxPowerLimit == 1 for 8812a & 8821a */
+        if (rtlefuse->eeprom_regulatory != 2)
+                _rtl8821ae_phy_read_and_config_txpwr_lmt(hw);
+
+        rtstatus = _rtl8821ae_phy_config_bb_with_headerfile(hw,
+                                                       BASEBAND_CONFIG_PHY_REG);
+        if (rtstatus != true) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!");
+                return false;
+        }
+        _rtl8821ae_phy_init_tx_power_by_rate(hw);
+        if (rtlefuse->autoload_failflag == false) {
+                rtstatus = _rtl8821ae_phy_config_bb_with_pgheaderfile(hw,
+                                                    BASEBAND_CONFIG_PHY_REG);
+        }
+        if (rtstatus != true) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!");
+                return false;
+        }
+
+        _rtl8821ae_phy_txpower_by_rate_configuration(hw);
+
+        /* RegEnableTxPowerLimit == 1 for 8812a & 8821a */
+        if (rtlefuse->eeprom_regulatory != 2)
+                _rtl8812ae_phy_convert_txpower_limit_to_power_index(hw);
+
+        rtstatus = _rtl8821ae_phy_config_bb_with_headerfile(hw,
+                                                BASEBAND_CONFIG_AGC_TAB);
+
+        if (rtstatus != true) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
+                return false;
+        }
+        rtlphy->cck_high_power = (bool)(rtl_get_bbreg(hw,
+                        RFPGA0_XA_HSSIPARAMETER2, 0x200));
+        return true;
+}
+
+static bool _rtl8821ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        u32 i, v1, v2;
+        u32 arraylength;
+        u32 *ptrarray;
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read MAC_REG_Array\n");
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                arraylength = RTL8821AEMAC_1T_ARRAYLEN;
+                ptrarray = RTL8821AE_MAC_REG_ARRAY;
+        } else {
+                arraylength = RTL8812AEMAC_1T_ARRAYLEN;
+                ptrarray = RTL8812AE_MAC_REG_ARRAY;
+        }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Img: MAC_REG_ARRAY LEN %d\n", arraylength);
+        for (i = 0; i < arraylength; i += 2) {
+                v1 = ptrarray[i];
+                v2 = (u8)ptrarray[i + 1];
+                if (v1 < 0xCDCDCDCD) {
+                        rtl_write_byte(rtlpriv, v1, (u8)v2);
+                        continue;
+                } else {
+                        if (!_rtl8821ae_check_condition(hw, v1)) {
+                                /*Discard the following (offset, data) pairs*/
+                                READ_NEXT_PAIR(ptrarray, v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylength - 2) {
+                                        READ_NEXT_PAIR(ptrarray, v1, v2, i);
+                                }
+                                i -= 2; /* prevent from for-loop += 2*/
+                        } else {/*Configure matched pairs and skip to end of if-else.*/
+                                READ_NEXT_PAIR(ptrarray, v1, v2, i);
+                                while (v2 != 0xDEAD &&
+                                       v2 != 0xCDEF &&
+                                       v2 != 0xCDCD && i < arraylength - 2) {
+                                        rtl_write_byte(rtlpriv, v1, v2);
+                                        READ_NEXT_PAIR(ptrarray, v1, v2, i);
+                                }
+
+                                while (v2 != 0xDEAD && i < arraylength - 2)
+                                        READ_NEXT_PAIR(ptrarray, v1, v2, i);
+                        }
+                }
+        }
+        return true;
+}
+
+static bool _rtl8821ae_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
+                                                     u8 configtype)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        int i;
+        u32 *array_table;
+        u16 arraylen;
+        u32 v1 = 0, v2 = 0;
+
+        if (configtype == BASEBAND_CONFIG_PHY_REG) {
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        arraylen = RTL8812AEPHY_REG_1TARRAYLEN;
+                        array_table = RTL8812AE_PHY_REG_ARRAY;
+                } else {
+                        arraylen = RTL8821AEPHY_REG_1TARRAYLEN;
+                        array_table = RTL8821AE_PHY_REG_ARRAY;
+                }
+
+                for (i = 0; i < arraylen; i += 2) {
+                        v1 = array_table[i];
+                        v2 = array_table[i + 1];
+                        if (v1 < 0xCDCDCDCD) {
+                                _rtl8821ae_config_bb_reg(hw, v1, v2);
+                                continue;
+                        } else {/*This line is the start line of branch.*/
+                                if (!_rtl8821ae_check_condition(hw, v1)) {
+                                        /*Discard the following (offset, data) pairs*/
+                                        READ_NEXT_PAIR(array_table, v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < arraylen - 2) {
+                                                READ_NEXT_PAIR(array_table, v1,
+                                                                v2, i);
+                                        }
+
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {/*Configure matched pairs and skip to end of if-else.*/
+                                        READ_NEXT_PAIR(array_table, v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < arraylen - 2) {
+                                                _rtl8821ae_config_bb_reg(hw, v1,
+                                                                         v2);
+                                                READ_NEXT_PAIR(array_table, v1,
+                                                               v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD &&
+                                               i < arraylen - 2) {
+                                                READ_NEXT_PAIR(array_table, v1,
+                                                               v2, i);
+                                        }
+                                }
+                        }
+                }
+        } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
+                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        arraylen = RTL8812AEAGCTAB_1TARRAYLEN;
+                        array_table = RTL8812AE_AGC_TAB_ARRAY;
+                } else {
+                        arraylen = RTL8821AEAGCTAB_1TARRAYLEN;
+                        array_table = RTL8821AE_AGC_TAB_ARRAY;
+                }
+
+                for (i = 0; i < arraylen; i = i + 2) {
+                        v1 = array_table[i];
+                        v2 = array_table[i+1];
+                        if (v1 < 0xCDCDCDCD) {
+                                rtl_set_bbreg(hw, v1, MASKDWORD, v2);
+                                udelay(1);
+                                continue;
+                        } else {/*This line is the start line of branch.*/
+                                if (!_rtl8821ae_check_condition(hw, v1)) {
+                                        /*Discard the following (offset, data) pairs*/
+                                        READ_NEXT_PAIR(array_table, v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < arraylen - 2) {
+                                                READ_NEXT_PAIR(array_table, v1,
+                                                                v2, i);
+                                        }
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {/*Configure matched pairs and skip to end of if-else.*/
+                                        READ_NEXT_PAIR(array_table, v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD &&
+                                               i < arraylen - 2) {
+                                                rtl_set_bbreg(hw, v1, MASKDWORD,
+                                                              v2);
+                                                udelay(1);
+                                                READ_NEXT_PAIR(array_table, v1,
+                                                               v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD &&
+                                                i < arraylen - 2) {
+                                                READ_NEXT_PAIR(array_table, v1,
+                                                                v2, i);
+                                        }
+                                }
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                         "The agctab_array_table[0] is %x Rtl818EEPHY_REGArray[1] is %x\n",
+                                          array_table[i],  array_table[i + 1]);
+                        }
+                }
+        }
+        return true;
+}
+
+static u8 _rtl8821ae_get_rate_section_index(u32 regaddr)
+{
+        u8 index = 0;
+        regaddr &= 0xFFF;
+        if (regaddr >= 0xC20 && regaddr <= 0xC4C)
+                index = (u8)((regaddr - 0xC20) / 4);
+        else if (regaddr >= 0xE20 && regaddr <= 0xE4C)
+                index = (u8)((regaddr - 0xE20) / 4);
+        else
+                RT_ASSERT(!COMP_INIT,
+                          "Invalid RegAddr 0x%x\n", regaddr);
+        return index;
+}
+
+static void _rtl8821ae_store_tx_power_by_rate(struct ieee80211_hw *hw,
+                                              u32 band, u32 rfpath,
+                                              u32 txnum, u32 regaddr,
+                                              u32 bitmask, u32 data)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 rate_section = _rtl8821ae_get_rate_section_index(regaddr);
+
+        if (band != BAND_ON_2_4G && band != BAND_ON_5G)
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid Band %d\n", band);
+
+        if (rfpath >= MAX_RF_PATH)
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid RfPath %d\n", rfpath);
+
+        if (txnum >= MAX_RF_PATH)
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid TxNum %d\n", txnum);
+
+        rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section] = data;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "TxPwrByRateOffset[Band %d][RfPath %d][TxNum %d][RateSection %d] = 0x%x\n",
+                 band, rfpath, txnum, rate_section,
+                 rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section]);
+}
+
+static bool _rtl8821ae_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
+                                                        u8 configtype)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        int i;
+        u32 *array;
+        u16 arraylen;
+        u32 v1, v2, v3, v4, v5, v6;
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
+                arraylen = RTL8812AEPHY_REG_ARRAY_PGLEN;
+                array = RTL8812AE_PHY_REG_ARRAY_PG;
+        } else {
+                arraylen = RTL8821AEPHY_REG_ARRAY_PGLEN;
+                array = RTL8821AE_PHY_REG_ARRAY_PG;
+        }
+
+        if (configtype != BASEBAND_CONFIG_PHY_REG) {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "configtype != BaseBand_Config_PHY_REG\n");
+                return true;
+        }
+        for (i = 0; i < arraylen; i += 6) {
+                v1 = array[i];
+                v2 = array[i+1];
+                v3 = array[i+2];
+                v4 = array[i+3];
+                v5 = array[i+4];
+                v6 = array[i+5];
+
+                if (v1 < 0xCDCDCDCD) {
+                        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE &&
+                                (v4 == 0xfe || v4 == 0xffe)) {
+                                msleep(50);
+                                continue;
+                        }
+
+                        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                                if (v4 == 0xfe)
+                                        msleep(50);
+                                else if (v4 == 0xfd)
+                                        mdelay(5);
+                                else if (v4 == 0xfc)
+                                        mdelay(1);
+                                else if (v4 == 0xfb)
+                                        udelay(50);
+                                else if (v4 == 0xfa)
+                                        udelay(5);
+                                else if (v4 == 0xf9)
+                                        udelay(1);
+                        }
+                        _rtl8821ae_store_tx_power_by_rate(hw, v1, v2, v3,
+                                                          v4, v5, v6);
+                        continue;
+                } else {
+                         /*don't need the hw_body*/
+                        if (!_rtl8821ae_check_condition(hw, v1)) {
+                                i += 2; /* skip the pair of expression*/
+                                v1 = array[i];
+                                v2 = array[i+1];
+                                v3 = array[i+2];
+                                while (v2 != 0xDEAD) {
+                                        i += 3;
+                                        v1 = array[i];
+                                        v2 = array[i+1];
+                                        v3 = array[i+2];
+                                }
+                        }
+                }
+        }
+
+        return true;
+}
+
+bool rtl8812ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                             enum radio_path rfpath)
+{
+        int i;
+        bool rtstatus = true;
+        u32 *radioa_array_table_a, *radioa_array_table_b;
+        u16 radioa_arraylen_a, radioa_arraylen_b;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 v1 = 0, v2 = 0;
+
+        radioa_arraylen_a = RTL8812AE_RADIOA_1TARRAYLEN;
+        radioa_array_table_a = RTL8812AE_RADIOA_ARRAY;
+        radioa_arraylen_b = RTL8812AE_RADIOB_1TARRAYLEN;
+        radioa_array_table_b = RTL8812AE_RADIOB_ARRAY;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Radio_A:RTL8821AE_RADIOA_ARRAY %d\n", radioa_arraylen_a);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
+        rtstatus = true;
+        switch (rfpath) {
+        case RF90_PATH_A:
+                for (i = 0; i < radioa_arraylen_a; i = i + 2) {
+                        v1 = radioa_array_table_a[i];
+                        v2 = radioa_array_table_a[i+1];
+                        if (v1 < 0xcdcdcdcd) {
+                                _rtl8821ae_config_rf_radio_a(hw, v1, v2);
+                                continue;
+                        } else{/*This line is the start line of branch.*/
+                                if (!_rtl8821ae_check_condition(hw, v1)) {
+                                        /*Discard the following (offset, data) pairs*/
+                                        READ_NEXT_PAIR(radioa_array_table_a, v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < radioa_arraylen_a-2)
+                                                READ_NEXT_PAIR(radioa_array_table_a, v1, v2, i);
+
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {/*Configure matched pairs and skip to end of if-else.*/
+                                        READ_NEXT_PAIR(radioa_array_table_a, v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < radioa_arraylen_a - 2) {
+                                                _rtl8821ae_config_rf_radio_a(hw, v1, v2);
+                                                READ_NEXT_PAIR(radioa_array_table_a, v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < radioa_arraylen_a-2)
+                                                READ_NEXT_PAIR(radioa_array_table_a, v1, v2, i);
+
+                                }
+                        }
+                }
+                break;
+        case RF90_PATH_B:
+                for (i = 0; i < radioa_arraylen_b; i = i + 2) {
+                        v1 = radioa_array_table_b[i];
+                        v2 = radioa_array_table_b[i+1];
+                        if (v1 < 0xcdcdcdcd) {
+                                _rtl8821ae_config_rf_radio_b(hw, v1, v2);
+                                continue;
+                        } else{/*This line is the start line of branch.*/
+                                if (!_rtl8821ae_check_condition(hw, v1)) {
+                                        /*Discard the following (offset, data) pairs*/
+                                        READ_NEXT_PAIR(radioa_array_table_b, v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < radioa_arraylen_b-2)
+                                                READ_NEXT_PAIR(radioa_array_table_b, v1, v2, i);
+
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {/*Configure matched pairs and skip to end of if-else.*/
+                                        READ_NEXT_PAIR(radioa_array_table_b, v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < radioa_arraylen_b-2) {
+                                                _rtl8821ae_config_rf_radio_b(hw, v1, v2);
+                                                READ_NEXT_PAIR(radioa_array_table_b, v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < radioa_arraylen_b-2)
+                                                READ_NEXT_PAIR(radioa_array_table_b, v1, v2, i);
+                                }
+                        }
+                }
+                break;
+        case RF90_PATH_C:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process\n");
+                break;
+        case RF90_PATH_D:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process\n");
+                break;
+        }
+        return true;
+}
+
+bool rtl8821ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                                enum radio_path rfpath)
+{
+        #define READ_NEXT_RF_PAIR(v1, v2, i) \
+        do { \
+                i += 2; \
+                v1 = radioa_array_table[i]; \
+                v2 = radioa_array_table[i+1]; \
+        } \
+        while (0)
+
+        int i;
+        bool rtstatus = true;
+        u32 *radioa_array_table;
+        u16 radioa_arraylen;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        /* struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); */
+        u32 v1 = 0, v2 = 0;
+
+        radioa_arraylen = RTL8821AE_RADIOA_1TARRAYLEN;
+        radioa_array_table = RTL8821AE_RADIOA_ARRAY;
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Radio_A:RTL8821AE_RADIOA_ARRAY %d\n", radioa_arraylen);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
+        rtstatus = true;
+        switch (rfpath) {
+        case RF90_PATH_A:
+                for (i = 0; i < radioa_arraylen; i = i + 2) {
+                        v1 = radioa_array_table[i];
+                        v2 = radioa_array_table[i+1];
+                        if (v1 < 0xcdcdcdcd)
+                                _rtl8821ae_config_rf_radio_a(hw, v1, v2);
+                        else{/*This line is the start line of branch.*/
+                                if (!_rtl8821ae_check_condition(hw, v1)) {
+                                        /*Discard the following (offset, data) pairs*/
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                                v2 != 0xCDEF &&
+                                                v2 != 0xCDCD && i < radioa_arraylen - 2)
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+
+                                        i -= 2; /* prevent from for-loop += 2*/
+                                } else {/*Configure matched pairs and skip to end of if-else.*/
+                                        READ_NEXT_RF_PAIR(v1, v2, i);
+                                        while (v2 != 0xDEAD &&
+                                               v2 != 0xCDEF &&
+                                               v2 != 0xCDCD && i < radioa_arraylen - 2) {
+                                                _rtl8821ae_config_rf_radio_a(hw, v1, v2);
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                        }
+
+                                        while (v2 != 0xDEAD && i < radioa_arraylen - 2)
+                                                READ_NEXT_RF_PAIR(v1, v2, i);
+                                }
+                        }
+                }
+                break;
+
+        case RF90_PATH_B:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process\n");
+                break;
+        case RF90_PATH_C:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process\n");
+                break;
+        case RF90_PATH_D:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process\n");
+                break;
+        }
+        return true;
+}
+
+void rtl8821ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        rtlphy->default_initialgain[0] =
+            (u8)rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[1] =
+            (u8)rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[2] =
+            (u8)rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
+        rtlphy->default_initialgain[3] =
+            (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+                  rtlphy->default_initialgain[0],
+                  rtlphy->default_initialgain[1],
+                  rtlphy->default_initialgain[2],
+                  rtlphy->default_initialgain[3]);
+
+        rtlphy->framesync = (u8)rtl_get_bbreg(hw,
+                                               ROFDM0_RXDETECTOR3, MASKBYTE0);
+        rtlphy->framesync_c34 = rtl_get_bbreg(hw,
+                                              ROFDM0_RXDETECTOR2, MASKDWORD);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Default framesync (0x%x) = 0x%x\n",
+                  ROFDM0_RXDETECTOR3, rtlphy->framesync);
+}
+
+static void phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfs = RFPGA0_XAB_RFINTERFACESW;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfs = RFPGA0_XAB_RFINTERFACESW;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfo = RFPGA0_XA_RFINTERFACEOE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfo = RFPGA0_XB_RFINTERFACEOE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfintfe = RFPGA0_XA_RFINTERFACEOE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfintfe = RFPGA0_XB_RFINTERFACEOE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf3wire_offset = RA_LSSIWRITE_8821A;
+        rtlphy->phyreg_def[RF90_PATH_B].rf3wire_offset = RB_LSSIWRITE_8821A;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rfhssi_para2 = RHSSIREAD_8821AE;
+        rtlphy->phyreg_def[RF90_PATH_B].rfhssi_para2 = RHSSIREAD_8821AE;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf_rb = RA_SIREAD_8821A;
+        rtlphy->phyreg_def[RF90_PATH_B].rf_rb = RB_SIREAD_8821A;
+
+        rtlphy->phyreg_def[RF90_PATH_A].rf_rbpi = RA_PIREAD_8821A;
+        rtlphy->phyreg_def[RF90_PATH_B].rf_rbpi = RB_PIREAD_8821A;
+}
+
+void rtl8821ae_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 txpwr_level;
+        long txpwr_dbm;
+
+        txpwr_level = rtlphy->cur_cck_txpwridx;
+        txpwr_dbm = _rtl8821ae_phy_txpwr_idx_to_dbm(hw,
+                                                 WIRELESS_MODE_B, txpwr_level);
+        txpwr_level = rtlphy->cur_ofdm24g_txpwridx;
+        if (_rtl8821ae_phy_txpwr_idx_to_dbm(hw,
+                                         WIRELESS_MODE_G,
+                                         txpwr_level) > txpwr_dbm)
+                txpwr_dbm =
+                    _rtl8821ae_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_G,
+                                                 txpwr_level);
+        txpwr_level = rtlphy->cur_ofdm24g_txpwridx;
+        if (_rtl8821ae_phy_txpwr_idx_to_dbm(hw,
+                                         WIRELESS_MODE_N_24G,
+                                         txpwr_level) > txpwr_dbm)
+                txpwr_dbm =
+                    _rtl8821ae_phy_txpwr_idx_to_dbm(hw, WIRELESS_MODE_N_24G,
+                                                 txpwr_level);
+        *powerlevel = txpwr_dbm;
+}
+
+static bool _rtl8821ae_phy_get_chnl_index(u8 channel, u8 *chnl_index)
+{
+        u8 channel_5g[CHANNEL_MAX_NUMBER_5G] = {
+                36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62,
+                64, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118,
+                120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140,
+                142, 144, 149, 151, 153, 155, 157, 159, 161, 163, 165,
+                167, 168, 169, 171, 173, 175, 177
+        };
+        u8 i = 0;
+        bool in_24g = true;
+
+        if (channel <= 14) {
+                in_24g = true;
+                *chnl_index = channel - 1;
+        } else {
+                in_24g = false;
+
+                for (i = 0; i < CHANNEL_MAX_NUMBER_5G; ++i) {
+                        if (channel_5g[i] == channel) {
+                                *chnl_index = i;
+                                return in_24g;
+                        }
+                }
+        }
+        return in_24g;
+}
+
+static char _rtl8821ae_phy_get_ratesection_intxpower_byrate(u8 path, u8 rate)
+{
+        char rate_section = 0;
+        switch (rate) {
+        case DESC_RATE1M:
+        case DESC_RATE2M:
+        case DESC_RATE5_5M:
+        case DESC_RATE11M:
+                rate_section = 0;
+                break;
+        case DESC_RATE6M:
+        case DESC_RATE9M:
+        case DESC_RATE12M:
+        case DESC_RATE18M:
+                rate_section = 1;
+                break;
+        case DESC_RATE24M:
+        case DESC_RATE36M:
+        case DESC_RATE48M:
+        case DESC_RATE54M:
+                rate_section = 2;
+                break;
+        case DESC_RATEMCS0:
+        case DESC_RATEMCS1:
+        case DESC_RATEMCS2:
+        case DESC_RATEMCS3:
+                rate_section = 3;
+                break;
+        case DESC_RATEMCS4:
+        case DESC_RATEMCS5:
+        case DESC_RATEMCS6:
+        case DESC_RATEMCS7:
+                rate_section = 4;
+                break;
+        case DESC_RATEMCS8:
+        case DESC_RATEMCS9:
+        case DESC_RATEMCS10:
+        case DESC_RATEMCS11:
+                rate_section = 5;
+                break;
+        case DESC_RATEMCS12:
+        case DESC_RATEMCS13:
+        case DESC_RATEMCS14:
+        case DESC_RATEMCS15:
+                rate_section = 6;
+                break;
+        case DESC_RATEVHT1SS_MCS0:
+        case DESC_RATEVHT1SS_MCS1:
+        case DESC_RATEVHT1SS_MCS2:
+        case DESC_RATEVHT1SS_MCS3:
+                rate_section = 7;
+                break;
+        case DESC_RATEVHT1SS_MCS4:
+        case DESC_RATEVHT1SS_MCS5:
+        case DESC_RATEVHT1SS_MCS6:
+        case DESC_RATEVHT1SS_MCS7:
+                rate_section = 8;
+                break;
+        case DESC_RATEVHT1SS_MCS8:
+        case DESC_RATEVHT1SS_MCS9:
+        case DESC_RATEVHT2SS_MCS0:
+        case DESC_RATEVHT2SS_MCS1:
+                rate_section = 9;
+                break;
+        case DESC_RATEVHT2SS_MCS2:
+        case DESC_RATEVHT2SS_MCS3:
+        case DESC_RATEVHT2SS_MCS4:
+        case DESC_RATEVHT2SS_MCS5:
+                rate_section = 10;
+                break;
+        case DESC_RATEVHT2SS_MCS6:
+        case DESC_RATEVHT2SS_MCS7:
+        case DESC_RATEVHT2SS_MCS8:
+        case DESC_RATEVHT2SS_MCS9:
+                rate_section = 11;
+                break;
+        default:
+                RT_ASSERT(true, "Rate_Section is Illegal\n");
+                break;
+        }
+
+        return rate_section;
+}
+
+static char _rtl8812ae_phy_get_world_wide_limit(char  *limit_table)
+{
+        char min = limit_table[0];
+        u8 i = 0;
+
+        for (i = 0; i < MAX_REGULATION_NUM; ++i) {
+                if (limit_table[i] < min)
+                        min = limit_table[i];
+        }
+        return min;
+}
+
+static char _rtl8812ae_phy_get_txpower_limit(struct ieee80211_hw *hw,
+                                             u8 band,
+                                             enum ht_channel_width bandwidth,
+                                             enum radio_path rf_path,
+                                             u8 rate, u8 channel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        short band_temp = -1, regulation = -1, bandwidth_temp = -1,
+                 rate_section = -1, channel_temp = -1;
+        u16 bd, regu, bdwidth, sec, chnl;
+        char power_limit = MAX_POWER_INDEX;
+
+        if (rtlefuse->eeprom_regulatory == 2)
+                return MAX_POWER_INDEX;
+
+        regulation = TXPWR_LMT_WW;
+
+        if (band == BAND_ON_2_4G)
+                band_temp = 0;
+        else if (band == BAND_ON_5G)
+                band_temp = 1;
+
+        if (bandwidth == HT_CHANNEL_WIDTH_20)
+                bandwidth_temp = 0;
+        else if (bandwidth == HT_CHANNEL_WIDTH_20_40)
+                bandwidth_temp = 1;
+        else if (bandwidth == HT_CHANNEL_WIDTH_80)
+                bandwidth_temp = 2;
+
+        switch (rate) {
+        case DESC_RATE1M:
+        case DESC_RATE2M:
+        case DESC_RATE5_5M:
+        case DESC_RATE11M:
+                rate_section = 0;
+                break;
+        case DESC_RATE6M:
+        case DESC_RATE9M:
+        case DESC_RATE12M:
+        case DESC_RATE18M:
+        case DESC_RATE24M:
+        case DESC_RATE36M:
+        case DESC_RATE48M:
+        case DESC_RATE54M:
+                rate_section = 1;
+                break;
+        case DESC_RATEMCS0:
+        case DESC_RATEMCS1:
+        case DESC_RATEMCS2:
+        case DESC_RATEMCS3:
+        case DESC_RATEMCS4:
+        case DESC_RATEMCS5:
+        case DESC_RATEMCS6:
+        case DESC_RATEMCS7:
+                rate_section = 2;
+                break;
+        case DESC_RATEMCS8:
+        case DESC_RATEMCS9:
+        case DESC_RATEMCS10:
+        case DESC_RATEMCS11:
+        case DESC_RATEMCS12:
+        case DESC_RATEMCS13:
+        case DESC_RATEMCS14:
+        case DESC_RATEMCS15:
+                rate_section = 3;
+                break;
+        case DESC_RATEVHT1SS_MCS0:
+        case DESC_RATEVHT1SS_MCS1:
+        case DESC_RATEVHT1SS_MCS2:
+        case DESC_RATEVHT1SS_MCS3:
+        case DESC_RATEVHT1SS_MCS4:
+        case DESC_RATEVHT1SS_MCS5:
+        case DESC_RATEVHT1SS_MCS6:
+        case DESC_RATEVHT1SS_MCS7:
+        case DESC_RATEVHT1SS_MCS8:
+        case DESC_RATEVHT1SS_MCS9:
+                rate_section = 4;
+                break;
+        case DESC_RATEVHT2SS_MCS0:
+        case DESC_RATEVHT2SS_MCS1:
+        case DESC_RATEVHT2SS_MCS2:
+        case DESC_RATEVHT2SS_MCS3:
+        case DESC_RATEVHT2SS_MCS4:
+        case DESC_RATEVHT2SS_MCS5:
+        case DESC_RATEVHT2SS_MCS6:
+        case DESC_RATEVHT2SS_MCS7:
+        case DESC_RATEVHT2SS_MCS8:
+        case DESC_RATEVHT2SS_MCS9:
+                rate_section = 5;
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                        "Wrong rate 0x%x\n", rate);
+                break;
+        }
+
+        if (band_temp == BAND_ON_5G  && rate_section == 0)
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "Wrong rate 0x%x: No CCK in 5G Band\n", rate);
+
+        /*workaround for wrong index combination to obtain tx power limit,
+          OFDM only exists in BW 20M*/
+        if (rate_section == 1)
+                bandwidth_temp = 0;
+
+        /*workaround for wrong index combination to obtain tx power limit,
+         *HT on 80M will reference to HT on 40M
+         */
+        if ((rate_section == 2 || rate_section == 3) && band == BAND_ON_5G &&
+            bandwidth_temp == 2)
+                bandwidth_temp = 1;
+
+        if (band == BAND_ON_2_4G)
+                channel_temp = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
+                BAND_ON_2_4G, channel);
+        else if (band == BAND_ON_5G)
+                channel_temp = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
+                BAND_ON_5G, channel);
+        else if (band == BAND_ON_BOTH)
+                ;/* BAND_ON_BOTH don't care temporarily */
+
+        if (band_temp == -1 || regulation == -1 || bandwidth_temp == -1 ||
+                rate_section == -1 || channel_temp == -1) {
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "Wrong index value to access power limit table [band %d][regulation %d][bandwidth %d][rf_path %d][rate_section %d][chnl %d]\n",
+                         band_temp, regulation, bandwidth_temp, rf_path,
+                         rate_section, channel_temp);
+                return MAX_POWER_INDEX;
+        }
+
+        bd = band_temp;
+        regu = regulation;
+        bdwidth = bandwidth_temp;
+        sec = rate_section;
+        chnl = channel_temp;
+
+        if (band == BAND_ON_2_4G) {
+                char limits[10] = {0};
+                u8 i;
+
+                for (i = 0; i < 4; ++i)
+                        limits[i] = rtlphy->txpwr_limit_2_4g[i][bdwidth]
+                        [sec][chnl][rf_path];
+
+                power_limit = (regulation == TXPWR_LMT_WW) ?
+                        _rtl8812ae_phy_get_world_wide_limit(limits) :
+                        rtlphy->txpwr_limit_2_4g[regu][bdwidth]
+                                        [sec][chnl][rf_path];
+        } else if (band == BAND_ON_5G) {
+                char limits[10] = {0};
+                u8 i;
+
+                for (i = 0; i < MAX_REGULATION_NUM; ++i)
+                        limits[i] = rtlphy->txpwr_limit_5g[i][bdwidth]
+                        [sec][chnl][rf_path];
+
+                power_limit = (regulation == TXPWR_LMT_WW) ?
+                        _rtl8812ae_phy_get_world_wide_limit(limits) :
+                        rtlphy->txpwr_limit_5g[regu][chnl]
+                        [sec][chnl][rf_path];
+        } else {
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                         "No power limit table of the specified band\n");
+        }
+        return power_limit;
+}
+
+static char _rtl8821ae_phy_get_txpower_by_rate(struct ieee80211_hw *hw,
+                                        u8 band, u8 path, u8 rate)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 shift = 0, rate_section, tx_num;
+        char tx_pwr_diff = 0;
+        char limit = 0;
+
+        rate_section = _rtl8821ae_phy_get_ratesection_intxpower_byrate(path, rate);
+        tx_num = RF_TX_NUM_NONIMPLEMENT;
+
+        if (tx_num == RF_TX_NUM_NONIMPLEMENT) {
+                if ((rate >= DESC_RATEMCS8 && rate <= DESC_RATEMCS15) ||
+                        (rate >= DESC_RATEVHT2SS_MCS2 && rate <= DESC_RATEVHT2SS_MCS9))
+                        tx_num = RF_2TX;
+                else
+                        tx_num = RF_1TX;
+        }
+
+        switch (rate) {
+        case DESC_RATE1M:
+        case DESC_RATE6M:
+        case DESC_RATE24M:
+        case DESC_RATEMCS0:
+        case DESC_RATEMCS4:
+        case DESC_RATEMCS8:
+        case DESC_RATEMCS12:
+        case DESC_RATEVHT1SS_MCS0:
+        case DESC_RATEVHT1SS_MCS4:
+        case DESC_RATEVHT1SS_MCS8:
+        case DESC_RATEVHT2SS_MCS2:
+        case DESC_RATEVHT2SS_MCS6:
+                shift = 0;
+                break;
+        case DESC_RATE2M:
+        case DESC_RATE9M:
+        case DESC_RATE36M:
+        case DESC_RATEMCS1:
+        case DESC_RATEMCS5:
+        case DESC_RATEMCS9:
+        case DESC_RATEMCS13:
+        case DESC_RATEVHT1SS_MCS1:
+        case DESC_RATEVHT1SS_MCS5:
+        case DESC_RATEVHT1SS_MCS9:
+        case DESC_RATEVHT2SS_MCS3:
+        case DESC_RATEVHT2SS_MCS7:
+                shift = 8;
+                break;
+        case DESC_RATE5_5M:
+        case DESC_RATE12M:
+        case DESC_RATE48M:
+        case DESC_RATEMCS2:
+        case DESC_RATEMCS6:
+        case DESC_RATEMCS10:
+        case DESC_RATEMCS14:
+        case DESC_RATEVHT1SS_MCS2:
+        case DESC_RATEVHT1SS_MCS6:
+        case DESC_RATEVHT2SS_MCS0:
+        case DESC_RATEVHT2SS_MCS4:
+        case DESC_RATEVHT2SS_MCS8:
+                shift = 16;
+                break;
+        case DESC_RATE11M:
+        case DESC_RATE18M:
+        case DESC_RATE54M:
+        case DESC_RATEMCS3:
+        case DESC_RATEMCS7:
+        case DESC_RATEMCS11:
+        case DESC_RATEMCS15:
+        case DESC_RATEVHT1SS_MCS3:
+        case DESC_RATEVHT1SS_MCS7:
+        case DESC_RATEVHT2SS_MCS1:
+        case DESC_RATEVHT2SS_MCS5:
+        case DESC_RATEVHT2SS_MCS9:
+                shift = 24;
+                break;
+        default:
+                RT_ASSERT(true, "Rate_Section is Illegal\n");
+                break;
+        }
+
+        tx_pwr_diff = (u8)(rtlphy->tx_power_by_rate_offset[band][path]
+                [tx_num][rate_section] >> shift) & 0xff;
+
+        /* RegEnableTxPowerLimit == 1 for 8812a & 8821a */
+        if (rtlpriv->efuse.eeprom_regulatory != 2) {
+                limit = _rtl8812ae_phy_get_txpower_limit(hw, band,
+                        rtlphy->current_chan_bw, path, rate,
+                        rtlphy->current_channel);
+
+                if (rate == DESC_RATEVHT1SS_MCS8 || rate == DESC_RATEVHT1SS_MCS9  ||
+                         rate == DESC_RATEVHT2SS_MCS8 || rate == DESC_RATEVHT2SS_MCS9) {
+                        if (limit < 0) {
+                                if (tx_pwr_diff < (-limit))
+                                        tx_pwr_diff = -limit;
+                        }
+                } else {
+                        if (limit < 0)
+                                tx_pwr_diff = limit;
+                        else
+                                tx_pwr_diff = tx_pwr_diff > limit ? limit : tx_pwr_diff;
+                }
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                        "Maximum power by rate %d, final power by rate %d\n",
+                        limit, tx_pwr_diff);
+        }
+
+        return  tx_pwr_diff;
+}
+
+static u8 _rtl8821ae_get_txpower_index(struct ieee80211_hw *hw, u8 path,
+                                        u8 rate, u8 bandwidth, u8 channel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u8 index = (channel - 1);
+        u8 txpower = 0;
+        bool in_24g = false;
+        char powerdiff_byrate = 0;
+
+        if (((rtlhal->current_bandtype == BAND_ON_2_4G) &&
+            (channel > 14 || channel < 1)) ||
+            ((rtlhal->current_bandtype == BAND_ON_5G) && (channel <= 14))) {
+                index = 0;
+                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                        "Illegal channel!!\n");
+        }
+
+        in_24g = _rtl8821ae_phy_get_chnl_index(channel, &index);
+        if (in_24g) {
+                if (RTL8821AE_RX_HAL_IS_CCK_RATE(rate))
+                        txpower = rtlefuse->txpwrlevel_cck[path][index];
+                else if (DESC_RATE6M <= rate)
+                        txpower = rtlefuse->txpwrlevel_ht40_1s[path][index];
+                else
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "invalid rate\n");
+
+                if (DESC_RATE6M <= rate && rate <= DESC_RATE54M &&
+                    !RTL8821AE_RX_HAL_IS_CCK_RATE(rate))
+                        txpower += rtlefuse->txpwr_legacyhtdiff[path][TX_1S];
+
+                if (bandwidth == HT_CHANNEL_WIDTH_20) {
+                        if ((DESC_RATEMCS0 <= rate && rate <= DESC_RATEMCS15) ||
+                                (DESC_RATEVHT1SS_MCS0 <= rate && rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_ht20diff[path][TX_1S];
+                        if ((DESC_RATEMCS8 <= rate && rate <= DESC_RATEMCS15) ||
+                                (DESC_RATEVHT2SS_MCS0 <= rate && rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_ht20diff[path][TX_2S];
+                } else if (bandwidth == HT_CHANNEL_WIDTH_20_40) {
+                        if ((DESC_RATEMCS0 <= rate && rate <= DESC_RATEMCS15) ||
+                                (DESC_RATEVHT1SS_MCS0 <= rate && rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_ht40diff[path][TX_1S];
+                        if ((DESC_RATEMCS8 <= rate && rate <= DESC_RATEMCS15) ||
+                                (DESC_RATEVHT2SS_MCS0 <= rate && rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_ht40diff[path][TX_2S];
+                } else if (bandwidth == HT_CHANNEL_WIDTH_80) {
+                        if ((DESC_RATEMCS0 <= rate && rate <= DESC_RATEMCS15) ||
+                            (DESC_RATEVHT1SS_MCS0 <= rate &&
+                             rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_ht40diff[path][TX_1S];
+                        if ((DESC_RATEMCS8 <= rate && rate <= DESC_RATEMCS15) ||
+                            (DESC_RATEVHT2SS_MCS0 <= rate &&
+                             rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_ht40diff[path][TX_2S];
+                }
+        } else {
+                if (DESC_RATE6M <= rate)
+                        txpower = rtlefuse->txpwr_5g_bw40base[path][index];
+                else
+                        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_WARNING,
+                                 "INVALID Rate.\n");
+
+                if (DESC_RATE6M <= rate && rate <= DESC_RATE54M &&
+                    !RTL8821AE_RX_HAL_IS_CCK_RATE(rate))
+                        txpower += rtlefuse->txpwr_5g_ofdmdiff[path][TX_1S];
+
+                if (bandwidth == HT_CHANNEL_WIDTH_20) {
+                        if ((DESC_RATEMCS0 <= rate && rate <= DESC_RATEMCS15) ||
+                            (DESC_RATEVHT1SS_MCS0 <= rate &&
+                             rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_5g_bw20diff[path][TX_1S];
+                        if ((DESC_RATEMCS8 <= rate && rate <= DESC_RATEMCS15) ||
+                            (DESC_RATEVHT2SS_MCS0 <= rate &&
+                             rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_5g_bw20diff[path][TX_2S];
+                } else if (bandwidth == HT_CHANNEL_WIDTH_20_40) {
+                        if ((DESC_RATEMCS0 <= rate && rate <= DESC_RATEMCS15) ||
+                            (DESC_RATEVHT1SS_MCS0 <= rate &&
+                             rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_5g_bw40diff[path][TX_1S];
+                        if ((DESC_RATEMCS8 <= rate && rate <= DESC_RATEMCS15) ||
+                            (DESC_RATEVHT2SS_MCS0 <= rate &&
+                             rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower += rtlefuse->txpwr_5g_bw40diff[path][TX_2S];
+                } else if (bandwidth == HT_CHANNEL_WIDTH_80) {
+                        u8 channel_5g_80m[CHANNEL_MAX_NUMBER_5G_80M] = {
+                                42, 58, 106, 122, 138, 155, 171
+                        };
+                        u8 i;
+
+                        for (i = 0; i < sizeof(channel_5g_80m) / sizeof(u8); ++i)
+                                if (channel_5g_80m[i] == channel)
+                                        index = i;
+
+                        if ((DESC_RATEMCS0 <= rate && rate <= DESC_RATEMCS15) ||
+                            (DESC_RATEVHT1SS_MCS0 <= rate &&
+                             rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower = rtlefuse->txpwr_5g_bw80base[path][index]
+                                        + rtlefuse->txpwr_5g_bw80diff[path][TX_1S];
+                        if ((DESC_RATEMCS8 <= rate && rate <= DESC_RATEMCS15) ||
+                            (DESC_RATEVHT2SS_MCS0 <= rate &&
+                             rate <= DESC_RATEVHT2SS_MCS9))
+                                txpower = rtlefuse->txpwr_5g_bw80base[path][index]
+                                        + rtlefuse->txpwr_5g_bw80diff[path][TX_1S]
+                                        + rtlefuse->txpwr_5g_bw80diff[path][TX_2S];
+                    }
+        }
+        if (rtlefuse->eeprom_regulatory != 2)
+                powerdiff_byrate =
+                  _rtl8821ae_phy_get_txpower_by_rate(hw, (u8)(!in_24g),
+                                                     path, rate);
+
+        if (rate == DESC_RATEVHT1SS_MCS8 || rate == DESC_RATEVHT1SS_MCS9 ||
+            rate == DESC_RATEVHT2SS_MCS8 || rate == DESC_RATEVHT2SS_MCS9)
+                txpower -= powerdiff_byrate;
+        else
+                txpower += powerdiff_byrate;
+
+        if (rate > DESC_RATE11M)
+                txpower += rtlpriv->dm.remnant_ofdm_swing_idx[path];
+        else
+                txpower += rtlpriv->dm.remnant_cck_idx;
+
+        if (txpower > MAX_POWER_INDEX)
+                txpower = MAX_POWER_INDEX;
+
+        return txpower;
+}
+
+static void _rtl8821ae_phy_set_txpower_index(struct ieee80211_hw *hw,
+                                             u8 power_index, u8 path, u8 rate)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (path == RF90_PATH_A) {
+                switch (rate) {
+                case DESC_RATE1M:
+                        rtl_set_bbreg(hw, RTXAGC_A_CCK11_CCK1,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATE2M:
+                        rtl_set_bbreg(hw, RTXAGC_A_CCK11_CCK1,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATE5_5M:
+                        rtl_set_bbreg(hw, RTXAGC_A_CCK11_CCK1,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATE11M:
+                        rtl_set_bbreg(hw, RTXAGC_A_CCK11_CCK1,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATE6M:
+                        rtl_set_bbreg(hw, RTXAGC_A_OFDM18_OFDM6,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATE9M:
+                        rtl_set_bbreg(hw, RTXAGC_A_OFDM18_OFDM6,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATE12M:
+                        rtl_set_bbreg(hw, RTXAGC_A_OFDM18_OFDM6,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATE18M:
+                        rtl_set_bbreg(hw, RTXAGC_A_OFDM18_OFDM6,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATE24M:
+                        rtl_set_bbreg(hw, RTXAGC_A_OFDM54_OFDM24,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATE36M:
+                        rtl_set_bbreg(hw, RTXAGC_A_OFDM54_OFDM24,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATE48M:
+                        rtl_set_bbreg(hw, RTXAGC_A_OFDM54_OFDM24,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATE54M:
+                        rtl_set_bbreg(hw, RTXAGC_A_OFDM54_OFDM24,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEMCS0:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS03_MCS00,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEMCS1:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS03_MCS00,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEMCS2:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS03_MCS00,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEMCS3:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS03_MCS00,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEMCS4:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS07_MCS04,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEMCS5:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS07_MCS04,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEMCS6:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS07_MCS04,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEMCS7:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS07_MCS04,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEMCS8:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS11_MCS08,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEMCS9:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS11_MCS08,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEMCS10:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS11_MCS08,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEMCS11:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS11_MCS08,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEMCS12:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS15_MCS12,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEMCS13:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS15_MCS12,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEMCS14:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS15_MCS12,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEMCS15:
+                        rtl_set_bbreg(hw, RTXAGC_A_MCS15_MCS12,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS0:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS1INDEX3_NSS1INDEX0,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS1:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS1INDEX3_NSS1INDEX0,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS2:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS1INDEX3_NSS1INDEX0,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS3:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS1INDEX3_NSS1INDEX0,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS4:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS1INDEX7_NSS1INDEX4,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS5:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS1INDEX7_NSS1INDEX4,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS6:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS1INDEX7_NSS1INDEX4,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS7:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS1INDEX7_NSS1INDEX4,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS8:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX1_NSS1INDEX8,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS9:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX1_NSS1INDEX8,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS0:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX1_NSS1INDEX8,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS1:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX1_NSS1INDEX8,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS2:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX5_NSS2INDEX2,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS3:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX5_NSS2INDEX2,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS4:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX5_NSS2INDEX2,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS5:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX5_NSS2INDEX2,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS6:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX9_NSS2INDEX6,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS7:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX9_NSS2INDEX6,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS8:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX9_NSS2INDEX6,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS9:
+                        rtl_set_bbreg(hw, RTXAGC_A_NSS2INDEX9_NSS2INDEX6,
+                                      MASKBYTE3, power_index);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                "Invalid Rate!!\n");
+                        break;
+                }
+        } else if (path == RF90_PATH_B) {
+                switch (rate) {
+                case DESC_RATE1M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK11_CCK1,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATE2M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK11_CCK1,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATE5_5M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK11_CCK1,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATE11M:
+                        rtl_set_bbreg(hw, RTXAGC_B_CCK11_CCK1,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATE6M:
+                        rtl_set_bbreg(hw, RTXAGC_B_OFDM18_OFDM6,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATE9M:
+                        rtl_set_bbreg(hw, RTXAGC_B_OFDM18_OFDM6,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATE12M:
+                        rtl_set_bbreg(hw, RTXAGC_B_OFDM18_OFDM6,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATE18M:
+                        rtl_set_bbreg(hw, RTXAGC_B_OFDM18_OFDM6,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATE24M:
+                        rtl_set_bbreg(hw, RTXAGC_B_OFDM54_OFDM24,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATE36M:
+                        rtl_set_bbreg(hw, RTXAGC_B_OFDM54_OFDM24,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATE48M:
+                        rtl_set_bbreg(hw, RTXAGC_B_OFDM54_OFDM24,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATE54M:
+                        rtl_set_bbreg(hw, RTXAGC_B_OFDM54_OFDM24,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEMCS0:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS03_MCS00,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEMCS1:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS03_MCS00,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEMCS2:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS03_MCS00,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEMCS3:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS03_MCS00,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEMCS4:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS07_MCS04,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEMCS5:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS07_MCS04,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEMCS6:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS07_MCS04,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEMCS7:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS07_MCS04,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEMCS8:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS11_MCS08,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEMCS9:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS11_MCS08,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEMCS10:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS11_MCS08,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEMCS11:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS11_MCS08,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEMCS12:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS15_MCS12,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEMCS13:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS15_MCS12,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEMCS14:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS15_MCS12,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEMCS15:
+                        rtl_set_bbreg(hw, RTXAGC_B_MCS15_MCS12,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS0:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS1INDEX3_NSS1INDEX0,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS1:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS1INDEX3_NSS1INDEX0,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS2:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS1INDEX3_NSS1INDEX0,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS3:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS1INDEX3_NSS1INDEX0,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS4:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS1INDEX7_NSS1INDEX4,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS5:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS1INDEX7_NSS1INDEX4,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS6:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS1INDEX7_NSS1INDEX4,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS7:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS1INDEX7_NSS1INDEX4,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS8:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX1_NSS1INDEX8,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT1SS_MCS9:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX1_NSS1INDEX8,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS0:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX1_NSS1INDEX8,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS1:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX1_NSS1INDEX8,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS2:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX5_NSS2INDEX2,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS3:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX5_NSS2INDEX2,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS4:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX5_NSS2INDEX2,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS5:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX5_NSS2INDEX2,
+                                      MASKBYTE3, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS6:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX9_NSS2INDEX6,
+                                      MASKBYTE0, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS7:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX9_NSS2INDEX6,
+                                      MASKBYTE1, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS8:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX9_NSS2INDEX6,
+                                      MASKBYTE2, power_index);
+                        break;
+                case DESC_RATEVHT2SS_MCS9:
+                        rtl_set_bbreg(hw, RTXAGC_B_NSS2INDEX9_NSS2INDEX6,
+                                      MASKBYTE3, power_index);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                                 "Invalid Rate!!\n");
+                        break;
+                }
+        } else {
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "Invalid RFPath!!\n");
+        }
+}
+
+static void _rtl8821ae_phy_set_txpower_level_by_path(struct ieee80211_hw *hw,
+                                                     u8 *array, u8 path,
+                                                     u8 channel, u8 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 i;
+        u8 power_index;
+
+        for (i = 0; i < size; i++) {
+                power_index =
+                  _rtl8821ae_get_txpower_index(hw, path, array[i],
+                                               rtlphy->current_chan_bw,
+                                               channel);
+                _rtl8821ae_phy_set_txpower_index(hw, power_index, path,
+                                                 array[i]);
+        }
+}
+
+static void _rtl8821ae_phy_txpower_training_by_path(struct ieee80211_hw *hw,
+                                                    u8 bw, u8 channel, u8 path)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        u8 i;
+        u32 power_level, data, offset;
+
+        if (path >= rtlphy->num_total_rfpath)
+                return;
+
+        data = 0;
+        if (path == RF90_PATH_A) {
+                power_level =
+                        _rtl8821ae_get_txpower_index(hw, RF90_PATH_A,
+                        DESC_RATEMCS7, bw, channel);
+                offset =  RA_TXPWRTRAING;
+        } else {
+                power_level =
+                        _rtl8821ae_get_txpower_index(hw, RF90_PATH_B,
+                        DESC_RATEMCS7, bw, channel);
+                offset =  RB_TXPWRTRAING;
+        }
+
+        for (i = 0; i < 3; i++) {
+                if (i == 0)
+                        power_level = power_level - 10;
+                else if (i == 1)
+                        power_level = power_level - 8;
+                else
+                        power_level = power_level - 6;
+
+                data |= (((power_level > 2) ? (power_level) : 2) << (i * 8));
+        }
+        rtl_set_bbreg(hw, offset, 0xffffff, data);
+}
+
+void rtl8821ae_phy_set_txpower_level_by_path(struct ieee80211_hw *hw,
+                                             u8 channel, u8 path)
+{
+        /* struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); */
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 cck_rates[]  = {DESC_RATE1M, DESC_RATE2M, DESC_RATE5_5M,
+                              DESC_RATE11M};
+        u8 sizes_of_cck_retes = 4;
+        u8 ofdm_rates[]  = {DESC_RATE6M, DESC_RATE9M, DESC_RATE12M,
+                                DESC_RATE18M, DESC_RATE24M, DESC_RATE36M,
+                                DESC_RATE48M, DESC_RATE54M};
+        u8 sizes_of_ofdm_retes = 8;
+        u8 ht_rates_1t[]  = {DESC_RATEMCS0, DESC_RATEMCS1, DESC_RATEMCS2,
+                                DESC_RATEMCS3, DESC_RATEMCS4, DESC_RATEMCS5,
+                                DESC_RATEMCS6, DESC_RATEMCS7};
+        u8 sizes_of_ht_retes_1t = 8;
+        u8 ht_rates_2t[]  = {DESC_RATEMCS8, DESC_RATEMCS9,
+                                DESC_RATEMCS10, DESC_RATEMCS11,
+                                DESC_RATEMCS12, DESC_RATEMCS13,
+                                DESC_RATEMCS14, DESC_RATEMCS15};
+        u8 sizes_of_ht_retes_2t = 8;
+        u8 vht_rates_1t[]  = {DESC_RATEVHT1SS_MCS0, DESC_RATEVHT1SS_MCS1,
+                                DESC_RATEVHT1SS_MCS2, DESC_RATEVHT1SS_MCS3,
+                                DESC_RATEVHT1SS_MCS4, DESC_RATEVHT1SS_MCS5,
+                                DESC_RATEVHT1SS_MCS6, DESC_RATEVHT1SS_MCS7,
+                             DESC_RATEVHT1SS_MCS8, DESC_RATEVHT1SS_MCS9};
+        u8 vht_rates_2t[]  = {DESC_RATEVHT2SS_MCS0, DESC_RATEVHT2SS_MCS1,
+                                DESC_RATEVHT2SS_MCS2, DESC_RATEVHT2SS_MCS3,
+                                DESC_RATEVHT2SS_MCS4, DESC_RATEVHT2SS_MCS5,
+                                DESC_RATEVHT2SS_MCS6, DESC_RATEVHT2SS_MCS7,
+                                DESC_RATEVHT2SS_MCS8, DESC_RATEVHT2SS_MCS9};
+        u8 sizes_of_vht_retes = 10;
+
+        if (rtlhal->current_bandtype == BAND_ON_2_4G)
+                _rtl8821ae_phy_set_txpower_level_by_path(hw, cck_rates, path, channel,
+                                                         sizes_of_cck_retes);
+
+        _rtl8821ae_phy_set_txpower_level_by_path(hw, ofdm_rates, path, channel,
+                                                 sizes_of_ofdm_retes);
+        _rtl8821ae_phy_set_txpower_level_by_path(hw, ht_rates_1t, path, channel,
+                                                 sizes_of_ht_retes_1t);
+        _rtl8821ae_phy_set_txpower_level_by_path(hw, vht_rates_1t, path, channel,
+                                                 sizes_of_vht_retes);
+
+        if (rtlphy->num_total_rfpath >= 2) {
+                _rtl8821ae_phy_set_txpower_level_by_path(hw, ht_rates_2t, path,
+                                                         channel,
+                                                         sizes_of_ht_retes_2t);
+                _rtl8821ae_phy_set_txpower_level_by_path(hw, vht_rates_2t, path,
+                                                         channel,
+                                                         sizes_of_vht_retes);
+        }
+
+        _rtl8821ae_phy_txpower_training_by_path(hw, rtlphy->current_chan_bw,
+                                                channel, path);
+}
+
+/*just in case, write txpower in DW, to reduce time*/
+void rtl8821ae_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 path = 0;
+
+        for (path = RF90_PATH_A; path < rtlphy->num_total_rfpath; ++path)
+                rtl8821ae_phy_set_txpower_level_by_path(hw, channel, path);
+}
+
+static long _rtl8821ae_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
+                                            enum wireless_mode wirelessmode,
+                                            u8 txpwridx)
+{
+        long offset;
+        long pwrout_dbm;
+
+        switch (wirelessmode) {
+        case WIRELESS_MODE_B:
+                offset = -7;
+                break;
+        case WIRELESS_MODE_G:
+        case WIRELESS_MODE_N_24G:
+                offset = -8;
+                break;
+        default:
+                offset = -8;
+                break;
+        }
+        pwrout_dbm = txpwridx / 2 + offset;
+        return pwrout_dbm;
+}
+
+void rtl8821ae_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        enum io_type iotype = IO_CMD_PAUSE_BAND0_DM_BY_SCAN;
+
+        if (!is_hal_stop(rtlhal)) {
+                switch (operation) {
+                case SCAN_OPT_BACKUP_BAND0:
+                        iotype = IO_CMD_PAUSE_BAND0_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+
+                        break;
+                case SCAN_OPT_BACKUP_BAND1:
+                        iotype = IO_CMD_PAUSE_BAND1_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+
+                        break;
+                case SCAN_OPT_RESTORE:
+                        iotype = IO_CMD_RESUME_DM_BY_SCAN;
+                        rtlpriv->cfg->ops->set_hw_reg(hw,
+                                                      HW_VAR_IO_CMD,
+                                                      (u8 *)&iotype);
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "Unknown Scan Backup operation.\n");
+                        break;
+                }
+        }
+}
+
+static void _rtl8821ae_phy_set_reg_bw(struct rtl_priv *rtlpriv, u8 bw)
+{
+        u16 reg_rf_mode_bw, tmp = 0;
+
+        reg_rf_mode_bw = rtl_read_word(rtlpriv, REG_TRXPTCL_CTL);
+        switch (bw) {
+        case HT_CHANNEL_WIDTH_20:
+                rtl_write_word(rtlpriv, REG_TRXPTCL_CTL, reg_rf_mode_bw & 0xFE7F);
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                tmp = reg_rf_mode_bw | BIT(7);
+                rtl_write_word(rtlpriv, REG_TRXPTCL_CTL, tmp & 0xFEFF);
+                break;
+        case HT_CHANNEL_WIDTH_80:
+                tmp = reg_rf_mode_bw | BIT(8);
+                rtl_write_word(rtlpriv, REG_TRXPTCL_CTL, tmp & 0xFF7F);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "unknown Bandwidth: 0x%x\n", bw);
+                break;
+        }
+}
+
+static u8 _rtl8821ae_phy_get_secondary_chnl(struct rtl_priv *rtlpriv)
+{
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_mac *mac = rtl_mac(rtlpriv);
+        u8 sc_set_40 = 0, sc_set_20 = 0;
+
+        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80) {
+                if (mac->cur_80_prime_sc == PRIME_CHNL_OFFSET_LOWER)
+                        sc_set_40 = VHT_DATA_SC_40_LOWER_OF_80MHZ;
+                else if (mac->cur_80_prime_sc == PRIME_CHNL_OFFSET_UPPER)
+                        sc_set_40 = VHT_DATA_SC_40_UPPER_OF_80MHZ;
+                else
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                "SCMapping: Not Correct Primary40MHz Setting\n");
+
+                if ((mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_LOWER) &&
+                        (mac->cur_80_prime_sc == HAL_PRIME_CHNL_OFFSET_LOWER))
+                        sc_set_20 = VHT_DATA_SC_20_LOWEST_OF_80MHZ;
+                else if ((mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_UPPER) &&
+                        (mac->cur_80_prime_sc == HAL_PRIME_CHNL_OFFSET_LOWER))
+                        sc_set_20 = VHT_DATA_SC_20_LOWER_OF_80MHZ;
+                else if ((mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_LOWER) &&
+                        (mac->cur_80_prime_sc == HAL_PRIME_CHNL_OFFSET_UPPER))
+                        sc_set_20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;
+                else if ((mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_UPPER) &&
+                        (mac->cur_80_prime_sc == HAL_PRIME_CHNL_OFFSET_UPPER))
+                        sc_set_20 = VHT_DATA_SC_20_UPPERST_OF_80MHZ;
+                else
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                "SCMapping: Not Correct Primary40MHz Setting\n");
+        } else if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
+                if (mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_UPPER)
+                        sc_set_20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;
+                else if (mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_LOWER)
+                        sc_set_20 = VHT_DATA_SC_20_LOWER_OF_80MHZ;
+                else
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "SCMapping: Not Correct Primary40MHz Setting\n");
+        }
+        return (sc_set_40 << 4) | sc_set_20;
+}
+
+void rtl8821ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 sub_chnl = 0;
+        u8 l1pk_val = 0;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
+                 "Switch to %s bandwidth\n",
+                  (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                  "20MHz" :
+                  (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40 ?
+                  "40MHz" : "80MHz")));
+
+        _rtl8821ae_phy_set_reg_bw(rtlpriv, rtlphy->current_chan_bw);
+        sub_chnl = _rtl8821ae_phy_get_secondary_chnl(rtlpriv);
+        rtl_write_byte(rtlpriv, 0x0483, sub_chnl);
+
+        switch (rtlphy->current_chan_bw) {
+        case HT_CHANNEL_WIDTH_20:
+                rtl_set_bbreg(hw, RRFMOD, 0x003003C3, 0x00300200);
+                rtl_set_bbreg(hw, RADC_BUF_CLK, BIT(30), 0);
+
+                if (rtlphy->rf_type == RF_2T2R)
+                        rtl_set_bbreg(hw, RL1PEAKTH, 0x03C00000, 7);
+                else
+                        rtl_set_bbreg(hw, RL1PEAKTH, 0x03C00000, 8);
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                rtl_set_bbreg(hw, RRFMOD, 0x003003C3, 0x00300201);
+                rtl_set_bbreg(hw, RADC_BUF_CLK, BIT(30), 0);
+                rtl_set_bbreg(hw, RRFMOD, 0x3C, sub_chnl);
+                rtl_set_bbreg(hw, RCCAONSEC, 0xf0000000, sub_chnl);
+
+                if (rtlphy->reg_837 & BIT(2))
+                        l1pk_val = 6;
+                else {
+                        if (rtlphy->rf_type == RF_2T2R)
+                                l1pk_val = 7;
+                        else
+                                l1pk_val = 8;
+                }
+                /* 0x848[25:22] = 0x6 */
+                rtl_set_bbreg(hw, RL1PEAKTH, 0x03C00000, l1pk_val);
+
+                if (sub_chnl == VHT_DATA_SC_20_UPPER_OF_80MHZ)
+                        rtl_set_bbreg(hw, RCCK_SYSTEM, BCCK_SYSTEM, 1);
+                else
+                        rtl_set_bbreg(hw, RCCK_SYSTEM, BCCK_SYSTEM, 0);
+                break;
+
+        case HT_CHANNEL_WIDTH_80:
+                 /* 0x8ac[21,20,9:6,1,0]=8'b11100010 */
+                rtl_set_bbreg(hw, RRFMOD, 0x003003C3, 0x00300202);
+                /* 0x8c4[30] = 1 */
+                rtl_set_bbreg(hw, RADC_BUF_CLK, BIT(30), 1);
+                rtl_set_bbreg(hw, RRFMOD, 0x3C, sub_chnl);
+                rtl_set_bbreg(hw, RCCAONSEC, 0xf0000000, sub_chnl);
+
+                if (rtlphy->reg_837 & BIT(2))
+                        l1pk_val = 5;
+                else {
+                        if (rtlphy->rf_type == RF_2T2R)
+                                l1pk_val = 6;
+                        else
+                                l1pk_val = 7;
+                }
+                rtl_set_bbreg(hw, RL1PEAKTH, 0x03C00000, l1pk_val);
+
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
+                break;
+        }
+
+        rtl8812ae_fixspur(hw, rtlphy->current_chan_bw, rtlphy->current_channel);
+
+        rtl8821ae_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
+        rtlphy->set_bwmode_inprogress = false;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
+}
+
+void rtl8821ae_phy_set_bw_mode(struct ieee80211_hw *hw,
+                            enum nl80211_channel_type ch_type)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 tmp_bw = rtlphy->current_chan_bw;
+
+        if (rtlphy->set_bwmode_inprogress)
+                return;
+        rtlphy->set_bwmode_inprogress = true;
+        if ((!is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw)))
+                rtl8821ae_phy_set_bw_mode_callback(hw);
+        else {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "FALSE driver sleep or unload\n");
+                rtlphy->set_bwmode_inprogress = false;
+                rtlphy->current_chan_bw = tmp_bw;
+        }
+}
+
+void rtl8821ae_phy_sw_chnl_callback(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 channel = rtlphy->current_channel;
+        u8 path;
+        u32 data;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
+                 "switch to channel%d\n", rtlphy->current_channel);
+        if (is_hal_stop(rtlhal))
+                return;
+
+        if (36 <= channel && channel <= 48)
+                data = 0x494;
+        else if (50 <= channel && channel <= 64)
+                data = 0x453;
+        else if (100 <= channel && channel <= 116)
+                data = 0x452;
+        else if (118 <= channel)
+                data = 0x412;
+        else
+                data = 0x96a;
+        rtl_set_bbreg(hw, RFC_AREA, 0x1ffe0000, data);
+
+        for (path = RF90_PATH_A; path < rtlphy->num_total_rfpath; path++) {
+                if (36 <= channel && channel <= 64)
+                        data = 0x101;
+                else if (100 <= channel && channel <= 140)
+                        data = 0x301;
+                else if (140 < channel)
+                        data = 0x501;
+                else
+                        data = 0x000;
+                rtl8821ae_phy_set_rf_reg(hw, path, RF_CHNLBW,
+                        BIT(18)|BIT(17)|BIT(16)|BIT(9)|BIT(8), data);
+
+                rtl8821ae_phy_set_rf_reg(hw, path, RF_CHNLBW,
+                        BMASKBYTE0, channel);
+
+                if (channel > 14) {
+                        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
+                                if (36 <= channel && channel <= 64)
+                                        data = 0x114E9;
+                                else if (100 <= channel && channel <= 140)
+                                        data = 0x110E9;
+                                else
+                                        data = 0x110E9;
+                                rtl8821ae_phy_set_rf_reg(hw, path, RF_APK,
+                                        BRFREGOFFSETMASK, data);
+                        }
+                }
+        }
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
+}
+
+u8 rtl8821ae_phy_sw_chnl(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u32 timeout = 1000, timecount = 0;
+        u8 channel = rtlphy->current_channel;
+
+        if (rtlphy->sw_chnl_inprogress)
+                return 0;
+        if (rtlphy->set_bwmode_inprogress)
+                return 0;
+
+        if ((is_hal_stop(rtlhal)) || (RT_CANNOT_IO(hw))) {
+                RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
+                         "sw_chnl_inprogress false driver sleep or unload\n");
+                return 0;
+        }
+        while (rtlphy->lck_inprogress && timecount < timeout) {
+                mdelay(50);
+                timecount += 50;
+        }
+
+        if (rtlphy->current_channel > 14 && rtlhal->current_bandtype != BAND_ON_5G)
+                rtl8821ae_phy_switch_wirelessband(hw, BAND_ON_5G);
+        else if (rtlphy->current_channel <= 14 && rtlhal->current_bandtype != BAND_ON_2_4G)
+                rtl8821ae_phy_switch_wirelessband(hw, BAND_ON_2_4G);
+
+        rtlphy->sw_chnl_inprogress = true;
+        if (channel == 0)
+                channel = 1;
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
+                 "switch to channel%d, band type is %d\n",
+                 rtlphy->current_channel, rtlhal->current_bandtype);
+
+        rtl8821ae_phy_sw_chnl_callback(hw);
+
+        rtl8821ae_dm_clear_txpower_tracking_state(hw);
+        rtl8821ae_phy_set_txpower_level(hw, rtlphy->current_channel);
+
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
+        rtlphy->sw_chnl_inprogress = false;
+        return 1;
+}
+
+u8 _rtl8812ae_get_right_chnl_place_for_iqk(u8 chnl)
+{
+        u8 channel_all[TARGET_CHNL_NUM_2G_5G_8812] = {
+                1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+                14, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54,
+                56, 58, 60, 62, 64, 100, 102, 104, 106, 108,
+                110, 112, 114, 116, 118, 120, 122, 124, 126,
+                128, 130, 132, 134, 136, 138, 140, 149, 151,
+                153, 155, 157, 159, 161, 163, 165};
+        u8 place = chnl;
+
+        if (chnl > 14) {
+                for (place = 14; place < sizeof(channel_all); place++)
+                        if (channel_all[place] == chnl)
+                                return place-13;
+        }
+
+        return 0;
+}
+
+#define MACBB_REG_NUM 10
+#define AFE_REG_NUM 14
+#define RF_REG_NUM 3
+
+static void _rtl8821ae_iqk_backup_macbb(struct ieee80211_hw *hw,
+                                        u32 *macbb_backup,
+                                        u32 *backup_macbb_reg, u32 mac_bb_num)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+
+        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /*[31] = 0 --> Page C*/
+        /*save MACBB default value*/
+        for (i = 0; i < mac_bb_num; i++)
+                macbb_backup[i] = rtl_read_dword(rtlpriv, backup_macbb_reg[i]);
+
+        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupMacBB Success!!!!\n");
+}
+
+static void _rtl8821ae_iqk_backup_afe(struct ieee80211_hw *hw, u32 *afe_backup,
+                                      u32 *backup_afe_REG, u32 afe_num)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+
+        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /*[31] = 0 --> Page C*/
+        /*Save AFE Parameters */
+        for (i = 0; i < afe_num; i++)
+                afe_backup[i] = rtl_read_dword(rtlpriv, backup_afe_REG[i]);
+        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupAFE Success!!!!\n");
+}
+
+static void _rtl8821ae_iqk_backup_rf(struct ieee80211_hw *hw, u32 *rfa_backup,
+                                     u32 *rfb_backup, u32 *backup_rf_reg,
+                                     u32 rf_num)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+
+        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /*[31] = 0 --> Page C*/
+        /*Save RF Parameters*/
+        for (i = 0; i < rf_num; i++) {
+                rfa_backup[i] = rtl_get_rfreg(hw, RF90_PATH_A, backup_rf_reg[i],
+                                              BMASKDWORD);
+                rfb_backup[i] = rtl_get_rfreg(hw, RF90_PATH_B, backup_rf_reg[i],
+                                              BMASKDWORD);
+        }
+        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupRF Success!!!!\n");
+}
+
+static void _rtl8821ae_iqk_configure_mac(
+                struct ieee80211_hw *hw
+                )
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        /* ========MAC register setting========*/
+        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /*[31] = 0 --> Page C*/
+        rtl_write_byte(rtlpriv, 0x522, 0x3f);
+        rtl_set_bbreg(hw, 0x550, BIT(11) | BIT(3), 0x0);
+        rtl_write_byte(rtlpriv, 0x808, 0x00);           /*RX ante off*/
+        rtl_set_bbreg(hw, 0x838, 0xf, 0xc);             /*CCA off*/
+}
+
+static void _rtl8821ae_iqk_tx_fill_iqc(struct ieee80211_hw *hw,
+                                       enum radio_path path, u32 tx_x, u32 tx_y)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        switch (path) {
+        case RF90_PATH_A:
+                /* [31] = 1 --> Page C1 */
+                rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1);
+                rtl_write_dword(rtlpriv, 0xc90, 0x00000080);
+                rtl_write_dword(rtlpriv, 0xcc4, 0x20040000);
+                rtl_write_dword(rtlpriv, 0xcc8, 0x20000000);
+                rtl_set_bbreg(hw, 0xccc, 0x000007ff, tx_y);
+                rtl_set_bbreg(hw, 0xcd4, 0x000007ff, tx_x);
+                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                         "TX_X = %x;;TX_Y = %x =====> fill to IQC\n",
+                         tx_x, tx_y);
+                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                         "0xcd4 = %x;;0xccc = %x ====>fill to IQC\n",
+                         rtl_get_bbreg(hw, 0xcd4, 0x000007ff),
+                         rtl_get_bbreg(hw, 0xccc, 0x000007ff));
+                break;
+        default:
+                break;
+        };
+}
+
+static void _rtl8821ae_iqk_rx_fill_iqc(struct ieee80211_hw *hw,
+                                       enum radio_path path, u32 rx_x, u32 rx_y)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        switch (path) {
+        case RF90_PATH_A:
+                rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+                rtl_set_bbreg(hw, 0xc10, 0x000003ff, rx_x>>1);
+                rtl_set_bbreg(hw, 0xc10, 0x03ff0000, rx_y>>1);
+                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                         "rx_x = %x;;rx_y = %x ====>fill to IQC\n",
+                         rx_x>>1, rx_y>>1);
+                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                         "0xc10 = %x ====>fill to IQC\n",
+                         rtl_read_dword(rtlpriv, 0xc10));
+                break;
+        default:
+                break;
+        };
+}
+
+#define cal_num 10
+
+static void _rtl8821ae_iqk_tx(struct ieee80211_hw *hw, enum radio_path path)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        u32     tx_fail, rx_fail, delay_count, iqk_ready, cal_retry, cal = 0, temp_reg65;
+        int     tx_x = 0, tx_y = 0, rx_x = 0, rx_y = 0, tx_average = 0, rx_average = 0;
+        int     tx_x0[cal_num], tx_y0[cal_num], tx_x0_rxk[cal_num],
+                tx_y0_rxk[cal_num], rx_x0[cal_num], rx_y0[cal_num];
+        bool    tx0iqkok = false, rx0iqkok = false;
+        bool    vdf_enable = false;
+        int     i, k, vdf_y[3], vdf_x[3], tx_dt[3], rx_dt[3],
+                ii, dx = 0, dy = 0, tx_finish = 0, rx_finish = 0;
+
+        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                        "BandWidth = %d.\n",
+                         rtlphy->current_chan_bw);
+        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80)
+                vdf_enable = true;
+
+        while (cal < cal_num) {
+                switch (path) {
+                case RF90_PATH_A:
+                        temp_reg65 = rtl_get_rfreg(hw, path, 0x65, 0xffffffff);
+                        /* Path-A LOK */
+                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /*[31] = 0 --> Page C*/
+                        /*========Path-A AFE all on========*/
+                        /*Port 0 DAC/ADC on*/
+                        rtl_write_dword(rtlpriv, 0xc60, 0x77777777);
+                        rtl_write_dword(rtlpriv, 0xc64, 0x77777777);
+                        rtl_write_dword(rtlpriv, 0xc68, 0x19791979);
+                        rtl_write_dword(rtlpriv, 0xc6c, 0x19791979);
+                        rtl_write_dword(rtlpriv, 0xc70, 0x19791979);
+                        rtl_write_dword(rtlpriv, 0xc74, 0x19791979);
+                        rtl_write_dword(rtlpriv, 0xc78, 0x19791979);
+                        rtl_write_dword(rtlpriv, 0xc7c, 0x19791979);
+                        rtl_write_dword(rtlpriv, 0xc80, 0x19791979);
+                        rtl_write_dword(rtlpriv, 0xc84, 0x19791979);
+
+                        rtl_set_bbreg(hw, 0xc00, 0xf, 0x4); /*hardware 3-wire off*/
+
+                        /* LOK Setting */
+                        /* ====== LOK ====== */
+                        /*DAC/ADC sampling rate (160 MHz)*/
+                        rtl_set_bbreg(hw, 0xc5c, BIT(26) | BIT(25) | BIT(24), 0x7);
+
+                        /* 2. LoK RF Setting (at BW = 20M) */
+                        rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x80002);
+                        rtl_set_rfreg(hw, path, 0x18, 0x00c00, 0x3);     /* BW 20M */
+                        rtl_set_rfreg(hw, path, 0x30, RFREG_OFFSET_MASK, 0x20000);
+                        rtl_set_rfreg(hw, path, 0x31, RFREG_OFFSET_MASK, 0x0003f);
+                        rtl_set_rfreg(hw, path, 0x32, RFREG_OFFSET_MASK, 0xf3fc3);
+                        rtl_set_rfreg(hw, path, 0x65, RFREG_OFFSET_MASK, 0x931d5);
+                        rtl_set_rfreg(hw, path, 0x8f, RFREG_OFFSET_MASK, 0x8a001);
+                        rtl_set_bbreg(hw, 0xcb8, 0xf, 0xd);
+                        rtl_write_dword(rtlpriv, 0x90c, 0x00008000);
+                        rtl_write_dword(rtlpriv, 0xb00, 0x03000100);
+                        rtl_set_bbreg(hw, 0xc94, BIT(0), 0x1);
+                        rtl_write_dword(rtlpriv, 0x978, 0x29002000);/* TX (X,Y) */
+                        rtl_write_dword(rtlpriv, 0x97c, 0xa9002000);/* RX (X,Y) */
+                        rtl_write_dword(rtlpriv, 0x984, 0x00462910);/* [0]:AGC_en, [15]:idac_K_Mask */
+
+                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1); /* [31] = 1 --> Page C1 */
+                        rtl_write_dword(rtlpriv, 0xc88, 0x821403f4);
+
+                        if (rtlhal->current_bandtype)
+                                rtl_write_dword(rtlpriv, 0xc8c, 0x68163e96);
+                        else
+                                rtl_write_dword(rtlpriv, 0xc8c, 0x28163e96);
+
+                        rtl_write_dword(rtlpriv, 0xc80, 0x18008c10);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                        rtl_write_dword(rtlpriv, 0xc84, 0x38008c10);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                        rtl_write_dword(rtlpriv, 0xcb8, 0x00100000);/* cb8[20] \B1N SI/PI \A8ϥ\CE\C5v\A4\C1\B5\B9 iqk_dpk module */
+                        rtl_write_dword(rtlpriv, 0x980, 0xfa000000);
+                        rtl_write_dword(rtlpriv, 0x980, 0xf8000000);
+
+                        mdelay(10); /* Delay 10ms */
+                        rtl_write_dword(rtlpriv, 0xcb8, 0x00000000);
+
+                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+                        rtl_set_rfreg(hw, path, 0x58, 0x7fe00, rtl_get_rfreg(hw, path, 0x8, 0xffc00)); /* Load LOK */
+
+                        switch (rtlphy->current_chan_bw) {
+                        case 1:
+                                rtl_set_rfreg(hw, path, 0x18, 0x00c00, 0x1);
+                                break;
+                        case 2:
+                                rtl_set_rfreg(hw, path, 0x18, 0x00c00, 0x0);
+                                break;
+                        default:
+                                break;
+                        }
+
+                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1); /* [31] = 1 --> Page C1 */
+
+                        /* 3. TX RF Setting */
+                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+                        rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x80000);
+                        rtl_set_rfreg(hw, path, 0x30, RFREG_OFFSET_MASK, 0x20000);
+                        rtl_set_rfreg(hw, path, 0x31, RFREG_OFFSET_MASK, 0x0003f);
+                        rtl_set_rfreg(hw, path, 0x32, RFREG_OFFSET_MASK, 0xf3fc3);
+                        rtl_set_rfreg(hw, path, 0x65, RFREG_OFFSET_MASK, 0x931d5);
+                        rtl_set_rfreg(hw, path, 0x8f, RFREG_OFFSET_MASK, 0x8a001);
+                        rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x00000);
+                        /* ODM_SetBBReg(pDM_Odm, 0xcb8, 0xf, 0xd); */
+                        rtl_write_dword(rtlpriv, 0x90c, 0x00008000);
+                        rtl_write_dword(rtlpriv, 0xb00, 0x03000100);
+                        rtl_set_bbreg(hw, 0xc94, BIT(0), 0x1);
+                        rtl_write_dword(rtlpriv, 0x978, 0x29002000);/* TX (X,Y) */
+                        rtl_write_dword(rtlpriv, 0x97c, 0xa9002000);/* RX (X,Y) */
+                        rtl_write_dword(rtlpriv, 0x984, 0x0046a910);/* [0]:AGC_en, [15]:idac_K_Mask */
+
+                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1); /* [31] = 1 --> Page C1 */
+                        rtl_write_dword(rtlpriv, 0xc88, 0x821403f1);
+                        if (rtlhal->current_bandtype)
+                                rtl_write_dword(rtlpriv, 0xc8c, 0x40163e96);
+                        else
+                                rtl_write_dword(rtlpriv, 0xc8c, 0x00163e96);
+
+                        if (vdf_enable == 1) {
+                                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "VDF_enable\n");
+                                for (k = 0; k <= 2; k++) {
+                                        switch (k) {
+                                        case 0:
+                                                rtl_write_dword(rtlpriv, 0xc80, 0x18008c38);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                                                rtl_write_dword(rtlpriv, 0xc84, 0x38008c38);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                                                rtl_set_bbreg(hw, 0xce8, BIT(31), 0x0);
+                                                break;
+                                        case 1:
+                                                rtl_set_bbreg(hw, 0xc80, BIT(28), 0x0);
+                                                rtl_set_bbreg(hw, 0xc84, BIT(28), 0x0);
+                                                rtl_set_bbreg(hw, 0xce8, BIT(31), 0x0);
+                                                break;
+                                        case 2:
+                                                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                                                        "vdf_y[1] = %x;;;vdf_y[0] = %x\n", vdf_y[1]>>21 & 0x00007ff, vdf_y[0]>>21 & 0x00007ff);
+                                                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                                                        "vdf_x[1] = %x;;;vdf_x[0] = %x\n", vdf_x[1]>>21 & 0x00007ff, vdf_x[0]>>21 & 0x00007ff);
+                                                tx_dt[cal] = (vdf_y[1]>>20)-(vdf_y[0]>>20);
+                                                tx_dt[cal] = ((16*tx_dt[cal])*10000/15708);
+                                                tx_dt[cal] = (tx_dt[cal] >> 1)+(tx_dt[cal] & BIT(0));
+                                                rtl_write_dword(rtlpriv, 0xc80, 0x18008c20);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                                                rtl_write_dword(rtlpriv, 0xc84, 0x38008c20);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                                                rtl_set_bbreg(hw, 0xce8, BIT(31), 0x1);
+                                                rtl_set_bbreg(hw, 0xce8, 0x3fff0000, tx_dt[cal] & 0x00003fff);
+                                                break;
+                                        default:
+                                                break;
+                                        }
+                                        rtl_write_dword(rtlpriv, 0xcb8, 0x00100000);/* cb8[20] \B1N SI/PI \A8ϥ\CE\C5v\A4\C1\B5\B9 iqk_dpk module */
+                                        cal_retry = 0;
+                                        while (1) {
+                                                /* one shot */
+                                                rtl_write_dword(rtlpriv, 0x980, 0xfa000000);
+                                                rtl_write_dword(rtlpriv, 0x980, 0xf8000000);
+
+                                                mdelay(10); /* Delay 10ms */
+                                                rtl_write_dword(rtlpriv, 0xcb8, 0x00000000);
+                                                delay_count = 0;
+                                                while (1) {
+                                                        iqk_ready = rtl_get_bbreg(hw, 0xd00, BIT(10));
+                                                        if ((~iqk_ready) || (delay_count > 20))
+                                                                break;
+                                                        else{
+                                                                mdelay(1);
+                                                                delay_count++;
+                                                        }
+                                                }
+
+                                                if (delay_count < 20) {                                                 /* If 20ms No Result, then cal_retry++ */
+                                                        /* ============TXIQK Check============== */
+                                                        tx_fail = rtl_get_bbreg(hw, 0xd00, BIT(12));
+
+                                                        if (~tx_fail) {
+                                                                rtl_write_dword(rtlpriv, 0xcb8, 0x02000000);
+                                                                vdf_x[k] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                                rtl_write_dword(rtlpriv, 0xcb8, 0x04000000);
+                                                                vdf_y[k] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                                tx0iqkok = true;
+                                                                break;
+                                                        } else {
+                                                                rtl_set_bbreg(hw, 0xccc, 0x000007ff, 0x0);
+                                                                rtl_set_bbreg(hw, 0xcd4, 0x000007ff, 0x200);
+                                                                tx0iqkok = false;
+                                                                cal_retry++;
+                                                                if (cal_retry == 10)
+                                                                        break;
+                                                        }
+                                                } else {
+                                                        tx0iqkok = false;
+                                                        cal_retry++;
+                                                        if (cal_retry == 10)
+                                                                break;
+                                                }
+                                        }
+                                }
+                                if (k == 3) {
+                                        tx_x0[cal] = vdf_x[k-1];
+                                        tx_y0[cal] = vdf_y[k-1];
+                                }
+                        } else {
+                                rtl_write_dword(rtlpriv, 0xc80, 0x18008c10);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                                rtl_write_dword(rtlpriv, 0xc84, 0x38008c10);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                                rtl_write_dword(rtlpriv, 0xcb8, 0x00100000);/* cb8[20] \B1N SI/PI \A8ϥ\CE\C5v\A4\C1\B5\B9 iqk_dpk module */
+                                cal_retry = 0;
+                                while (1) {
+                                        /* one shot */
+                                        rtl_write_dword(rtlpriv, 0x980, 0xfa000000);
+                                        rtl_write_dword(rtlpriv, 0x980, 0xf8000000);
+
+                                        mdelay(10); /* Delay 10ms */
+                                        rtl_write_dword(rtlpriv, 0xcb8, 0x00000000);
+                                        delay_count = 0;
+                                        while (1) {
+                                                iqk_ready = rtl_get_bbreg(hw, 0xd00, BIT(10));
+                                                if ((~iqk_ready) || (delay_count > 20))
+                                                        break;
+                                                else{
+                                                        mdelay(1);
+                                                        delay_count++;
+                                                }
+                                        }
+
+                                        if (delay_count < 20) {                                                 /* If 20ms No Result, then cal_retry++ */
+                                                /* ============TXIQK Check============== */
+                                                tx_fail = rtl_get_bbreg(hw, 0xd00, BIT(12));
+
+                                                if (~tx_fail) {
+                                                        rtl_write_dword(rtlpriv, 0xcb8, 0x02000000);
+                                                        tx_x0[cal] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                        rtl_write_dword(rtlpriv, 0xcb8, 0x04000000);
+                                                        tx_y0[cal] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                        tx0iqkok = true;
+                                                        break;
+                                                } else {
+                                                        rtl_set_bbreg(hw, 0xccc, 0x000007ff, 0x0);
+                                                        rtl_set_bbreg(hw, 0xcd4, 0x000007ff, 0x200);
+                                                        tx0iqkok = false;
+                                                        cal_retry++;
+                                                        if (cal_retry == 10)
+                                                                break;
+                                                }
+                                        } else {
+                                                tx0iqkok = false;
+                                                cal_retry++;
+                                                if (cal_retry == 10)
+                                                        break;
+                                        }
+                                }
+                        }
+
+                        if (tx0iqkok == false)
+                                break;                          /* TXK fail, Don't do RXK */
+
+                        if (vdf_enable == 1) {
+                                rtl_set_bbreg(hw, 0xce8, BIT(31), 0x0);    /* TX VDF Disable */
+                                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RXVDF Start\n");
+                                for (k = 0; k <= 2; k++) {
+                                        /* ====== RX mode TXK (RXK Step 1) ====== */
+                                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+                                        /* 1. TX RF Setting */
+                                        rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x80000);
+                                        rtl_set_rfreg(hw, path, 0x30, RFREG_OFFSET_MASK, 0x30000);
+                                        rtl_set_rfreg(hw, path, 0x31, RFREG_OFFSET_MASK, 0x00029);
+                                        rtl_set_rfreg(hw, path, 0x32, RFREG_OFFSET_MASK, 0xd7ffb);
+                                        rtl_set_rfreg(hw, path, 0x65, RFREG_OFFSET_MASK, temp_reg65);
+                                        rtl_set_rfreg(hw, path, 0x8f, RFREG_OFFSET_MASK, 0x8a001);
+                                        rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x00000);
+
+                                        rtl_set_bbreg(hw, 0xcb8, 0xf, 0xd);
+                                        rtl_write_dword(rtlpriv, 0x978, 0x29002000);/* TX (X,Y) */
+                                        rtl_write_dword(rtlpriv, 0x97c, 0xa9002000);/* RX (X,Y) */
+                                        rtl_write_dword(rtlpriv, 0x984, 0x0046a910);/* [0]:AGC_en, [15]:idac_K_Mask */
+                                        rtl_write_dword(rtlpriv, 0x90c, 0x00008000);
+                                        rtl_write_dword(rtlpriv, 0xb00, 0x03000100);
+                                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1); /* [31] = 1 --> Page C1 */
+                                        switch (k) {
+                                        case 0:
+                                                {
+                                                        rtl_write_dword(rtlpriv, 0xc80, 0x18008c38);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                                                        rtl_write_dword(rtlpriv, 0xc84, 0x38008c38);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                                                        rtl_set_bbreg(hw, 0xce8, BIT(30), 0x0);
+                                                }
+                                                break;
+                                        case 1:
+                                                {
+                                                        rtl_write_dword(rtlpriv, 0xc80, 0x08008c38);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                                                        rtl_write_dword(rtlpriv, 0xc84, 0x28008c38);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                                                        rtl_set_bbreg(hw, 0xce8, BIT(30), 0x0);
+                                                }
+                                                break;
+                                        case 2:
+                                                {
+                                                        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                                                        "VDF_Y[1] = %x;;;VDF_Y[0] = %x\n",
+                                                        vdf_y[1]>>21 & 0x00007ff, vdf_y[0]>>21 & 0x00007ff);
+                                                        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                                                        "VDF_X[1] = %x;;;VDF_X[0] = %x\n",
+                                                        vdf_x[1]>>21 & 0x00007ff, vdf_x[0]>>21 & 0x00007ff);
+                                                        rx_dt[cal] = (vdf_y[1]>>20)-(vdf_y[0]>>20);
+                                                        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "Rx_dt = %d\n", rx_dt[cal]);
+                                                        rx_dt[cal] = ((16*rx_dt[cal])*10000/13823);
+                                                        rx_dt[cal] = (rx_dt[cal] >> 1)+(rx_dt[cal] & BIT(0));
+                                                        rtl_write_dword(rtlpriv, 0xc80, 0x18008c20);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                                                        rtl_write_dword(rtlpriv, 0xc84, 0x38008c20);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                                                        rtl_set_bbreg(hw, 0xce8, 0x00003fff, rx_dt[cal] & 0x00003fff);
+                                                }
+                                                break;
+                                        default:
+                                                break;
+                                        }
+                                        rtl_write_dword(rtlpriv, 0xc88, 0x821603e0);
+                                        rtl_write_dword(rtlpriv, 0xc8c, 0x68163e96);
+                                        rtl_write_dword(rtlpriv, 0xcb8, 0x00100000);/* cb8[20] \B1N SI/PI \A8ϥ\CE\C5v\A4\C1\B5\B9 iqk_dpk module */
+                                        cal_retry = 0;
+                                        while (1) {
+                                                /* one shot */
+                                                rtl_write_dword(rtlpriv, 0x980, 0xfa000000);
+                                                rtl_write_dword(rtlpriv, 0x980, 0xf8000000);
+
+                                                mdelay(10); /* Delay 10ms */
+                                                rtl_write_dword(rtlpriv, 0xcb8, 0x00000000);
+                                                delay_count = 0;
+                                                while (1) {
+                                                        iqk_ready = rtl_get_bbreg(hw, 0xd00, BIT(10));
+                                                        if ((~iqk_ready) || (delay_count > 20))
+                                                                break;
+                                                        else{
+                                                                mdelay(1);
+                                                                delay_count++;
+                                                        }
+                                                }
+
+                                                if (delay_count < 20) {                                                 /* If 20ms No Result, then cal_retry++ */
+                                                        /* ============TXIQK Check============== */
+                                                        tx_fail = rtl_get_bbreg(hw, 0xd00, BIT(12));
+
+                                                        if (~tx_fail) {
+                                                                rtl_write_dword(rtlpriv, 0xcb8, 0x02000000);
+                                                                tx_x0_rxk[cal] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                                rtl_write_dword(rtlpriv, 0xcb8, 0x04000000);
+                                                                tx_y0_rxk[cal] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                                tx0iqkok = true;
+                                                                break;
+                                                        } else{
+                                                                tx0iqkok = false;
+                                                                cal_retry++;
+                                                                if (cal_retry == 10)
+                                                                        break;
+                                                        }
+                                                } else {
+                                                        tx0iqkok = false;
+                                                        cal_retry++;
+                                                        if (cal_retry == 10)
+                                                                break;
+                                                }
+                                        }
+
+                                        if (tx0iqkok == false) {   /* If RX mode TXK fail, then take TXK Result */
+                                                tx_x0_rxk[cal] = tx_x0[cal];
+                                                tx_y0_rxk[cal] = tx_y0[cal];
+                                                tx0iqkok = true;
+                                                RT_TRACE(rtlpriv,
+                                                         COMP_IQK,
+                                                         DBG_LOUD,
+                                                         "RXK Step 1 fail\n");
+                                        }
+
+                                        /* ====== RX IQK ====== */
+                                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+                                        /* 1. RX RF Setting */
+                                        rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x80000);
+                                        rtl_set_rfreg(hw, path, 0x30, RFREG_OFFSET_MASK, 0x30000);
+                                        rtl_set_rfreg(hw, path, 0x31, RFREG_OFFSET_MASK, 0x0002f);
+                                        rtl_set_rfreg(hw, path, 0x32, RFREG_OFFSET_MASK, 0xfffbb);
+                                        rtl_set_rfreg(hw, path, 0x8f, RFREG_OFFSET_MASK, 0x88001);
+                                        rtl_set_rfreg(hw, path, 0x65, RFREG_OFFSET_MASK, 0x931d8);
+                                        rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x00000);
+
+                                        rtl_set_bbreg(hw, 0x978, 0x03FF8000, (tx_x0_rxk[cal])>>21&0x000007ff);
+                                        rtl_set_bbreg(hw, 0x978, 0x000007FF, (tx_y0_rxk[cal])>>21&0x000007ff);
+                                        rtl_set_bbreg(hw, 0x978, BIT(31), 0x1);
+                                        rtl_set_bbreg(hw, 0x97c, BIT(31), 0x0);
+                                        rtl_set_bbreg(hw, 0xcb8, 0xF, 0xe);
+                                        rtl_write_dword(rtlpriv, 0x90c, 0x00008000);
+                                        rtl_write_dword(rtlpriv, 0x984, 0x0046a911);
+
+                                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1); /* [31] = 1 --> Page C1 */
+                                        rtl_set_bbreg(hw, 0xc80, BIT(29), 0x1);
+                                        rtl_set_bbreg(hw, 0xc84, BIT(29), 0x0);
+                                        rtl_write_dword(rtlpriv, 0xc88, 0x02140119);
+
+                                        rtl_write_dword(rtlpriv, 0xc8c, 0x28160d00); /* pDM_Odm->SupportInterface == 1 */
+
+                                        if (k == 2)
+                                                rtl_set_bbreg(hw, 0xce8, BIT(30), 0x1);  /* RX VDF Enable */
+                                        rtl_write_dword(rtlpriv, 0xcb8, 0x00100000);/* cb8[20] \B1N SI/PI \A8ϥ\CE\C5v\A4\C1\B5\B9 iqk_dpk module */
+
+                                        cal_retry = 0;
+                                        while (1) {
+                                                /* one shot */
+                                                rtl_write_dword(rtlpriv, 0x980, 0xfa000000);
+                                                rtl_write_dword(rtlpriv, 0x980, 0xf8000000);
+
+                                                mdelay(10); /* Delay 10ms */
+                                                rtl_write_dword(rtlpriv, 0xcb8, 0x00000000);
+                                                delay_count = 0;
+                                                while (1) {
+                                                        iqk_ready = rtl_get_bbreg(hw, 0xd00, BIT(10));
+                                                        if ((~iqk_ready) || (delay_count > 20))
+                                                                break;
+                                                        else{
+                                                                mdelay(1);
+                                                                delay_count++;
+                                                        }
+                                                }
+
+                                                if (delay_count < 20) { /* If 20ms No Result, then cal_retry++ */
+                                                        /* ============RXIQK Check============== */
+                                                        rx_fail = rtl_get_bbreg(hw, 0xd00, BIT(11));
+                                                        if (rx_fail == 0) {
+                                                                rtl_write_dword(rtlpriv, 0xcb8, 0x06000000);
+                                                                vdf_x[k] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                                rtl_write_dword(rtlpriv, 0xcb8, 0x08000000);
+                                                                vdf_y[k] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                                rx0iqkok = true;
+                                                                break;
+                                                        } else {
+                                                                rtl_set_bbreg(hw, 0xc10, 0x000003ff, 0x200>>1);
+                                                                rtl_set_bbreg(hw, 0xc10, 0x03ff0000, 0x0>>1);
+                                                                rx0iqkok = false;
+                                                                cal_retry++;
+                                                                if (cal_retry == 10)
+                                                                        break;
+
+                                                        }
+                                                } else{
+                                                        rx0iqkok = false;
+                                                        cal_retry++;
+                                                        if (cal_retry == 10)
+                                                                break;
+                                                }
+                                        }
+
+                                }
+                                if (k == 3) {
+                                        rx_x0[cal] = vdf_x[k-1];
+                                        rx_y0[cal] = vdf_y[k-1];
+                                }
+                                rtl_set_bbreg(hw, 0xce8, BIT(31), 0x1);    /* TX VDF Enable */
+                        }
+
+                        else{
+                                /* ====== RX mode TXK (RXK Step 1) ====== */
+                                rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+                                /* 1. TX RF Setting */
+                                rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x80000);
+                                rtl_set_rfreg(hw, path, 0x30, RFREG_OFFSET_MASK, 0x30000);
+                                rtl_set_rfreg(hw, path, 0x31, RFREG_OFFSET_MASK, 0x00029);
+                                rtl_set_rfreg(hw, path, 0x32, RFREG_OFFSET_MASK, 0xd7ffb);
+                                rtl_set_rfreg(hw, path, 0x65, RFREG_OFFSET_MASK, temp_reg65);
+                                rtl_set_rfreg(hw, path, 0x8f, RFREG_OFFSET_MASK, 0x8a001);
+                                rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x00000);
+                                rtl_write_dword(rtlpriv, 0x90c, 0x00008000);
+                                rtl_write_dword(rtlpriv, 0xb00, 0x03000100);
+                                rtl_write_dword(rtlpriv, 0x984, 0x0046a910);/* [0]:AGC_en, [15]:idac_K_Mask */
+
+                                rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1); /* [31] = 1 --> Page C1 */
+                                rtl_write_dword(rtlpriv, 0xc80, 0x18008c10);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                                rtl_write_dword(rtlpriv, 0xc84, 0x38008c10);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                                rtl_write_dword(rtlpriv, 0xc88, 0x821603e0);
+                                /* ODM_Write4Byte(pDM_Odm, 0xc8c, 0x68163e96); */
+                                rtl_write_dword(rtlpriv, 0xcb8, 0x00100000);/* cb8[20] \B1N SI/PI \A8ϥ\CE\C5v\A4\C1\B5\B9 iqk_dpk module */
+                                cal_retry = 0;
+                                while (1) {
+                                        /* one shot */
+                                        rtl_write_dword(rtlpriv, 0x980, 0xfa000000);
+                                        rtl_write_dword(rtlpriv, 0x980, 0xf8000000);
+
+                                        mdelay(10); /* Delay 10ms */
+                                        rtl_write_dword(rtlpriv, 0xcb8, 0x00000000);
+                                        delay_count = 0;
+                                        while (1) {
+                                                iqk_ready = rtl_get_bbreg(hw, 0xd00, BIT(10));
+                                                if ((~iqk_ready) || (delay_count > 20))
+                                                        break;
+                                                else{
+                                                        mdelay(1);
+                                                        delay_count++;
+                                                }
+                                        }
+
+                                        if (delay_count < 20) {                                                 /* If 20ms No Result, then cal_retry++ */
+                                                /* ============TXIQK Check============== */
+                                                tx_fail = rtl_get_bbreg(hw, 0xd00, BIT(12));
+
+                                                if (~tx_fail) {
+                                                        rtl_write_dword(rtlpriv, 0xcb8, 0x02000000);
+                                                        tx_x0_rxk[cal] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                        rtl_write_dword(rtlpriv, 0xcb8, 0x04000000);
+                                                        tx_y0_rxk[cal] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                        tx0iqkok = true;
+                                                        break;
+                                                } else {
+                                                        tx0iqkok = false;
+                                                        cal_retry++;
+                                                        if (cal_retry == 10)
+                                                                break;
+                                                }
+                                        } else{
+                                                tx0iqkok = false;
+                                                cal_retry++;
+                                                if (cal_retry == 10)
+                                                        break;
+                                        }
+                                }
+
+                                if (tx0iqkok == false) {   /* If RX mode TXK fail, then take TXK Result */
+                                        tx_x0_rxk[cal] = tx_x0[cal];
+                                        tx_y0_rxk[cal] = tx_y0[cal];
+                                        tx0iqkok = true;
+                                        RT_TRACE(rtlpriv, COMP_IQK,
+                                                 DBG_LOUD, "1");
+                                }
+
+                                /* ====== RX IQK ====== */
+                                rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+                                /* 1. RX RF Setting */
+                                rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x80000);
+                                rtl_set_rfreg(hw, path, 0x30, RFREG_OFFSET_MASK, 0x30000);
+                                rtl_set_rfreg(hw, path, 0x31, RFREG_OFFSET_MASK, 0x0002f);
+                                rtl_set_rfreg(hw, path, 0x32, RFREG_OFFSET_MASK, 0xfffbb);
+                                rtl_set_rfreg(hw, path, 0x8f, RFREG_OFFSET_MASK, 0x88001);
+                                rtl_set_rfreg(hw, path, 0x65, RFREG_OFFSET_MASK, 0x931d8);
+                                rtl_set_rfreg(hw, path, 0xef, RFREG_OFFSET_MASK, 0x00000);
+
+                                rtl_set_bbreg(hw, 0x978, 0x03FF8000, (tx_x0_rxk[cal])>>21&0x000007ff);
+                                rtl_set_bbreg(hw, 0x978, 0x000007FF, (tx_y0_rxk[cal])>>21&0x000007ff);
+                                rtl_set_bbreg(hw, 0x978, BIT(31), 0x1);
+                                rtl_set_bbreg(hw, 0x97c, BIT(31), 0x0);
+                                /* ODM_SetBBReg(pDM_Odm, 0xcb8, 0xF, 0xe); */
+                                rtl_write_dword(rtlpriv, 0x90c, 0x00008000);
+                                rtl_write_dword(rtlpriv, 0x984, 0x0046a911);
+
+                                rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1); /* [31] = 1 --> Page C1 */
+                                rtl_write_dword(rtlpriv, 0xc80, 0x38008c10);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
+                                rtl_write_dword(rtlpriv, 0xc84, 0x18008c10);/* RX_TONE_idx[9:0], RxK_Mask[29] */
+                                rtl_write_dword(rtlpriv, 0xc88, 0x02140119);
+
+                                rtl_write_dword(rtlpriv, 0xc8c, 0x28160d00); /*pDM_Odm->SupportInterface == 1*/
+
+                                rtl_write_dword(rtlpriv, 0xcb8, 0x00100000);/* cb8[20] \B1N SI/PI \A8ϥ\CE\C5v\A4\C1\B5\B9 iqk_dpk module */
+
+                                cal_retry = 0;
+                                while (1) {
+                                        /* one shot */
+                                        rtl_write_dword(rtlpriv, 0x980, 0xfa000000);
+                                        rtl_write_dword(rtlpriv, 0x980, 0xf8000000);
+
+                                        mdelay(10); /* Delay 10ms */
+                                        rtl_write_dword(rtlpriv, 0xcb8, 0x00000000);
+                                        delay_count = 0;
+                                        while (1) {
+                                                iqk_ready = rtl_get_bbreg(hw, 0xd00, BIT(10));
+                                                if ((~iqk_ready) || (delay_count > 20))
+                                                        break;
+                                                else{
+                                                        mdelay(1);
+                                                        delay_count++;
+                                                }
+                                        }
+
+                                        if (delay_count < 20) { /* If 20ms No Result, then cal_retry++ */
+                                                /* ============RXIQK Check============== */
+                                                rx_fail = rtl_get_bbreg(hw, 0xd00, BIT(11));
+                                                if (rx_fail == 0) {
+                                                        rtl_write_dword(rtlpriv, 0xcb8, 0x06000000);
+                                                        rx_x0[cal] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                        rtl_write_dword(rtlpriv, 0xcb8, 0x08000000);
+                                                        rx_y0[cal] = rtl_get_bbreg(hw, 0xd00, 0x07ff0000)<<21;
+                                                        rx0iqkok = true;
+                                                        break;
+                                                } else{
+                                                        rtl_set_bbreg(hw, 0xc10, 0x000003ff, 0x200>>1);
+                                                        rtl_set_bbreg(hw, 0xc10, 0x03ff0000, 0x0>>1);
+                                                        rx0iqkok = false;
+                                                        cal_retry++;
+                                                        if (cal_retry == 10)
+                                                                break;
+
+                                                }
+                                        } else{
+                                                rx0iqkok = false;
+                                                cal_retry++;
+                                                if (cal_retry == 10)
+                                                        break;
+                                        }
+                                }
+                        }
+
+                        if (tx0iqkok)
+                                tx_average++;
+                        if (rx0iqkok)
+                                rx_average++;
+                        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+                        rtl_set_rfreg(hw, path, 0x65, RFREG_OFFSET_MASK, temp_reg65);
+                        break;
+                default:
+                        break;
+                }
+                cal++;
+        }
+
+        /* FillIQK Result */
+        switch (path) {
+        case RF90_PATH_A:
+                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                         "========Path_A =======\n");
+                if (tx_average == 0)
+                        break;
+
+                for (i = 0; i < tx_average; i++) {
+                        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                                 "TX_X0_RXK[%d] = %x ;; TX_Y0_RXK[%d] = %x\n", i,
+                                 (tx_x0_rxk[i])>>21&0x000007ff, i,
+                                 (tx_y0_rxk[i])>>21&0x000007ff);
+                        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                                 "TX_X0[%d] = %x ;; TX_Y0[%d] = %x\n", i,
+                                 (tx_x0[i])>>21&0x000007ff, i,
+                                 (tx_y0[i])>>21&0x000007ff);
+                }
+                for (i = 0; i < tx_average; i++) {
+                        for (ii = i+1; ii < tx_average; ii++) {
+                                dx = (tx_x0[i]>>21) - (tx_x0[ii]>>21);
+                                if (dx < 3 && dx > -3) {
+                                        dy = (tx_y0[i]>>21) - (tx_y0[ii]>>21);
+                                        if (dy < 3 && dy > -3) {
+                                                tx_x = ((tx_x0[i]>>21) + (tx_x0[ii]>>21))/2;
+                                                tx_y = ((tx_y0[i]>>21) + (tx_y0[ii]>>21))/2;
+                                                tx_finish = 1;
+                                                break;
+                                        }
+                                }
+                        }
+                        if (tx_finish == 1)
+                                break;
+                }
+
+                if (tx_finish == 1)
+                        _rtl8821ae_iqk_tx_fill_iqc(hw, path, tx_x, tx_y); /* ? */
+                else
+                        _rtl8821ae_iqk_tx_fill_iqc(hw, path, 0x200, 0x0);
+
+                if (rx_average == 0)
+                        break;
+
+                for (i = 0; i < rx_average; i++)
+                        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                                "RX_X0[%d] = %x ;; RX_Y0[%d] = %x\n", i,
+                                (rx_x0[i])>>21&0x000007ff, i,
+                                (rx_y0[i])>>21&0x000007ff);
+                for (i = 0; i < rx_average; i++) {
+                        for (ii = i+1; ii < rx_average; ii++) {
+                                dx = (rx_x0[i]>>21) - (rx_x0[ii]>>21);
+                                if (dx < 4 && dx > -4) {
+                                        dy = (rx_y0[i]>>21) - (rx_y0[ii]>>21);
+                                        if (dy < 4 && dy > -4) {
+                                                rx_x = ((rx_x0[i]>>21) + (rx_x0[ii]>>21))/2;
+                                                rx_y = ((rx_y0[i]>>21) + (rx_y0[ii]>>21))/2;
+                                                rx_finish = 1;
+                                                break;
+                                        }
+                                }
+                        }
+                        if (rx_finish == 1)
+                                break;
+                }
+
+                if (rx_finish == 1)
+                        _rtl8821ae_iqk_rx_fill_iqc(hw, path, rx_x, rx_y);
+                else
+                        _rtl8821ae_iqk_rx_fill_iqc(hw, path, 0x200, 0x0);
+                break;
+        default:
+                break;
+        }
+}
+
+static void _rtl8821ae_iqk_restore_rf(struct ieee80211_hw *hw,
+                                      enum radio_path path,
+                                      u32 *backup_rf_reg,
+                                      u32 *rf_backup, u32 rf_reg_num)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 i;
+
+        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+        for (i = 0; i < RF_REG_NUM; i++)
+                rtl_set_rfreg(hw, path, backup_rf_reg[i], RFREG_OFFSET_MASK,
+                              rf_backup[i]);
+
+        switch (path) {
+        case RF90_PATH_A:
+                RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                         "RestoreRF Path A Success!!!!\n");
+                break;
+        default:
+                        break;
+        }
+}
+
+static void _rtl8821ae_iqk_restore_afe(struct ieee80211_hw *hw,
+                                       u32 *afe_backup, u32 *backup_afe_reg,
+                                       u32 afe_num)
+{
+        u32 i;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+        /* Reload AFE Parameters */
+        for (i = 0; i < afe_num; i++)
+                rtl_write_dword(rtlpriv, backup_afe_reg[i], afe_backup[i]);
+        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x1); /* [31] = 1 --> Page C1 */
+        rtl_write_dword(rtlpriv, 0xc80, 0x0);
+        rtl_write_dword(rtlpriv, 0xc84, 0x0);
+        rtl_write_dword(rtlpriv, 0xc88, 0x0);
+        rtl_write_dword(rtlpriv, 0xc8c, 0x3c000000);
+        rtl_write_dword(rtlpriv, 0xc90, 0x00000080);
+        rtl_write_dword(rtlpriv, 0xc94, 0x00000000);
+        rtl_write_dword(rtlpriv, 0xcc4, 0x20040000);
+        rtl_write_dword(rtlpriv, 0xcc8, 0x20000000);
+        rtl_write_dword(rtlpriv, 0xcb8, 0x0);
+        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreAFE Success!!!!\n");
+}
+
+static void _rtl8821ae_iqk_restore_macbb(struct ieee80211_hw *hw,
+                                         u32 *macbb_backup,
+                                         u32 *backup_macbb_reg,
+                                         u32 macbb_num)
+{
+        u32 i;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
+        /* Reload MacBB Parameters */
+        for (i = 0; i < macbb_num; i++)
+                rtl_write_dword(rtlpriv, backup_macbb_reg[i], macbb_backup[i]);
+        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreMacBB Success!!!!\n");
+}
+
+#undef MACBB_REG_NUM
+#undef AFE_REG_NUM
+#undef RF_REG_NUM
+
+#define MACBB_REG_NUM 11
+#define AFE_REG_NUM 12
+#define RF_REG_NUM 3
+
+static void _rtl8821ae_phy_iq_calibrate(struct ieee80211_hw *hw)
+{
+        u32     macbb_backup[MACBB_REG_NUM];
+        u32 afe_backup[AFE_REG_NUM];
+        u32 rfa_backup[RF_REG_NUM];
+        u32 rfb_backup[RF_REG_NUM];
+        u32 backup_macbb_reg[MACBB_REG_NUM] = {
+                0xb00, 0x520, 0x550, 0x808, 0x90c, 0xc00, 0xc50,
+                0xe00, 0xe50, 0x838, 0x82c
+        };
+        u32 backup_afe_reg[AFE_REG_NUM] = {
+                0xc5c, 0xc60, 0xc64, 0xc68, 0xc6c, 0xc70, 0xc74,
+                0xc78, 0xc7c, 0xc80, 0xc84, 0xcb8
+        };
+        u32     backup_rf_reg[RF_REG_NUM] = {0x65, 0x8f, 0x0};
+
+        _rtl8821ae_iqk_backup_macbb(hw, macbb_backup, backup_macbb_reg,
+                                    MACBB_REG_NUM);
+        _rtl8821ae_iqk_backup_afe(hw, afe_backup, backup_afe_reg, AFE_REG_NUM);
+        _rtl8821ae_iqk_backup_rf(hw, rfa_backup, rfb_backup, backup_rf_reg,
+                                 RF_REG_NUM);
+
+        _rtl8821ae_iqk_configure_mac(hw);
+        _rtl8821ae_iqk_tx(hw, RF90_PATH_A);
+        _rtl8821ae_iqk_restore_rf(hw, RF90_PATH_A, backup_rf_reg, rfa_backup,
+                                  RF_REG_NUM);
+
+        _rtl8821ae_iqk_restore_afe(hw, afe_backup, backup_afe_reg, AFE_REG_NUM);
+        _rtl8821ae_iqk_restore_macbb(hw, macbb_backup, backup_macbb_reg,
+                                     MACBB_REG_NUM);
+}
+
+static void _rtl8821ae_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool main)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        /* struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); */
+        /* struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); */
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+
+        if (main)
+                rtl_set_bbreg(hw, RA_RFE_PINMUX + 4, BIT(29) | BIT(28), 0x1);
+        else
+                rtl_set_bbreg(hw, RA_RFE_PINMUX + 4, BIT(29) | BIT(28), 0x2);
+}
+
+#undef IQK_ADDA_REG_NUM
+#undef IQK_DELAY_TIME
+
+void rtl8812ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery)
+{
+}
+
+void rtl8812ae_do_iqk(struct ieee80211_hw *hw, u8 delta_thermal_index,
+                      u8 thermal_value, u8 threshold)
+{
+        struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
+
+        rtldm->thermalvalue_iqk = thermal_value;
+        rtl8812ae_phy_iq_calibrate(hw, false);
+}
+
+void rtl8821ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        if (!rtlphy->lck_inprogress) {
+                spin_lock(&rtlpriv->locks.iqk_lock);
+                rtlphy->lck_inprogress = true;
+                spin_unlock(&rtlpriv->locks.iqk_lock);
+
+                _rtl8821ae_phy_iq_calibrate(hw);
+
+                spin_lock(&rtlpriv->locks.iqk_lock);
+                rtlphy->lck_inprogress = false;
+                spin_unlock(&rtlpriv->locks.iqk_lock);
+        }
+}
+
+void rtl8821ae_reset_iqk_result(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 i;
+
+        RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
+                 "rtl8812ae_dm_reset_iqk_result:: settings regs %d default regs %d\n",
+                 (int)(sizeof(rtlphy->iqk_matrix) /
+                 sizeof(struct iqk_matrix_regs)),
+                 IQK_MATRIX_SETTINGS_NUM);
+
+        for (i = 0; i < IQK_MATRIX_SETTINGS_NUM; i++) {
+                rtlphy->iqk_matrix[i].value[0][0] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][2] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][4] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][6] = 0x100;
+
+                rtlphy->iqk_matrix[i].value[0][1] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][3] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][5] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][7] = 0x0;
+
+                rtlphy->iqk_matrix[i].iqk_done = false;
+        }
+}
+
+void rtl8821ae_do_iqk(struct ieee80211_hw *hw, u8 delta_thermal_index,
+                      u8 thermal_value, u8 threshold)
+{
+        struct rtl_dm   *rtldm = rtl_dm(rtl_priv(hw));
+
+        rtl8821ae_reset_iqk_result(hw);
+
+        rtldm->thermalvalue_iqk = thermal_value;
+        rtl8821ae_phy_iq_calibrate(hw, false);
+}
+
+void rtl8821ae_phy_lc_calibrate(struct ieee80211_hw *hw)
+{
+}
+
+void rtl8821ae_phy_ap_calibrate(struct ieee80211_hw *hw, char delta)
+{
+}
+
+void rtl8821ae_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain)
+{
+        _rtl8821ae_phy_set_rfpath_switch(hw, bmain);
+}
+
+bool rtl8821ae_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        bool postprocessing = false;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
+                  iotype, rtlphy->set_io_inprogress);
+        do {
+                switch (iotype) {
+                case IO_CMD_RESUME_DM_BY_SCAN:
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                                 "[IO CMD] Resume DM after scan.\n");
+                        postprocessing = true;
+                        break;
+                case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
+                case IO_CMD_PAUSE_BAND1_DM_BY_SCAN:
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                                 "[IO CMD] Pause DM before scan.\n");
+                        postprocessing = true;
+                        break;
+                default:
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not process\n");
+                        break;
+                }
+        } while (false);
+        if (postprocessing && !rtlphy->set_io_inprogress) {
+                rtlphy->set_io_inprogress = true;
+                rtlphy->current_io_type = iotype;
+        } else {
+                return false;
+        }
+        rtl8821ae_phy_set_io(hw);
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
+        return true;
+}
+
+static void rtl8821ae_phy_set_io(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                  rtlphy->current_io_type, rtlphy->set_io_inprogress);
+        switch (rtlphy->current_io_type) {
+        case IO_CMD_RESUME_DM_BY_SCAN:
+                if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC)
+                        _rtl8821ae_resume_tx_beacon(hw);
+                rtl8821ae_dm_write_dig(hw, rtlphy->initgain_backup.xaagccore1);
+                rtl8821ae_dm_write_cck_cca_thres(hw,
+                                                 rtlphy->initgain_backup.cca);
+                break;
+        case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
+                if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC)
+                        _rtl8821ae_stop_tx_beacon(hw);
+                rtlphy->initgain_backup.xaagccore1 = dm_digtable->cur_igvalue;
+                rtl8821ae_dm_write_dig(hw, 0x17);
+                rtlphy->initgain_backup.cca = dm_digtable->cur_cck_cca_thres;
+                rtl8821ae_dm_write_cck_cca_thres(hw, 0x40);
+                break;
+        case IO_CMD_PAUSE_BAND1_DM_BY_SCAN:
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process\n");
+                break;
+        }
+        rtlphy->set_io_inprogress = false;
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
+                 "(%#x)\n", rtlphy->current_io_type);
+}
+
+static void rtl8821ae_phy_set_rf_on(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        rtl_write_byte(rtlpriv, REG_SPS0_CTRL, 0x2b);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
+        rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
+}
+
+static bool _rtl8821ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                              enum rf_pwrstate rfpwr_state)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+        bool bresult = true;
+        u8 i, queue_id;
+        struct rtl8192_tx_ring *ring = NULL;
+
+        switch (rfpwr_state) {
+        case ERFON:
+                if ((ppsc->rfpwr_state == ERFOFF) &&
+                    RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
+                        bool rtstatus = false;
+                        u32 initializecount = 0;
+
+                        do {
+                                initializecount++;
+                                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                         "IPS Set eRf nic enable\n");
+                                rtstatus = rtl_ps_enable_nic(hw);
+                        } while (!rtstatus && (initializecount < 10));
+                        RT_CLEAR_PS_LEVEL(ppsc,
+                                          RT_RF_OFF_LEVL_HALT_NIC);
+                } else {
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                 "Set ERFON sleeped:%d ms\n",
+                                  jiffies_to_msecs(jiffies -
+                                                   ppsc->
+                                                   last_sleep_jiffies));
+                        ppsc->last_awake_jiffies = jiffies;
+                        rtl8821ae_phy_set_rf_on(hw);
+                }
+                if (mac->link_state == MAC80211_LINKED) {
+                        rtlpriv->cfg->ops->led_control(hw,
+                                                       LED_CTL_LINK);
+                } else {
+                        rtlpriv->cfg->ops->led_control(hw,
+                                                       LED_CTL_NO_LINK);
+                }
+                break;
+        case ERFOFF:
+                for (queue_id = 0, i = 0;
+                     queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
+                        ring = &pcipriv->dev.tx_ring[queue_id];
+                        if (queue_id == BEACON_QUEUE ||
+                            skb_queue_len(&ring->queue) == 0) {
+                                queue_id++;
+                                continue;
+                        } else {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         (i + 1), queue_id,
+                                         skb_queue_len(&ring->queue));
+
+                                udelay(10);
+                                i++;
+                        }
+                        if (i >= MAX_DOZE_WAITING_TIMES_9x) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                                         "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                          MAX_DOZE_WAITING_TIMES_9x,
+                                          queue_id,
+                                          skb_queue_len(&ring->queue));
+                                break;
+                        }
+                }
+
+                if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
+                        RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
+                                 "IPS Set eRf nic disable\n");
+                        rtl_ps_disable_nic(hw);
+                        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
+                } else {
+                        if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS) {
+                                rtlpriv->cfg->ops->led_control(hw,
+                                                               LED_CTL_NO_LINK);
+                        } else {
+                                rtlpriv->cfg->ops->led_control(hw,
+                                                               LED_CTL_POWER_OFF);
+                        }
+                }
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not process\n");
+                bresult = false;
+                break;
+        }
+        if (bresult)
+                ppsc->rfpwr_state = rfpwr_state;
+        return bresult;
+}
+
+bool rtl8821ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                      enum rf_pwrstate rfpwr_state)
+{
+        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
+
+        bool bresult = false;
+
+        if (rfpwr_state == ppsc->rfpwr_state)
+                return bresult;
+        bresult = _rtl8821ae_phy_set_rf_power_state(hw, rfpwr_state);
+        return bresult;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/phy.h b/drivers/net/wireless/rtlwifi/rtl8821ae/phy.h
new file mode 100644
index 000000000000..c411f0a95cc4
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/phy.h
@@ -0,0 +1,259 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_PHY_H__
+#define __RTL8821AE_PHY_H__
+
+/* MAX_TX_COUNT must always be set to 4, otherwise read
+ * efuse table sequence will be wrong.
+ */
+#define MAX_TX_COUNT                            4
+#define TX_1S                                   0
+#define TX_2S                                   1
+#define TX_3S                                   2
+#define TX_4S                                   3
+
+#define MAX_POWER_INDEX                         0x3F
+
+#define MAX_PRECMD_CNT                          16
+#define MAX_RFDEPENDCMD_CNT                     16
+#define MAX_POSTCMD_CNT                         16
+
+#define MAX_DOZE_WAITING_TIMES_9x               64
+
+#define RT_CANNOT_IO(hw)                        false
+#define HIGHPOWER_RADIOA_ARRAYLEN               22
+
+#define IQK_ADDA_REG_NUM                        16
+#define IQK_BB_REG_NUM                          9
+#define MAX_TOLERANCE                           5
+#define IQK_DELAY_TIME                          10
+#define index_mapping_NUM                       15
+
+#define APK_BB_REG_NUM                          5
+#define APK_AFE_REG_NUM                         16
+#define APK_CURVE_REG_NUM                       4
+#define PATH_NUM                                2
+
+#define LOOP_LIMIT                              5
+#define MAX_STALL_TIME                          50
+#define AntennaDiversityValue                   0x80
+#define MAX_TXPWR_IDX_NMODE_92S                 63
+#define Reset_Cnt_Limit                         3
+
+#define IQK_ADDA_REG_NUM                        16
+#define IQK_MAC_REG_NUM                         4
+
+#define RF6052_MAX_PATH                         2
+
+#define CT_OFFSET_MAC_ADDR                      0X16
+
+#define CT_OFFSET_CCK_TX_PWR_IDX                0x5A
+#define CT_OFFSET_HT401S_TX_PWR_IDX             0x60
+#define CT_OFFSET_HT402S_TX_PWR_IDX_DIFF        0x66
+#define CT_OFFSET_HT20_TX_PWR_IDX_DIFF          0x69
+#define CT_OFFSET_OFDM_TX_PWR_IDX_DIFF          0x6C
+
+#define CT_OFFSET_HT40_MAX_PWR_OFFSET           0x6F
+#define CT_OFFSET_HT20_MAX_PWR_OFFSET           0x72
+
+#define CT_OFFSET_CHANNEL_PLAH                  0x75
+#define CT_OFFSET_THERMAL_METER                 0x78
+#define CT_OFFSET_RF_OPTION                     0x79
+#define CT_OFFSET_VERSION                       0x7E
+#define CT_OFFSET_CUSTOMER_ID                   0x7F
+
+#define RTL8821AE_MAX_PATH_NUM                  2
+
+#define TARGET_CHNL_NUM_2G_5G_8812              59
+
+enum swchnlcmd_id {
+        CMDID_END,
+        CMDID_SET_TXPOWEROWER_LEVEL,
+        CMDID_BBREGWRITE10,
+        CMDID_WRITEPORT_ULONG,
+        CMDID_WRITEPORT_USHORT,
+        CMDID_WRITEPORT_UCHAR,
+        CMDID_RF_WRITEREG,
+};
+
+struct swchnlcmd {
+        enum swchnlcmd_id cmdid;
+        u32 para1;
+        u32 para2;
+        u32 msdelay;
+};
+
+enum hw90_block_e {
+        HW90_BLOCK_MAC = 0,
+        HW90_BLOCK_PHY0 = 1,
+        HW90_BLOCK_PHY1 = 2,
+        HW90_BLOCK_RF = 3,
+        HW90_BLOCK_MAXIMUM = 4,
+};
+
+enum baseband_config_type {
+        BASEBAND_CONFIG_PHY_REG = 0,
+        BASEBAND_CONFIG_AGC_TAB = 1,
+};
+
+enum ra_offset_area {
+        RA_OFFSET_LEGACY_OFDM1,
+        RA_OFFSET_LEGACY_OFDM2,
+        RA_OFFSET_HT_OFDM1,
+        RA_OFFSET_HT_OFDM2,
+        RA_OFFSET_HT_OFDM3,
+        RA_OFFSET_HT_OFDM4,
+        RA_OFFSET_HT_CCK,
+};
+
+enum antenna_path {
+        ANTENNA_NONE,
+        ANTENNA_D,
+        ANTENNA_C,
+        ANTENNA_CD,
+        ANTENNA_B,
+        ANTENNA_BD,
+        ANTENNA_BC,
+        ANTENNA_BCD,
+        ANTENNA_A,
+        ANTENNA_AD,
+        ANTENNA_AC,
+        ANTENNA_ACD,
+        ANTENNA_AB,
+        ANTENNA_ABD,
+        ANTENNA_ABC,
+        ANTENNA_ABCD
+};
+
+struct r_antenna_select_ofdm {
+        u32 r_tx_antenna:4;
+        u32 r_ant_l:4;
+        u32 r_ant_non_ht:4;
+        u32 r_ant_ht1:4;
+        u32 r_ant_ht2:4;
+        u32 r_ant_ht_s1:4;
+        u32 r_ant_non_ht_s1:4;
+        u32 ofdm_txsc:2;
+        u32 reserved:2;
+};
+
+struct r_antenna_select_cck {
+        u8 r_cckrx_enable_2:2;
+        u8 r_cckrx_enable:2;
+        u8 r_ccktx_enable:4;
+};
+
+struct efuse_contents {
+        u8 mac_addr[ETH_ALEN];
+        u8 cck_tx_power_idx[6];
+        u8 ht40_1s_tx_power_idx[6];
+        u8 ht40_2s_tx_power_idx_diff[3];
+        u8 ht20_tx_power_idx_diff[3];
+        u8 ofdm_tx_power_idx_diff[3];
+        u8 ht40_max_power_offset[3];
+        u8 ht20_max_power_offset[3];
+        u8 channel_plan;
+        u8 thermal_meter;
+        u8 rf_option[5];
+        u8 version;
+        u8 oem_id;
+        u8 regulatory;
+};
+
+struct tx_power_struct {
+        u8 cck[RTL8821AE_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 ht40_1s[RTL8821AE_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 ht40_2s[RTL8821AE_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 ht20_diff[RTL8821AE_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 legacy_ht_diff[RTL8821AE_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 legacy_ht_txpowerdiff;
+        u8 groupht20[RTL8821AE_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 groupht40[RTL8821AE_MAX_PATH_NUM][CHANNEL_MAX_NUMBER];
+        u8 pwrgroup_cnt;
+        u32 mcs_original_offset[4][16];
+};
+enum _ANT_DIV_TYPE {
+        NO_ANTDIV                       = 0xFF,
+        CG_TRX_HW_ANTDIV                = 0x01,
+        CGCS_RX_HW_ANTDIV               = 0x02,
+        FIXED_HW_ANTDIV                 = 0x03,
+        CG_TRX_SMART_ANTDIV             = 0x04,
+        CGCS_RX_SW_ANTDIV               = 0x05,
+
+};
+
+u32 rtl8821ae_phy_query_bb_reg(struct ieee80211_hw *hw,
+                               u32 regaddr, u32 bitmask);
+void rtl8821ae_phy_set_bb_reg(struct ieee80211_hw *hw,
+                              u32 regaddr, u32 bitmask, u32 data);
+u32 rtl8821ae_phy_query_rf_reg(struct ieee80211_hw *hw,
+                               enum radio_path rfpath, u32 regaddr,
+                               u32 bitmask);
+void rtl8821ae_phy_set_rf_reg(struct ieee80211_hw *hw,
+                              enum radio_path rfpath, u32 regaddr,
+                              u32 bitmask, u32 data);
+bool rtl8821ae_phy_mac_config(struct ieee80211_hw *hw);
+bool rtl8821ae_phy_bb_config(struct ieee80211_hw *hw);
+bool rtl8821ae_phy_rf_config(struct ieee80211_hw *hw);
+void rtl8821ae_phy_switch_wirelessband(struct ieee80211_hw *hw,
+                                       u8 band);
+void rtl8821ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw);
+void rtl8821ae_phy_get_txpower_level(struct ieee80211_hw *hw,
+                                     long *powerlevel);
+void rtl8821ae_phy_set_txpower_level(struct ieee80211_hw *hw,
+                                     u8 channel);
+void rtl8821ae_phy_scan_operation_backup(struct ieee80211_hw *hw,
+                                         u8 operation);
+void rtl8821ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
+void rtl8821ae_phy_set_bw_mode(struct ieee80211_hw *hw,
+                               enum nl80211_channel_type ch_type);
+void rtl8821ae_phy_sw_chnl_callback(struct ieee80211_hw *hw);
+u8 rtl8821ae_phy_sw_chnl(struct ieee80211_hw *hw);
+void rtl8821ae_phy_iq_calibrate(struct ieee80211_hw *hw,
+                                bool b_recovery);
+void rtl8812ae_phy_iq_calibrate(struct ieee80211_hw *hw,
+                                bool b_recovery);
+void rtl8821ae_phy_ap_calibrate(struct ieee80211_hw *hw, char delta);
+void rtl8821ae_phy_lc_calibrate(struct ieee80211_hw *hw);
+void rtl8821ae_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain);
+bool rtl8812ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                             enum radio_path rfpath);
+bool rtl8821ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
+                                             enum radio_path rfpath);
+bool rtl8821ae_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype);
+bool rtl8821ae_phy_set_rf_power_state(struct ieee80211_hw *hw,
+                                      enum rf_pwrstate rfpwr_state);
+u8 _rtl8812ae_get_right_chnl_place_for_iqk(u8 chnl);
+void rtl8821ae_phy_set_txpower_level_by_path(struct ieee80211_hw *hw,
+                                             u8 channel, u8 path);
+void rtl8812ae_do_iqk(struct ieee80211_hw *hw, u8 delta_thermal_index,
+        u8 thermal_value, u8 threshold);
+void rtl8821ae_do_iqk(struct ieee80211_hw *hw, u8 delta_thermal_index,
+                      u8 thermal_value, u8 threshold);
+void rtl8821ae_reset_iqk_result(struct ieee80211_hw *hw);
+u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8 band, u8 rf_path);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.c b/drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.c
new file mode 100644
index 000000000000..9ddf78a187dd
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.c
@@ -0,0 +1,182 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../pwrseqcmd.h"
+#include "pwrseq.h"
+
+/* drivers should parse below arrays and do the corresponding actions */
+/* 3 Power on  Array */
+struct wlan_pwr_cfg rtl8812_power_on_flow[RTL8812_TRANS_CARDEMU_TO_ACT_STEPS +
+                                        RTL8812_TRANS_END_STEPS] = {
+        RTL8812_TRANS_CARDEMU_TO_ACT
+        RTL8812_TRANS_END
+};
+
+/* 3Radio off GPIO Array */
+struct wlan_pwr_cfg rtl8812_radio_off_flow[RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                                                RTL8812_TRANS_END_STEPS] = {
+        RTL8812_TRANS_ACT_TO_CARDEMU
+        RTL8812_TRANS_END
+};
+
+/* 3Card Disable Array */
+struct wlan_pwr_cfg rtl8812_card_disable_flow[RTL8812_TRANS_ACT_TO_CARDEMU_STEPS
+        + RTL8812_TRANS_CARDEMU_TO_PDN_STEPS
+        + RTL8812_TRANS_END_STEPS] = {
+        RTL8812_TRANS_ACT_TO_CARDEMU
+        RTL8812_TRANS_CARDEMU_TO_CARDDIS
+        RTL8812_TRANS_END
+};
+
+/* 3 Card Enable Array */
+struct wlan_pwr_cfg rtl8812_card_enable_flow[RTL8812_TRANS_ACT_TO_CARDEMU_STEPS
+        + RTL8812_TRANS_CARDEMU_TO_PDN_STEPS
+        + RTL8812_TRANS_END_STEPS] = {
+        RTL8812_TRANS_CARDDIS_TO_CARDEMU
+        RTL8812_TRANS_CARDEMU_TO_ACT
+        RTL8812_TRANS_END
+};
+
+/* 3Suspend Array */
+struct wlan_pwr_cfg rtl8812_suspend_flow[RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                                        RTL8812_TRANS_CARDEMU_TO_SUS_STEPS +
+                                        RTL8812_TRANS_END_STEPS] = {
+        RTL8812_TRANS_ACT_TO_CARDEMU
+        RTL8812_TRANS_CARDEMU_TO_SUS
+        RTL8812_TRANS_END
+};
+
+/* 3 Resume Array */
+struct wlan_pwr_cfg rtl8812_resume_flow[RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                                        RTL8812_TRANS_CARDEMU_TO_SUS_STEPS +
+                                        RTL8812_TRANS_END_STEPS] = {
+        RTL8812_TRANS_SUS_TO_CARDEMU
+        RTL8812_TRANS_CARDEMU_TO_ACT
+        RTL8812_TRANS_END
+};
+
+/* 3HWPDN Array */
+struct wlan_pwr_cfg rtl8812_hwpdn_flow[RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                                        RTL8812_TRANS_CARDEMU_TO_PDN_STEPS +
+                                        RTL8812_TRANS_END_STEPS] = {
+        RTL8812_TRANS_ACT_TO_CARDEMU
+        RTL8812_TRANS_CARDEMU_TO_PDN
+        RTL8812_TRANS_END
+};
+
+/* 3 Enter LPS */
+struct wlan_pwr_cfg rtl8812_enter_lps_flow[RTL8812_TRANS_ACT_TO_LPS_STEPS +
+                                                RTL8812_TRANS_END_STEPS] = {
+        /* FW behavior */
+        RTL8812_TRANS_ACT_TO_LPS
+        RTL8812_TRANS_END
+};
+
+/* 3 Leave LPS */
+struct wlan_pwr_cfg rtl8812_leave_lps_flow[RTL8812_TRANS_LPS_TO_ACT_STEPS +
+                                                RTL8812_TRANS_END_STEPS] = {
+        /* FW behavior */
+        RTL8812_TRANS_LPS_TO_ACT
+        RTL8812_TRANS_END
+};
+
+/* drivers should parse below arrays and do the corresponding actions */
+/*3 Power on  Array*/
+struct wlan_pwr_cfg rtl8821A_power_on_flow[RTL8821A_TRANS_CARDEMU_TO_ACT_STEPS
+                                        + RTL8821A_TRANS_END_STEPS] = {
+        RTL8821A_TRANS_CARDEMU_TO_ACT
+        RTL8821A_TRANS_END
+};
+
+/*3Radio off GPIO Array */
+struct wlan_pwr_cfg rtl8821A_radio_off_flow[RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8821A_TRANS_END_STEPS] = {
+        RTL8821A_TRANS_ACT_TO_CARDEMU
+        RTL8821A_TRANS_END
+};
+
+/*3Card Disable Array*/
+struct wlan_pwr_cfg rtl8821A_card_disable_flow
+                                        [RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8821A_TRANS_CARDEMU_TO_PDN_STEPS
+                                        + RTL8821A_TRANS_END_STEPS] = {
+        RTL8821A_TRANS_ACT_TO_CARDEMU
+        RTL8821A_TRANS_CARDEMU_TO_CARDDIS
+        RTL8821A_TRANS_END
+};
+
+/*3 Card Enable Array*/
+/*RTL8821A_TRANS_CARDEMU_TO_PDN_STEPS*/
+struct wlan_pwr_cfg rtl8821A_card_enable_flow
+                                        [RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8821A_TRANS_CARDEMU_TO_ACT_STEPS
+                                        + RTL8821A_TRANS_END_STEPS] = {
+        RTL8821A_TRANS_CARDDIS_TO_CARDEMU
+        RTL8821A_TRANS_CARDEMU_TO_ACT
+        RTL8821A_TRANS_END
+};
+
+/*3Suspend Array*/
+struct wlan_pwr_cfg rtl8821A_suspend_flow[RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8821A_TRANS_CARDEMU_TO_SUS_STEPS
+                                        + RTL8821A_TRANS_END_STEPS] = {
+        RTL8821A_TRANS_ACT_TO_CARDEMU
+        RTL8821A_TRANS_CARDEMU_TO_SUS
+        RTL8821A_TRANS_END
+};
+
+/*3 Resume Array*/
+struct wlan_pwr_cfg rtl8821A_resume_flow[RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS
+                                        + RTL8821A_TRANS_CARDEMU_TO_SUS_STEPS
+                                        + RTL8821A_TRANS_END_STEPS] = {
+        RTL8821A_TRANS_SUS_TO_CARDEMU
+        RTL8821A_TRANS_CARDEMU_TO_ACT
+        RTL8821A_TRANS_END
+};
+
+/*3HWPDN Array*/
+struct wlan_pwr_cfg rtl8821A_hwpdn_flow[RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS
+                                + RTL8821A_TRANS_CARDEMU_TO_PDN_STEPS
+                                + RTL8821A_TRANS_END_STEPS] = {
+        RTL8821A_TRANS_ACT_TO_CARDEMU
+        RTL8821A_TRANS_CARDEMU_TO_PDN
+        RTL8821A_TRANS_END
+};
+
+/*3 Enter LPS */
+struct wlan_pwr_cfg rtl8821A_enter_lps_flow[RTL8821A_TRANS_ACT_TO_LPS_STEPS
+                                        + RTL8821A_TRANS_END_STEPS] = {
+        /*FW behavior*/
+        RTL8821A_TRANS_ACT_TO_LPS
+        RTL8821A_TRANS_END
+};
+
+/*3 Leave LPS */
+struct wlan_pwr_cfg rtl8821A_leave_lps_flow[RTL8821A_TRANS_LPS_TO_ACT_STEPS
+                                        + RTL8821A_TRANS_END_STEPS] = {
+        /*FW behavior*/
+        RTL8821A_TRANS_LPS_TO_ACT
+        RTL8821A_TRANS_END
+};
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h b/drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h
new file mode 100644
index 000000000000..bf0b0ce9519c
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h
@@ -0,0 +1,738 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_PWRSEQ_H__
+#define __RTL8821AE_PWRSEQ_H__
+
+#include "../pwrseqcmd.h"
+#include "../btcoexist/halbt_precomp.h"
+
+#define RTL8812_TRANS_CARDEMU_TO_ACT_STEPS      15
+#define RTL8812_TRANS_ACT_TO_CARDEMU_STEPS      15
+#define RTL8812_TRANS_CARDEMU_TO_SUS_STEPS      15
+#define RTL8812_TRANS_SUS_TO_CARDEMU_STEPS      15
+#define RTL8812_TRANS_CARDEMU_TO_PDN_STEPS      25
+#define RTL8812_TRANS_PDN_TO_CARDEMU_STEPS      15
+#define RTL8812_TRANS_ACT_TO_LPS_STEPS          15
+#define RTL8812_TRANS_LPS_TO_ACT_STEPS          15
+#define RTL8812_TRANS_END_STEPS                 1
+
+/* The following macros have the following format:
+ * { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value
+ *   comments },
+ */
+#define RTL8812_TRANS_CARDEMU_TO_ACT                                    \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT2, 0 \
+        /* disable SW LPS 0x04[10]=0*/},        \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT1, BIT1 \
+        /* wait till 0x04[17] = 1    power ready*/},    \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT7, 0 \
+        /* disable HWPDN 0x04[15]=0*/}, \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3, 0 \
+        /* disable WL suspend*/},       \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, BIT0 \
+        /* polling until return 0*/},   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT0, 0},
+
+#define RTL8812_TRANS_ACT_TO_CARDEMU                                                                                                    \
+        {0x0c00, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x04 \
+         /* 0xc00[7:0] = 4      turn off 3-wire */},    \
+        {0x0e00, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x04 \
+         /* 0xe00[7:0] = 4      turn off 3-wire */},    \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, 0 \
+         /* 0x2[0] = 0   RESET BB, CLOSE RF */},        \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US \
+        /*Delay 1us*/}, \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+          /* Whole BB is reset*/},                      \
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x2A \
+         /* 0x07[7:0] = 0x28 sps pwm mode 0x2a for BT coex*/},  \
+        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x02, 0 \
+        /*0x8[1] = 0 ANA clk =500k */}, \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, BIT1 \
+         /*0x04[9] = 1 turn off MAC by HW state machine*/},     \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT1, 0 \
+         /*wait till 0x04[9] = 0 polling until return 0 to disable*/},
+
+#define RTL8812_TRANS_CARDEMU_TO_SUS                                    \
+        {0x0042, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xF0, 0xcc}, \
+        {0x0042, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xF0, 0xEC}, \
+        {0x0043, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x07 \
+        /* gpio11 input mode, gpio10~8 output mode */}, \
+        {0x0045, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x00 \
+        /* gpio 0~7 output same value as input ?? */},  \
+        {0x0046, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xff \
+        /* gpio0~7 output mode */},     \
+        {0x0047, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0 \
+        /* 0x47[7:0] = 00 gpio mode */},        \
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0 \
+        /* suspend option all off */},  \
+        {0x0014, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x80, BIT7 \
+        /*0x14[7] = 1 turn on ZCD */},  \
+        {0x0015, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x01, BIT0 \
+        /* 0x15[0] =1 trun on ZCD */},  \
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x10, BIT4 \
+        /*0x23[4] = 1 hpon LDO sleep mode */},  \
+        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x02, 0 \
+        /*0x8[1] = 0 ANA clk =500k */}, \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3, BIT3 \
+        /*0x04[11] = 2b'11 enable WL suspend for PCIe*/},
+
+#define RTL8812_TRANS_SUS_TO_CARDEMU                                    \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3, 0 \
+        /*0x04[11] = 2b'01enable WL suspend*/},   \
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x10, 0 \
+        /*0x23[4] = 0 hpon LDO sleep mode leave */},    \
+        {0x0015, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x01, 0 \
+        /* 0x15[0] =0 trun off ZCD */}, \
+        {0x0014, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x80, 0 \
+        /*0x14[7] = 0 turn off ZCD */}, \
+        {0x0046, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x00 \
+        /* gpio0~7 input mode */},      \
+        {0x0043, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x00 \
+        /* gpio11 input mode, gpio10~8 input mode */},
+
+#define RTL8812_TRANS_CARDEMU_TO_CARDDIS                                \
+        {0x0003, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT2, 0 \
+        /*0x03[2] = 0, reset 8051*/},   \
+        {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x05 \
+        /*0x80=05h if reload fw, fill the default value of host_CPU handshake field*/}, \
+        {0x0042, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xF0, 0xcc}, \
+        {0x0042, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xF0, 0xEC}, \
+        {0x0043, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x07 \
+        /* gpio11 input mode, gpio10~8 output mode */}, \
+        {0x0045, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x00 \
+        /* gpio 0~7 output same value as input ?? */},  \
+        {0x0046, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xff \
+        /* gpio0~7 output mode */},     \
+        {0x0047, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0 \
+        /* 0x47[7:0] = 00 gpio mode */},        \
+        {0x0014, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x80, BIT7 \
+        /*0x14[7] = 1 turn on ZCD */},  \
+        {0x0015, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x01, BIT0 \
+        /* 0x15[0] =1 trun on ZCD */},  \
+        {0x0012, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x01, 0 \
+        /*0x12[0] = 0 force PFM mode */},       \
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x10, BIT4 \
+        /*0x23[4] = 1 hpon LDO sleep mode */},  \
+        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x02, 0 \
+        /*0x8[1] = 0 ANA clk =500k */}, \
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x20 \
+         /*0x07=0x20 , SOP option to disable BG/MB*/},  \
+        {0x001f, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+         /*0x01f[1]=0 , disable RFC_0  control  REG_RF_CTRL_8812 */},   \
+        {0x0076, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+         /*0x076[1]=0 , disable RFC_1  control REG_OPT_CTRL_8812 +2 */},        \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3, BIT3 \
+         /*0x04[11] = 2b'01 enable WL suspend*/},
+
+#define RTL8812_TRANS_CARDDIS_TO_CARDEMU                                \
+        {0x0012, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, BIT0 \
+        /*0x12[0] = 1 force PWM mode */},       \
+        {0x0014, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x80, 0 \
+        /*0x14[7] = 0 turn off ZCD */}, \
+        {0x0015, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x01, 0 \
+        /* 0x15[0] =0 trun off ZCD */}, \
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0x10, 0 \
+        /*0x23[4] = 0 hpon LDO leave sleep mode */},    \
+        {0x0046, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x00 \
+        /* gpio0~7 input mode */},      \
+        {0x0043, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x00 \
+        /* gpio11 input mode, gpio10~8 input mode */}, \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT2, 0 \
+         /*0x04[10] = 0, enable SW LPS PCIE only*/},    \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3, 0 \
+         /*0x04[11] = 2b'01enable WL suspend*/},        \
+        {0x0003, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT2, BIT2 \
+         /*0x03[2] = 1, enable 8051*/}, \
+        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0 \
+        /*PCIe DMA start*/},
+
+#define RTL8812_TRANS_CARDEMU_TO_PDN            \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT7, BIT7 \
+        /* 0x04[15] = 1*/},
+
+#define RTL8812_TRANS_PDN_TO_CARDEMU                    \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT7, 0 \
+        /* 0x04[15] = 0*/},
+
+#define RTL8812_TRANS_ACT_TO_LPS                \
+        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF \
+        /*PCIe DMA stop*/},     \
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x7F \
+        /*Tx Pause*/},          \
+        {0x05F8, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0 \
+        /*Should be zero if no packet is transmitting*/},       \
+        {0x05F9, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0 \
+        /*Should be zero if no packet is transmitting*/},       \
+        {0x05FA, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0 \
+        /*Should be zero if no packet is transmitting*/},       \
+        {0x05FB, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0 \
+        /*Should be zero if no packet is transmitting*/},       \
+        {0x0c00, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x04 \
+         /* 0xc00[7:0] = 4      turn off 3-wire */},    \
+        {0x0e00, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x04 \
+         /* 0xe00[7:0] = 4      turn off 3-wire */},    \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, 0 \
+        /*CCK and OFDM are disabled,and clock are gated,and RF closed*/},       \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US \
+        /*Delay 1us*/}, \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+          /* Whole BB is reset*/},                      \
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x03 \
+        /*Reset MAC TRX*/},                     \
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+        /*check if removed later*/},            \
+        {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT5, BIT5 \
+        /*Respond TxOK to scheduler*/},
+
+#define RTL8812_TRANS_LPS_TO_ACT                                        \
+        {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, 0xFF, 0x84 \
+         /*SDIO RPWM*/},        \
+        {0xFE58, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84 \
+         /*USB RPWM*/}, \
+        {0x0361, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84 \
+         /*PCIe RPWM*/},        \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS \
+         /*Delay*/},    \
+        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4, 0 \
+         /*.    0x08[4] = 0              switch TSF to 40M*/},  \
+        {0x0109, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT7, 0 \
+         /*Polling 0x109[7]=0  TSF in 40M*/},                   \
+        {0x0029, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT6|BIT7, 0 \
+         /*.    0x29[7:6] = 2b'00        enable BB clock*/},    \
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, BIT1 \
+         /*.    0x101[1] = 1*/},                                        \
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF \
+         /*.    0x100[7:0] = 0xFF        enable WMAC TRX*/},    \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1|BIT0, BIT1|BIT0 \
+         /*.    0x02[1:0] = 2b'11        enable BB macro*/},    \
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0 \
+         /*.    0x522 = 0*/},
+
+#define RTL8812_TRANS_END                                       \
+        {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK, \
+        0, PWR_CMD_END, 0, 0},
+
+extern struct wlan_pwr_cfg  rtl8812_power_on_flow
+                [RTL8812_TRANS_CARDEMU_TO_ACT_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg  rtl8812_radio_off_flow
+                [RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg  rtl8812_card_disable_flow
+                [RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8812_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg  rtl8812_card_enable_flow
+                [RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8812_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg  rtl8812_suspend_flow
+                [RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8812_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg  rtl8812_resume_flow
+                [RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8812_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg  rtl8812_hwpdn_flow
+                [RTL8812_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8812_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg  rtl8812_enter_lps_flow
+                [RTL8812_TRANS_ACT_TO_LPS_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg  rtl8812_leave_lps_flow
+                [RTL8812_TRANS_LPS_TO_ACT_STEPS +
+                 RTL8812_TRANS_END_STEPS];
+
+/* Check document WM-20130516-JackieLau-RTL8821A_Power_Architecture-R10.vsd
+ *      There are 6 HW Power States:
+ *      0: POFF--Power Off
+ *      1: PDN--Power Down
+ *      2: CARDEMU--Card Emulation
+ *      3: ACT--Active Mode
+ *      4: LPS--Low Power State
+ *      5: SUS--Suspend
+ *
+ *      The transision from different states are defined below
+ *      TRANS_CARDEMU_TO_ACT
+ *      TRANS_ACT_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_SUS
+ *      TRANS_SUS_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_PDN
+ *      TRANS_ACT_TO_LPS
+ *      TRANS_LPS_TO_ACT
+ *
+ *      TRANS_END
+ */
+#define RTL8821A_TRANS_CARDEMU_TO_ACT_STEPS     25
+#define RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS     15
+#define RTL8821A_TRANS_CARDEMU_TO_SUS_STEPS     15
+#define RTL8821A_TRANS_SUS_TO_CARDEMU_STEPS     15
+#define RTL8821A_TRANS_CARDDIS_TO_CARDEMU_STEPS 15
+#define RTL8821A_TRANS_CARDEMU_TO_PDN_STEPS     15
+#define RTL8821A_TRANS_PDN_TO_CARDEMU_STEPS     15
+#define RTL8821A_TRANS_ACT_TO_LPS_STEPS         15
+#define RTL8821A_TRANS_LPS_TO_ACT_STEPS         15
+#define RTL8821A_TRANS_END_STEPS                1
+
+#define RTL8821A_TRANS_CARDEMU_TO_ACT                                   \
+        {0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, BIT0 \
+         /*0x20[0] = 1b'1 enable LDOA12 MACRO block for all interface*/},   \
+        {0x0067, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,              \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4, 0 \
+         /*0x67[0] = 0 to disable BT_GPS_SEL pins*/},   \
+        {0x0001, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 1, PWRSEQ_DELAY_MS \
+        /*Delay 1ms*/},   \
+        {0x0000, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT5, 0 \
+         /*0x00[5] = 1b'0 release analog Ips to digital ,1:isolation*/},   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, (BIT4|BIT3|BIT2), 0 \
+        /* disable SW LPS 0x04[10]=0 and WLSUS_EN 0x04[12:11]=0*/},     \
+        {0x0075, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0 , BIT0 \
+        /* Disable USB suspend */},     \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT1, BIT1 \
+        /* wait till 0x04[17] = 1    power ready*/},    \
+        {0x0075, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0 , 0 \
+        /* Enable USB suspend */},      \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, BIT0 \
+        /* release WLON reset  0x04[16]=1*/},   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT7, 0 \
+        /* disable HWPDN 0x04[15]=0*/}, \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, (BIT4|BIT3), 0 \
+        /* disable WL suspend*/},       \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, BIT0 \
+        /* polling until return 0*/},   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT0, 0 \
+        /**/},  \
+        {0x004F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, BIT0 \
+        /*0x4C[24] = 0x4F[0] = 1, switch DPDT_SEL_P output from WL BB */},\
+        {0x0067, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, (BIT5|BIT4), (BIT5|BIT4) \
+        /*0x66[13] = 0x67[5] = 1, switch for PAPE_G/PAPE_A      \
+         from WL BB ; 0x66[12] = 0x67[4] = 1, switch LNAON from WL BB */},\
+        {0x0025, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT6, 0 \
+        /*anapar_mac<118> , 0x25[6]=0 by wlan single function*/},\
+        {0x0049, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, BIT1 \
+        /*Enable falling edge triggering interrupt*/},\
+        {0x0063, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, BIT1 \
+        /*Enable GPIO9 interrupt mode*/},\
+        {0x0062, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+        /*Enable GPIO9 input mode*/},\
+        {0x0058, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, BIT0 \
+        /*Enable HSISR GPIO[C:0] interrupt*/},\
+        {0x005A, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, BIT1 \
+        /*Enable HSISR GPIO9 interrupt*/},\
+        {0x007A, PWR_CUT_TESTCHIP_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x3A \
+        /*0x7A = 0x3A start BT*/},\
+        {0x002E, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF , 0x82  \
+        /* 0x2C[23:12]=0x820 ; XTAL trim */}, \
+        {0x0010, PWR_CUT_A_MSK , PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT6 , BIT6  \
+        /* 0x10[6]=1  */},
+
+#define RTL8821A_TRANS_ACT_TO_CARDEMU                                   \
+        {0x001F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0 \
+        /*0x1F[7:0] = 0 turn off RF*/}, \
+        {0x004F, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, 0 \
+        /*0x4C[24] = 0x4F[0] = 0, switch DPDT_SEL_P output from         \
+         register 0x65[2] */},\
+        {0x0049, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+        /*Enable rising edge triggering interrupt*/}, \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, BIT1 \
+         /*0x04[9] = 1 turn off MAC by HW state machine*/},     \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT1, 0 \
+         /*wait till 0x04[9] = 0 polling until return 0 to disable*/},  \
+        {0x0000, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,                      \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT5, BIT5 \
+         /*0x00[5] = 1b'1 analog Ips to digital ,1:isolation*/},   \
+        {0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,              \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, 0 \
+         /*0x20[0] = 1b'0 disable LDOA12 MACRO block*/},
+
+#define RTL8821A_TRANS_CARDEMU_TO_SUS                                   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4|BIT3, (BIT4|BIT3) \
+         /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/},   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,              \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3|BIT4, BIT3 \
+         /*0x04[12:11] = 2b'01 enable WL suspend*/},    \
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4, BIT4 \
+         /*0x23[4] = 1b'1 12H LDO enter sleep mode*/},   \
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x20 \
+         /*0x07[7:0] = 0x20 SDIO SOP option to disable BG/MB/ACK/SWR*/},   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3|BIT4, BIT3|BIT4 \
+         /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/},   \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT0, BIT0 \
+         /*Set SDIO suspend local register*/},  \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT1, 0 \
+         /*wait power state to suspend*/},
+
+#define RTL8821A_TRANS_SUS_TO_CARDEMU                                   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3 | BIT7, 0 \
+         /*clear suspend enable and power down enable*/},       \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT0, 0 \
+         /*Set SDIO suspend local register*/},  \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT1, BIT1 \
+         /*wait power state to suspend*/},\
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4, 0 \
+         /*0x23[4] = 1b'0 12H LDO enter normal mode*/},   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3|BIT4, 0 \
+         /*0x04[12:11] = 2b'01enable WL suspend*/},
+
+#define RTL8821A_TRANS_CARDEMU_TO_CARDDIS                               \
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x20 \
+         /*0x07=0x20 , SOP option to disable BG/MB*/},  \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,              \
+         PWR_INTF_USB_MSK|PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3|BIT4, BIT3 \
+         /*0x04[12:11] = 2b'01 enable WL suspend*/},    \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT2, BIT2 \
+         /*0x04[10] = 1, enable SW LPS*/},      \
+        {0x004A, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, 1 \
+         /*0x48[16] = 1 to enable GPIO9 as EXT WAKEUP*/},   \
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4, BIT4 \
+         /*0x23[4] = 1b'1 12H LDO enter sleep mode*/},   \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT0, BIT0 \
+         /*Set SDIO suspend local register*/},  \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT1, 0 \
+         /*wait power state to suspend*/},
+
+#define RTL8821A_TRANS_CARDDIS_TO_CARDEMU                               \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3 | BIT7, 0 \
+         /*clear suspend enable and power down enable*/},       \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, BIT0, 0 \
+         /*Set SDIO suspend local register*/},  \
+        {0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT1, BIT1 \
+         /*wait power state to suspend*/},\
+        {0x004A, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, 0 \
+         /*0x48[16] = 0 to disable GPIO9 as EXT WAKEUP*/},   \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT3|BIT4, 0 \
+         /*0x04[12:11] = 2b'01enable WL suspend*/},\
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4, 0 \
+         /*0x23[4] = 1b'0 12H LDO enter normal mode*/},   \
+        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0 \
+        /*PCIe DMA start*/},
+
+#define RTL8821A_TRANS_CARDEMU_TO_PDN                                   \
+        {0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4, BIT4 \
+         /*0x23[4] = 1b'1 12H LDO enter sleep mode*/},   \
+        {0x0007, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,              \
+         PWR_INTF_SDIO_MSK|PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x20 \
+         /*0x07[7:0] = 0x20 SOP option to disable BG/MB/ACK/SWR*/},   \
+        {0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, 0 \
+        /* 0x04[16] = 0*/},\
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT7, BIT7 \
+        /* 0x04[15] = 1*/},
+
+#define RTL8821A_TRANS_PDN_TO_CARDEMU                           \
+        {0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT7, 0 \
+        /* 0x04[15] = 0*/},
+
+#define RTL8821A_TRANS_ACT_TO_LPS                                       \
+        {0x0301, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF \
+        /*PCIe DMA stop*/},     \
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF \
+        /*Tx Pause*/},  \
+        {0x05F8, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0 \
+        /*Should be zero if no packet is transmitting*/},       \
+        {0x05F9, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0 \
+        /*Should be zero if no packet is transmitting*/},       \
+        {0x05FA, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0 \
+        /*Should be zero if no packet is transmitting*/},       \
+        {0x05FB, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, 0xFF, 0 \
+        /*Should be zero if no packet is transmitting*/},       \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT0, 0 \
+        /*CCK and OFDM are disabled,and clock are gated*/},     \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_US \
+        /*Delay 1us*/}, \
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+        /*Whole BB is reset*/}, \
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x03 \
+        /*Reset MAC TRX*/},     \
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0 \
+        /*check if removed later*/},    \
+        {0x0093, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x00 \
+        /*When driver enter Sus/ Disable, enable LOP for BT*/}, \
+        {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT5, BIT5 \
+        /*Respond TxOK to scheduler*/},
+
+#define RTL8821A_TRANS_LPS_TO_ACT                                       \
+        {0x0080, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
+        PWR_BASEADDR_SDIO, PWR_CMD_WRITE, 0xFF, 0x84 \
+         /*SDIO RPWM*/},\
+        {0xFE58, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84 \
+         /*USB RPWM*/},\
+        {0x0361, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0x84 \
+         /*PCIe RPWM*/},\
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_DELAY, 0, PWRSEQ_DELAY_MS \
+         /*Delay*/},\
+        {0x0008, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT4, 0 \
+         /*.    0x08[4] = 0              switch TSF to 40M*/},\
+        {0x0109, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_POLLING, BIT7, 0 \
+         /*Polling 0x109[7]=0  TSF in 40M*/},\
+        {0x0029, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT6|BIT7, 0 \
+         /*.    0x29[7:6] = 2b'00        enable BB clock*/},\
+        {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, BIT1 \
+         /*.    0x101[1] = 1*/},\
+        {0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0xFF \
+         /*.    0x100[7:0] = 0xFF        enable WMAC TRX*/},\
+        {0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1|BIT0, BIT1|BIT0 \
+         /*.    0x02[1:0] = 2b'11        enable BB macro*/},\
+        {0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        PWR_BASEADDR_MAC, PWR_CMD_WRITE, 0xFF, 0 \
+         /*.    0x522 = 0*/},
+
+#define RTL8821A_TRANS_END                                      \
+        {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
+        0, PWR_CMD_END, 0, 0},
+
+extern struct wlan_pwr_cfg rtl8821A_power_on_flow
+                [RTL8821A_TRANS_CARDEMU_TO_ACT_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8821A_radio_off_flow
+                [RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8821A_card_disable_flow
+                [RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8821A_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8821A_card_enable_flow
+                [RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8821A_TRANS_CARDEMU_TO_ACT_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8821A_suspend_flow
+                [RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8821A_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8821A_resume_flow
+                [RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8821A_TRANS_CARDEMU_TO_SUS_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8821A_hwpdn_flow
+                [RTL8821A_TRANS_ACT_TO_CARDEMU_STEPS +
+                 RTL8821A_TRANS_CARDEMU_TO_PDN_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8821A_enter_lps_flow
+                [RTL8821A_TRANS_ACT_TO_LPS_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+extern struct wlan_pwr_cfg rtl8821A_leave_lps_flow
+                [RTL8821A_TRANS_LPS_TO_ACT_STEPS +
+                 RTL8821A_TRANS_END_STEPS];
+
+/*RTL8812 Power Configuration CMDs for PCIe interface*/
+#define RTL8812_NIC_PWR_ON_FLOW                 rtl8812_power_on_flow
+#define RTL8812_NIC_RF_OFF_FLOW                 rtl8812_radio_off_flow
+#define RTL8812_NIC_DISABLE_FLOW                rtl8812_card_disable_flow
+#define RTL8812_NIC_ENABLE_FLOW                 rtl8812_card_enable_flow
+#define RTL8812_NIC_SUSPEND_FLOW                rtl8812_suspend_flow
+#define RTL8812_NIC_RESUME_FLOW                 rtl8812_resume_flow
+#define RTL8812_NIC_PDN_FLOW                    rtl8812_hwpdn_flow
+#define RTL8812_NIC_LPS_ENTER_FLOW              rtl8812_enter_lps_flow
+#define RTL8812_NIC_LPS_LEAVE_FLOW              rtl8812_leave_lps_flow
+
+/* RTL8821 Power Configuration CMDs for PCIe interface */
+#define RTL8821A_NIC_PWR_ON_FLOW                rtl8821A_power_on_flow
+#define RTL8821A_NIC_RF_OFF_FLOW                rtl8821A_radio_off_flow
+#define RTL8821A_NIC_DISABLE_FLOW               rtl8821A_card_disable_flow
+#define RTL8821A_NIC_ENABLE_FLOW                rtl8821A_card_enable_flow
+#define RTL8821A_NIC_SUSPEND_FLOW               rtl8821A_suspend_flow
+#define RTL8821A_NIC_RESUME_FLOW                rtl8821A_resume_flow
+#define RTL8821A_NIC_PDN_FLOW                   rtl8821A_hwpdn_flow
+#define RTL8821A_NIC_LPS_ENTER_FLOW             rtl8821A_enter_lps_flow
+#define RTL8821A_NIC_LPS_LEAVE_FLOW             rtl8821A_leave_lps_flow
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/reg.h b/drivers/net/wireless/rtlwifi/rtl8821ae/reg.h
new file mode 100644
index 000000000000..53668fc8f23e
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/reg.h
@@ -0,0 +1,2464 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_REG_H__
+#define __RTL8821AE_REG_H__
+
+#define TXPKT_BUF_SELECT                        0x69
+#define RXPKT_BUF_SELECT                        0xA5
+#define DISABLE_TRXPKT_BUF_ACCESS               0x0
+
+#define REG_SYS_ISO_CTRL                        0x0000
+#define REG_SYS_FUNC_EN                         0x0002
+#define REG_APS_FSMCO                           0x0004
+#define REG_SYS_CLKR                            0x0008
+#define REG_9346CR                              0x000A
+#define REG_EE_VPD                              0x000C
+#define REG_AFE_MISC                            0x0010
+#define REG_SPS0_CTRL                           0x0011
+#define REG_SPS_OCP_CFG                         0x0018
+#define REG_RSV_CTRL                            0x001C
+#define REG_RF_CTRL                             0x001F
+#define REG_LDOA15_CTRL                         0x0020
+#define REG_LDOV12D_CTRL                        0x0021
+#define REG_LDOHCI12_CTRL                       0x0022
+#define REG_LPLDO_CTRL                          0x0023
+#define REG_AFE_XTAL_CTRL                       0x0024
+ /* 1.5v for 8188EE test chip, 1.4v for MP chip */
+#define REG_AFE_LDO_CTRL                        0x0027
+#define REG_AFE_PLL_CTRL                        0x0028
+#define REG_MAC_PHY_CTRL                        0x002c
+#define REG_EFUSE_CTRL                          0x0030
+#define REG_EFUSE_TEST                          0x0034
+#define REG_PWR_DATA                            0x0038
+#define REG_CAL_TIMER                           0x003C
+#define REG_ACLK_MON                            0x003E
+#define REG_GPIO_MUXCFG                         0x0040
+#define REG_GPIO_IO_SEL                         0x0042
+#define REG_MAC_PINMUX_CFG                      0x0043
+#define REG_GPIO_PIN_CTRL                       0x0044
+#define REG_GPIO_INTM                           0x0048
+#define REG_LEDCFG0                             0x004C
+#define REG_LEDCFG1                             0x004D
+#define REG_LEDCFG2                             0x004E
+#define REG_LEDCFG3                             0x004F
+#define REG_FSIMR                               0x0050
+#define REG_FSISR                               0x0054
+#define REG_HSIMR                               0x0058
+#define REG_HSISR                               0x005c
+#define REG_GPIO_PIN_CTRL_2                     0x0060
+#define REG_GPIO_IO_SEL_2                       0x0062
+#define REG_MULTI_FUNC_CTRL                     0x0068
+#define REG_GPIO_OUTPUT                         0x006c
+#define REG_OPT_CTRL                            0x0074
+#define REG_AFE_XTAL_CTRL_EXT                   0x0078
+#define REG_XCK_OUT_CTRL                        0x007c
+#define REG_MCUFWDL                             0x0080
+#define REG_WOL_EVENT                           0x0081
+#define REG_MCUTSTCFG                           0x0084
+
+#define REG_HIMR                                0x00B0
+#define REG_HISR                                0x00B4
+#define REG_HIMRE                               0x00B8
+#define REG_HISRE                               0x00BC
+
+#define REG_PMC_DBG_CTRL2                       0x00CC
+
+#define REG_EFUSE_ACCESS                        0x00CF
+
+#define REG_BIST_SCAN                           0x00D0
+#define REG_BIST_RPT                            0x00D4
+#define REG_BIST_ROM_RPT                        0x00D8
+#define REG_USB_SIE_INTF                        0x00E0
+#define REG_PCIE_MIO_INTF                       0x00E4
+#define REG_PCIE_MIO_INTD                       0x00E8
+#define REG_HPON_FSM                            0x00EC
+#define REG_SYS_CFG                             0x00F0
+#define REG_GPIO_OUTSTS                         0x00F4
+#define REG_MAC_PHY_CTRL_NORMAL                 0x00F8
+#define REG_SYS_CFG1                            0x00FC
+#define REG_ROM_VERSION                         0x00FD
+
+#define REG_CR                                  0x0100
+#define REG_PBP                                 0x0104
+#define REG_PKT_BUFF_ACCESS_CTRL                0x0106
+#define REG_TRXDMA_CTRL                         0x010C
+#define REG_TRXFF_BNDY                          0x0114
+#define REG_TRXFF_STATUS                        0x0118
+#define REG_RXFF_PTR                            0x011C
+
+#define REG_CPWM                                0x012F
+#define REG_FWIMR                               0x0130
+#define REG_FWISR                               0x0134
+#define REG_FTISR                               0x013C
+#define REG_PKTBUF_DBG_CTRL                     0x0140
+#define REG_PKTBUF_DBG_DATA_L                   0x0144
+#define REG_PKTBUF_DBG_DATA_H                   0x0148
+#define REG_RXPKTBUF_CTRL                       (REG_PKTBUF_DBG_CTRL+2)
+
+#define REG_TC0_CTRL                            0x0150
+#define REG_TC1_CTRL                            0x0154
+#define REG_TC2_CTRL                            0x0158
+#define REG_TC3_CTRL                            0x015C
+#define REG_TC4_CTRL                            0x0160
+#define REG_TCUNIT_BASE                         0x0164
+#define REG_MBIST_START                         0x0174
+#define REG_MBIST_DONE                          0x0178
+#define REG_MBIST_FAIL                          0x017C
+#define REG_32K_CTRL                            0x0194
+#define REG_C2HEVT_MSG_NORMAL                   0x01A0
+#define REG_C2HEVT_CLEAR                        0x01AF
+#define REG_C2HEVT_MSG_TEST                     0x01B8
+#define REG_MCUTST_1                            0x01c0
+#define REG_MCUTST_WOWLAN                       0x01C7
+#define REG_FMETHR                              0x01C8
+#define REG_HMETFR                              0x01CC
+#define REG_HMEBOX_0                            0x01D0
+#define REG_HMEBOX_1                            0x01D4
+#define REG_HMEBOX_2                            0x01D8
+#define REG_HMEBOX_3                            0x01DC
+
+#define REG_LLT_INIT                            0x01E0
+#define REG_BB_ACCEESS_CTRL                     0x01E8
+#define REG_BB_ACCESS_DATA                      0x01EC
+
+#define REG_HMEBOX_EXT_0                        0x01F0
+#define REG_HMEBOX_EXT_1                        0x01F4
+#define REG_HMEBOX_EXT_2                        0x01F8
+#define REG_HMEBOX_EXT_3                        0x01FC
+
+#define REG_RQPN                                0x0200
+#define REG_FIFOPAGE                            0x0204
+#define REG_TDECTRL                             0x0208
+#define REG_TXDMA_OFFSET_CHK                    0x020C
+#define REG_TXDMA_STATUS                        0x0210
+#define REG_RQPN_NPQ                            0x0214
+
+#define REG_RXDMA_AGG_PG_TH                     0x0280
+ /* FW shall update this register before FW write RXPKT_RELEASE_POLL to 1 */
+#define REG_FW_UPD_RDPTR                        0x0284
+ /* Control the RX DMA.*/
+#define REG_RXDMA_CONTROL                       0x0286
+/* The number of packets in RXPKTBUF.   */
+#define REG_RXPKT_NUM                           0x0287
+
+#define REG_PCIE_CTRL_REG                       0x0300
+#define REG_INT_MIG                             0x0304
+#define REG_BCNQ_DESA                           0x0308
+#define REG_HQ_DESA                             0x0310
+#define REG_MGQ_DESA                            0x0318
+#define REG_VOQ_DESA                            0x0320
+#define REG_VIQ_DESA                            0x0328
+#define REG_BEQ_DESA                            0x0330
+#define REG_BKQ_DESA                            0x0338
+#define REG_RX_DESA                             0x0340
+
+#define REG_DBI_WDATA                           0x0348
+#define REG_DBI_RDATA                           0x034C
+#define REG_DBI_CTRL                            0x0350
+#define REG_DBI_ADDR                            0x0350
+#define REG_DBI_FLAG                            0x0352
+#define REG_MDIO_WDATA                          0x0354
+#define REG_MDIO_RDATA                          0x0356
+#define REG_MDIO_CTL                            0x0358
+#define REG_DBG_SEL                             0x0360
+#define REG_PCIE_HRPWM                          0x0361
+#define REG_PCIE_HCPWM                          0x0363
+#define REG_UART_CTRL                           0x0364
+#define REG_WATCH_DOG                           0x0368
+#define REG_UART_TX_DESA                        0x0370
+#define REG_UART_RX_DESA                        0x0378
+
+#define REG_HDAQ_DESA_NODEF                     0x0000
+#define REG_CMDQ_DESA_NODEF                     0x0000
+
+#define REG_VOQ_INFORMATION                     0x0400
+#define REG_VIQ_INFORMATION                     0x0404
+#define REG_BEQ_INFORMATION                     0x0408
+#define REG_BKQ_INFORMATION                     0x040C
+#define REG_MGQ_INFORMATION                     0x0410
+#define REG_HGQ_INFORMATION                     0x0414
+#define REG_BCNQ_INFORMATION                    0x0418
+#define REG_TXPKT_EMPTY                         0x041A
+
+#define REG_CPU_MGQ_INFORMATION                 0x041C
+#define REG_FWHW_TXQ_CTRL                       0x0420
+#define REG_HWSEQ_CTRL                          0x0423
+#define REG_TXPKTBUF_BCNQ_BDNY                  0x0424
+#define REG_TXPKTBUF_MGQ_BDNY                   0x0425
+#define REG_MULTI_BCNQ_EN                       0x0426
+#define REG_MULTI_BCNQ_OFFSET                   0x0427
+#define REG_SPEC_SIFS                           0x0428
+#define REG_RL                                  0x042A
+#define REG_DARFRC                              0x0430
+#define REG_RARFRC                              0x0438
+#define REG_RRSR                                0x0440
+#define REG_ARFR0                               0x0444
+#define REG_ARFR1                               0x044C
+#define REG_CCK_CHECK                           0x0454
+#define REG_AMPDU_MAX_TIME                      0x0456
+#define REG_AGGLEN_LMT                          0x0458
+#define REG_AMPDU_MIN_SPACE                     0x045C
+#define REG_TXPKTBUF_WMAC_LBK_BF_HD             0x045D
+#define REG_FAST_EDCA_CTRL                      0x0460
+#define REG_RD_RESP_PKT_TH                      0x0463
+#define REG_INIRTS_RATE_SEL                     0x0480
+#define REG_INIDATA_RATE_SEL                    0x0484
+#define REG_ARFR2                               0x048C
+#define REG_ARFR3                               0x0494
+#define REG_POWER_STATUS                        0x04A4
+#define REG_POWER_STAGE1                        0x04B4
+#define REG_POWER_STAGE2                        0x04B8
+#define REG_PKT_LIFE_TIME                       0x04C0
+#define REG_STBC_SETTING                        0x04C4
+#define REG_HT_SINGLE_AMPDU                     0x04C7
+#define REG_PROT_MODE_CTRL                      0x04C8
+#define REG_MAX_AGGR_NUM                        0x04CA
+#define REG_BAR_MODE_CTRL                       0x04CC
+#define REG_RA_TRY_RATE_AGG_LMT                 0x04CF
+#define REG_EARLY_MODE_CONTROL                  0x04D0
+#define REG_NQOS_SEQ                            0x04DC
+#define REG_QOS_SEQ                             0x04DE
+#define REG_NEED_CPU_HANDLE                     0x04E0
+#define REG_PKT_LOSE_RPT                        0x04E1
+#define REG_PTCL_ERR_STATUS                     0x04E2
+#define REG_TX_RPT_CTRL                         0x04EC
+#define REG_TX_RPT_TIME                         0x04F0
+#define REG_DUMMY                               0x04FC
+
+#define REG_EDCA_VO_PARAM                       0x0500
+#define REG_EDCA_VI_PARAM                       0x0504
+#define REG_EDCA_BE_PARAM                       0x0508
+#define REG_EDCA_BK_PARAM                       0x050C
+#define REG_BCNTCFG                             0x0510
+#define REG_PIFS                                0x0512
+#define REG_RDG_PIFS                            0x0513
+#define REG_SIFS_CTX                            0x0514
+#define REG_SIFS_TRX                            0x0516
+#define REG_AGGR_BREAK_TIME                     0x051A
+#define REG_SLOT                                0x051B
+#define REG_TX_PTCL_CTRL                        0x0520
+#define REG_TXPAUSE                             0x0522
+#define REG_DIS_TXREQ_CLR                       0x0523
+#define REG_RD_CTRL                             0x0524
+#define REG_TBTT_PROHIBIT                       0x0540
+#define REG_RD_NAV_NXT                          0x0544
+#define REG_NAV_PROT_LEN                        0x0546
+#define REG_BCN_CTRL                            0x0550
+#define REG_USTIME_TSF                          0x0551
+#define REG_MBID_NUM                            0x0552
+#define REG_DUAL_TSF_RST                        0x0553
+#define REG_BCN_INTERVAL                        0x0554
+#define REG_MBSSID_BCN_SPACE                    0x0554
+#define REG_DRVERLYINT                          0x0558
+#define REG_BCNDMATIM                           0x0559
+#define REG_ATIMWND                             0x055A
+#define REG_BCN_MAX_ERR                         0x055D
+#define REG_RXTSF_OFFSET_CCK                    0x055E
+#define REG_RXTSF_OFFSET_OFDM                   0x055F
+#define REG_TSFTR                               0x0560
+#define REG_INIT_TSFTR                          0x0564
+#define REG_SECONDARY_CCA_CTRL                  0x0577
+#define REG_PSTIMER                             0x0580
+#define REG_TIMER0                              0x0584
+#define REG_TIMER1                              0x0588
+#define REG_ACMHWCTRL                           0x05C0
+#define REG_ACMRSTCTRL                          0x05C1
+#define REG_ACMAVG                              0x05C2
+#define REG_VO_ADMTIME                          0x05C4
+#define REG_VI_ADMTIME                          0x05C6
+#define REG_BE_ADMTIME                          0x05C8
+#define REG_EDCA_RANDOM_GEN                     0x05CC
+#define REG_NOA_DESC_SEL                        0x05CF
+#define REG_NOA_DESC_DURATION                   0x05E0
+#define REG_NOA_DESC_INTERVAL                   0x05E4
+#define REG_NOA_DESC_START                      0x05E8
+#define REG_NOA_DESC_COUNT                      0x05EC
+#define REG_SCH_TXCMD                           0x05F8
+
+#define REG_APSD_CTRL                           0x0600
+#define REG_BWOPMODE                            0x0603
+#define REG_TCR                                 0x0604
+#define REG_RCR                                 0x0608
+#define REG_RX_PKT_LIMIT                        0x060C
+#define REG_RX_DLK_TIME                         0x060D
+#define REG_RX_DRVINFO_SZ                       0x060F
+
+#define REG_MACID                               0x0610
+#define REG_BSSID                               0x0618
+#define REG_MAR                                 0x0620
+#define REG_MBIDCAMCFG                          0x0628
+
+#define REG_USTIME_EDCA                         0x0638
+#define REG_MAC_SPEC_SIFS                       0x063A
+#define REG_RESP_SIFS_CCK                       0x063C
+#define REG_RESP_SIFS_OFDM                      0x063E
+#define REG_ACKTO                               0x0640
+#define REG_CTS2TO                              0x0641
+#define REG_EIFS                                0x0642
+
+#define REG_NAV_CTRL                            0x0650
+#define REG_NAV_UPPER                           0x0652
+#define REG_BACAMCMD                            0x0654
+#define REG_BACAMCONTENT                        0x0658
+#define REG_LBDLY                               0x0660
+#define REG_FWDLY                               0x0661
+#define REG_RXERR_RPT                           0x0664
+#define REG_TRXPTCL_CTL                         0x0668
+
+#define REG_CAMCMD                              0x0670
+#define REG_CAMWRITE                            0x0674
+#define REG_CAMREAD                             0x0678
+#define REG_CAMDBG                              0x067C
+#define REG_SECCFG                              0x0680
+
+#define REG_WOW_CTRL                            0x0690
+#define REG_PSSTATUS                            0x0691
+#define REG_PS_RX_INFO                          0x0692
+#define REG_UAPSD_TID                           0x0693
+#define REG_LPNAV_CTRL                          0x0694
+#define REG_WKFMCAM_NUM                         0x0698
+#define REG_WKFMCAM_RWD                         0x069C
+#define REG_RXFLTMAP0                           0x06A0
+#define REG_RXFLTMAP1                           0x06A2
+#define REG_RXFLTMAP2                           0x06A4
+#define REG_BCN_PSR_RPT                         0x06A8
+#define REG_CALB32K_CTRL                        0x06AC
+#define REG_PKT_MON_CTRL                        0x06B4
+#define REG_BT_COEX_TABLE                       0x06C0
+#define REG_WMAC_RESP_TXINFO                    0x06D8
+
+#define REG_USB_INFO                            0xFE17
+#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_DMA_AGG_TO                      0xFE5B
+#define REG_USB_AGG_TO                          0xFE5C
+#define REG_USB_AGG_TH                          0xFE5D
+
+#define REG_TEST_USB_TXQS                       0xFE48
+#define REG_TEST_SIE_VID                        0xFE60
+#define REG_TEST_SIE_PID                        0xFE62
+#define REG_TEST_SIE_OPTIONAL                   0xFE64
+#define REG_TEST_SIE_CHIRP_K                    0xFE65
+#define REG_TEST_SIE_PHY                        0xFE66
+#define REG_TEST_SIE_MAC_ADDR                   0xFE70
+#define REG_TEST_SIE_STRING                     0xFE80
+
+#define REG_NORMAL_SIE_VID                      0xFE60
+#define REG_NORMAL_SIE_PID                      0xFE62
+#define REG_NORMAL_SIE_OPTIONAL                 0xFE64
+#define REG_NORMAL_SIE_EP                       0xFE65
+#define REG_NORMAL_SIE_PHY                      0xFE68
+#define REG_NORMAL_SIE_MAC_ADDR                 0xFE70
+#define REG_NORMAL_SIE_STRING                   0xFE80
+
+#define CR9346                                  REG_9346CR
+#define MSR                                     (REG_CR + 2)
+#define ISR                                     REG_HISR
+#define TSFR                                    REG_TSFTR
+
+#define MACIDR0                                 REG_MACID
+#define MACIDR4                                 (REG_MACID + 4)
+
+#define PBP                                     REG_PBP
+
+#define IDR0                                    MACIDR0
+#define IDR4                                    MACIDR4
+
+#define UNUSED_REGISTER                         0x1BF
+#define DCAM                                    UNUSED_REGISTER
+#define PSR                                     UNUSED_REGISTER
+#define BBADDR                                  UNUSED_REGISTER
+#define PHYDATAR                                UNUSED_REGISTER
+
+#define INVALID_BBRF_VALUE                      0x12345678
+
+#define MAX_MSS_DENSITY_2T                      0x13
+#define MAX_MSS_DENSITY_1T                      0x0A
+
+#define CMDEEPROM_EN                            BIT(5)
+#define CMDEEPROM_SEL                           BIT(4)
+#define CMD9346CR_9356SEL                       BIT(4)
+#define AUTOLOAD_EEPROM                 (CMDEEPROM_EN|CMDEEPROM_SEL)
+#define AUTOLOAD_EFUSE                  CMDEEPROM_EN
+
+#define GPIOSEL_GPIO                            0
+#define GPIOSEL_ENBT                            BIT(5)
+
+#define GPIO_IN                         REG_GPIO_PIN_CTRL
+#define GPIO_OUT                        (REG_GPIO_PIN_CTRL+1)
+#define GPIO_IO_SEL                     (REG_GPIO_PIN_CTRL+2)
+#define GPIO_MOD                        (REG_GPIO_PIN_CTRL+3)
+
+/*    8723/8188E Host System Interrupt Mask Register (offset 0x58, 32 byte) */
+#define HSIMR_GPIO12_0_INT_EN                   BIT(0)
+#define HSIMR_SPS_OCP_INT_EN                    BIT(5)
+#define HSIMR_RON_INT_EN                        BIT(6)
+#define HSIMR_PDN_INT_EN                        BIT(7)
+#define HSIMR_GPIO9_INT_EN                      BIT(25)
+
+/* 8723/8188E Host System Interrupt Status Register (offset 0x5C, 32 byte) */
+#define HSISR_GPIO12_0_INT                      BIT(0)
+#define HSISR_SPS_OCP_INT                       BIT(5)
+#define HSISR_RON_INT_EN                        BIT(6)
+#define HSISR_PDNINT                            BIT(7)
+#define HSISR_GPIO9_INT                         BIT(25)
+
+#define MSR_NOLINK                              0x00
+#define MSR_ADHOC                               0x01
+#define MSR_INFRA                               0x02
+#define MSR_AP                                  0x03
+
+#define RRSR_RSC_OFFSET                         21
+#define RRSR_SHORT_OFFSET                       23
+#define RRSR_RSC_BW_40M                         0x600000
+#define RRSR_RSC_UPSUBCHNL                      0x400000
+#define RRSR_RSC_LOWSUBCHNL                     0x200000
+#define RRSR_SHORT                              0x800000
+#define RRSR_1M                                 BIT(0)
+#define RRSR_2M                                 BIT(1)
+#define RRSR_5_5M                               BIT(2)
+#define RRSR_11M                                BIT(3)
+#define RRSR_6M                                 BIT(4)
+#define RRSR_9M                                 BIT(5)
+#define RRSR_12M                                BIT(6)
+#define RRSR_18M                                BIT(7)
+#define RRSR_24M                                BIT(8)
+#define RRSR_36M                                BIT(9)
+#define RRSR_48M                                BIT(10)
+#define RRSR_54M                                BIT(11)
+#define RRSR_MCS0                               BIT(12)
+#define RRSR_MCS1                               BIT(13)
+#define RRSR_MCS2                               BIT(14)
+#define RRSR_MCS3                               BIT(15)
+#define RRSR_MCS4                               BIT(16)
+#define RRSR_MCS5                               BIT(17)
+#define RRSR_MCS6                               BIT(18)
+#define RRSR_MCS7                               BIT(19)
+#define BRSR_ACKSHORTPMB                        BIT(23)
+
+#define RATR_1M                                 0x00000001
+#define RATR_2M                                 0x00000002
+#define RATR_55M                                0x00000004
+#define RATR_11M                                0x00000008
+#define RATR_6M                                 0x00000010
+#define RATR_9M                                 0x00000020
+#define RATR_12M                                0x00000040
+#define RATR_18M                                0x00000080
+#define RATR_24M                                0x00000100
+#define RATR_36M                                0x00000200
+#define RATR_48M                                0x00000400
+#define RATR_54M                                0x00000800
+#define RATR_MCS0                               0x00001000
+#define RATR_MCS1                               0x00002000
+#define RATR_MCS2                               0x00004000
+#define RATR_MCS3                               0x00008000
+#define RATR_MCS4                               0x00010000
+#define RATR_MCS5                               0x00020000
+#define RATR_MCS6                               0x00040000
+#define RATR_MCS7                               0x00080000
+#define RATR_MCS8                               0x00100000
+#define RATR_MCS9                               0x00200000
+#define RATR_MCS10                              0x00400000
+#define RATR_MCS11                              0x00800000
+#define RATR_MCS12                              0x01000000
+#define RATR_MCS13                              0x02000000
+#define RATR_MCS14                              0x04000000
+#define RATR_MCS15                              0x08000000
+
+#define RATE_1M                                 BIT(0)
+#define RATE_2M                                 BIT(1)
+#define RATE_5_5M                               BIT(2)
+#define RATE_11M                                BIT(3)
+#define RATE_6M                                 BIT(4)
+#define RATE_9M                                 BIT(5)
+#define RATE_12M                                BIT(6)
+#define RATE_18M                                BIT(7)
+#define RATE_24M                                BIT(8)
+#define RATE_36M                                BIT(9)
+#define RATE_48M                                BIT(10)
+#define RATE_54M                                BIT(11)
+#define RATE_MCS0                               BIT(12)
+#define RATE_MCS1                               BIT(13)
+#define RATE_MCS2                               BIT(14)
+#define RATE_MCS3                               BIT(15)
+#define RATE_MCS4                               BIT(16)
+#define RATE_MCS5                               BIT(17)
+#define RATE_MCS6                               BIT(18)
+#define RATE_MCS7                               BIT(19)
+#define RATE_MCS8                               BIT(20)
+#define RATE_MCS9                               BIT(21)
+#define RATE_MCS10                              BIT(22)
+#define RATE_MCS11                              BIT(23)
+#define RATE_MCS12                              BIT(24)
+#define RATE_MCS13                              BIT(25)
+#define RATE_MCS14                              BIT(26)
+#define RATE_MCS15                              BIT(27)
+
+#define RATE_ALL_CCK            (RATR_1M | RATR_2M | RATR_55M | RATR_11M)
+#define RATE_ALL_OFDM_AG        (RATR_6M | RATR_9M | RATR_12M | RATR_18M |\
+                                RATR_24M | RATR_36M | RATR_48M | RATR_54M)
+#define RATE_ALL_OFDM_1SS       (RATR_MCS0 | RATR_MCS1 | RATR_MCS2 |\
+                                RATR_MCS3 | RATR_MCS4 | RATR_MCS5 |\
+                                RATR_MCS6 | RATR_MCS7)
+#define RATE_ALL_OFDM_2SS       (RATR_MCS8 | RATR_MCS9 | RATR_MCS10 |\
+                                RATR_MCS11 | RATR_MCS12 | RATR_MCS13 |\
+                                RATR_MCS14 | RATR_MCS15)
+
+#define BW_OPMODE_20MHZ                         BIT(2)
+#define BW_OPMODE_5G                            BIT(1)
+#define BW_OPMODE_11J                           BIT(0)
+
+#define CAM_VALID                               BIT(15)
+#define CAM_NOTVALID                            0x0000
+#define CAM_USEDK                               BIT(5)
+
+#define CAM_NONE                                0x0
+#define CAM_WEP40                               0x01
+#define CAM_TKIP                                0x02
+#define CAM_AES                                 0x04
+#define CAM_WEP104                              0x05
+
+#define TOTAL_CAM_ENTRY                         32
+#define HALF_CAM_ENTRY                          16
+
+#define CAM_WRITE                               BIT(16)
+#define CAM_READ                                0x00000000
+#define CAM_POLLINIG                            BIT(31)
+
+#define SCR_USEDK                               0x01
+#define SCR_TXSEC_ENABLE                        0x02
+#define SCR_RXSEC_ENABLE                        0x04
+
+#define WOW_PMEN                                BIT(0)
+#define WOW_WOMEN                               BIT(1)
+#define WOW_MAGIC                               BIT(2)
+#define WOW_UWF                                 BIT(3)
+
+/*********************************************
+*       8188 IMR/ISR bits
+**********************************************/
+#define IMR_DISABLED                            0x0
+/* IMR DW0(0x0060-0063) Bit 0-31 */
+/* TXRPT interrupt when CCX bit of the packet is set    */
+#define IMR_TXCCK                               BIT(30)
+/* Power Save Time Out Interrupt */
+#define IMR_PSTIMEOUT                           BIT(29)
+/* When GTIMER4 expires, this bit is set to 1   */
+#define IMR_GTINT4                              BIT(28)
+/* When GTIMER3 expires, this bit is set to 1   */
+#define IMR_GTINT3                              BIT(27)
+/* Transmit Beacon0 Error                       */
+#define IMR_TBDER                               BIT(26)
+/* Transmit Beacon0 OK                  */
+#define IMR_TBDOK                               BIT(25)
+/* TSF Timer BIT32 toggle indication interrupt          */
+#define IMR_TSF_BIT32_TOGGLE                    BIT(24)
+/* Beacon DMA Interrupt 0                       */
+#define IMR_BCNDMAINT0                          BIT(20)
+/* Beacon Queue DMA OK0                 */
+#define IMR_BCNDOK0                             BIT(16)
+/* HSISR Indicator (HSIMR & HSISR is true, this bit is set to 1) */
+#define IMR_HSISR_IND_ON_INT                    BIT(15)
+/* Beacon DMA Interrupt Extension for Win7                      */
+#define IMR_BCNDMAINT_E                         BIT(14)
+/* CTWidnow End or ATIM Window End */
+#define IMR_ATIMEND                             BIT(12)
+/* HISR1 Indicator (HISR1 & HIMR1 is true, this bit is set to 1)*/
+#define IMR_HISR1_IND_INT                       BIT(11)
+/* CPU to Host Command INT Status, Write 1 clear        */
+#define IMR_C2HCMD                              BIT(10)
+/* CPU power Mode exchange INT Status, Write 1 clear    */
+#define IMR_CPWM2                               BIT(9)
+/* CPU power Mode exchange INT Status, Write 1 clear    */
+#define IMR_CPWM                                BIT(8)
+/* High Queue DMA OK    */
+#define IMR_HIGHDOK                             BIT(7)
+/* Management Queue DMA OK      */
+#define IMR_MGNTDOK                             BIT(6)
+/* AC_BK DMA OK         */
+#define IMR_BKDOK                               BIT(5)
+/* AC_BE DMA OK */
+#define IMR_BEDOK                               BIT(4)
+/* AC_VI DMA OK */
+#define IMR_VIDOK                               BIT(3)
+/* AC_VO DMA OK */
+#define IMR_VODOK                               BIT(2)
+/* Rx Descriptor Unavailable    */
+#define IMR_RDU                                 BIT(1)
+#define IMR_ROK                                 BIT(0)  /* Receive DMA OK */
+
+/* IMR DW1(0x00B4-00B7) Bit 0-31 */
+/* Beacon DMA Interrupt 7       */
+#define IMR_BCNDMAINT7                          BIT(27)
+/* Beacon DMA Interrupt 6               */
+#define IMR_BCNDMAINT6                          BIT(26)
+/* Beacon DMA Interrupt 5               */
+#define IMR_BCNDMAINT5                          BIT(25)
+/* Beacon DMA Interrupt 4               */
+#define IMR_BCNDMAINT4                          BIT(24)
+/* Beacon DMA Interrupt 3               */
+#define IMR_BCNDMAINT3                          BIT(23)
+/* Beacon DMA Interrupt 2               */
+#define IMR_BCNDMAINT2                          BIT(22)
+/* Beacon DMA Interrupt 1               */
+#define IMR_BCNDMAINT1                          BIT(21)
+/* Beacon Queue DMA OK Interrup 7 */
+#define IMR_BCNDOK7                             BIT(20)
+/* Beacon Queue DMA OK Interrup 6 */
+#define IMR_BCNDOK6                             BIT(19)
+/* Beacon Queue DMA OK Interrup 5 */
+#define IMR_BCNDOK5                             BIT(18)
+/* Beacon Queue DMA OK Interrup 4 */
+#define IMR_BCNDOK4                             BIT(17)
+/* Beacon Queue DMA OK Interrup 3 */
+#define IMR_BCNDOK3                             BIT(16)
+/* Beacon Queue DMA OK Interrup 2 */
+#define IMR_BCNDOK2                             BIT(15)
+/* Beacon Queue DMA OK Interrup 1 */
+#define IMR_BCNDOK1                             BIT(14)
+/* ATIM Window End Extension for Win7 */
+#define IMR_ATIMEND_E                           BIT(13)
+/* Tx Error Flag Interrupt Status, write 1 clear. */
+#define IMR_TXERR                               BIT(11)
+/* Rx Error Flag INT Status, Write 1 clear */
+#define IMR_RXERR                               BIT(10)
+/* Transmit FIFO Overflow */
+#define IMR_TXFOVW                              BIT(9)
+/* Receive FIFO Overflow */
+#define IMR_RXFOVW                              BIT(8)
+
+#define HWSET_MAX_SIZE                          512
+#define   EFUSE_MAX_SECTION                     64
+#define   EFUSE_REAL_CONTENT_LEN                256
+/* PG data exclude header, dummy 7 bytes frome CP test and reserved 1byte.*/
+#define         EFUSE_OOB_PROTECT_BYTES         18
+
+#define EEPROM_DEFAULT_TSSI                     0x0
+#define EEPROM_DEFAULT_TXPOWERDIFF              0x0
+#define EEPROM_DEFAULT_CRYSTALCAP               0x5
+#define EEPROM_DEFAULT_BOARDTYPE                0x02
+#define EEPROM_DEFAULT_TXPOWER                  0x1010
+#define EEPROM_DEFAULT_HT2T_TXPWR               0x10
+
+#define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
+#define EEPROM_DEFAULT_THERMALMETER             0x18
+#define EEPROM_DEFAULT_ANTTXPOWERDIFF           0x0
+#define EEPROM_DEFAULT_TXPWDIFF_CRYSTALCAP      0x5
+#define EEPROM_DEFAULT_TXPOWERLEVEL             0x22
+#define EEPROM_DEFAULT_HT40_2SDIFF              0x0
+#define EEPROM_DEFAULT_HT20_DIFF                2
+#define EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF      0x3
+#define EEPROM_DEFAULT_HT40_PWRMAXOFFSET        0
+#define EEPROM_DEFAULT_HT20_PWRMAXOFFSET        0
+
+#define RF_OPTION1                              0x79
+#define RF_OPTION2                              0x7A
+#define RF_OPTION3                              0x7B
+#define RF_OPTION4                              0xC3
+
+#define EEPROM_DEFAULT_PID                      0x1234
+#define EEPROM_DEFAULT_VID                      0x5678
+#define EEPROM_DEFAULT_CUSTOMERID               0xAB
+#define EEPROM_DEFAULT_SUBCUSTOMERID            0xCD
+#define EEPROM_DEFAULT_VERSION                  0
+
+#define EEPROM_CHANNEL_PLAN_FCC                 0x0
+#define EEPROM_CHANNEL_PLAN_IC                  0x1
+#define EEPROM_CHANNEL_PLAN_ETSI                0x2
+#define EEPROM_CHANNEL_PLAN_SPAIN               0x3
+#define EEPROM_CHANNEL_PLAN_FRANCE              0x4
+#define EEPROM_CHANNEL_PLAN_MKK                 0x5
+#define EEPROM_CHANNEL_PLAN_MKK1                0x6
+#define EEPROM_CHANNEL_PLAN_ISRAEL              0x7
+#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_BY_HW_MASK          0x80
+
+#define EEPROM_CID_DEFAULT                      0x0
+#define EEPROM_CID_TOSHIBA                      0x4
+#define EEPROM_CID_CCX                          0x10
+#define EEPROM_CID_QMI                          0x0D
+#define EEPROM_CID_WHQL                         0xFE
+
+#define RTL_EEPROM_ID                           0x8129
+
+#define EEPROM_HPON                             0x02
+#define EEPROM_CLK                              0x06
+#define EEPROM_TESTR                            0x08
+
+#define EEPROM_TXPOWERCCK                       0x10
+#define EEPROM_TXPOWERHT40_1S                   0x16
+#define EEPROM_TXPOWERHT20DIFF                  0x1B
+#define EEPROM_TXPOWER_OFDMDIFF                 0x1B
+
+#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_RF_BOARD_OPTION                  0xC1
+#define EEPROM_RF_FEATURE_OPTION_88E            0xC2
+#define EEPROM_RF_BT_SETTING                    0xC3
+#define EEPROM_VERSION                          0xC4
+#define EEPROM_CUSTOMER_ID                      0xC5
+#define EEPROM_RF_ANTENNA_OPT_88E               0xC9
+#define EEPROM_RFE_OPTION                       0xCA
+
+#define EEPROM_MAC_ADDR                         0xD0
+#define EEPROM_VID                              0xD6
+#define EEPROM_DID                              0xD8
+#define EEPROM_SVID                             0xDA
+#define EEPROM_SMID                             0xDC
+
+#define STOPBECON                               BIT(6)
+#define STOPHIGHT                               BIT(5)
+#define STOPMGT                                 BIT(4)
+#define STOPVO                                  BIT(3)
+#define STOPVI                                  BIT(2)
+#define STOPBE                                  BIT(1)
+#define STOPBK                                  BIT(0)
+
+#define RCR_APPFCS                              BIT(31)
+#define RCR_APP_MIC                             BIT(30)
+#define RCR_APP_ICV                             BIT(29)
+#define RCR_APP_PHYST_RXFF                      BIT(28)
+#define RCR_APP_BA_SSN                          BIT(27)
+#define RCR_NONQOS_VHT                          BIT(26)
+#define RCR_ENMBID                              BIT(24)
+#define RCR_LSIGEN                              BIT(23)
+#define RCR_MFBEN                               BIT(22)
+#define RCR_HTC_LOC_CTRL                        BIT(14)
+#define RCR_AMF                                 BIT(13)
+#define RCR_ACF                                 BIT(12)
+#define RCR_ADF                                 BIT(11)
+#define RCR_AICV                                BIT(9)
+#define RCR_ACRC32                              BIT(8)
+#define RCR_CBSSID_BCN                          BIT(7)
+#define RCR_CBSSID_DATA                         BIT(6)
+#define RCR_CBSSID                              RCR_CBSSID_DATA
+#define RCR_APWRMGT                             BIT(5)
+#define RCR_ADD3                                BIT(4)
+#define RCR_AB                                  BIT(3)
+#define RCR_AM                                  BIT(2)
+#define RCR_APM                                 BIT(1)
+#define RCR_AAP                                 BIT(0)
+#define RCR_MXDMA_OFFSET                        8
+#define RCR_FIFO_OFFSET                         13
+
+#define RSV_CTRL                                0x001C
+#define RD_CTRL                                 0x0524
+
+#define REG_USB_INFO                            0xFE17
+#define REG_USB_SPECIAL_OPTION                  0xFE55
+#define REG_USB_DMA_AGG_TO                      0xFE5B
+#define REG_USB_AGG_TO                          0xFE5C
+#define REG_USB_AGG_TH                          0xFE5D
+
+#define REG_USB_VID                             0xFE60
+#define REG_USB_PID                             0xFE62
+#define REG_USB_OPTIONAL                        0xFE64
+#define REG_USB_CHIRP_K                         0xFE65
+#define REG_USB_PHY                             0xFE66
+#define REG_USB_MAC_ADDR                        0xFE70
+#define REG_USB_HRPWM                           0xFE58
+#define REG_USB_HCPWM                           0xFE57
+
+#define SW18_FPWM                               BIT(3)
+
+#define ISO_MD2PP                               BIT(0)
+#define ISO_UA2USB                              BIT(1)
+#define ISO_UD2CORE                             BIT(2)
+#define ISO_PA2PCIE                             BIT(3)
+#define ISO_PD2CORE                             BIT(4)
+#define ISO_IP2MAC                              BIT(5)
+#define ISO_DIOP                                BIT(6)
+#define ISO_DIOE                                BIT(7)
+#define ISO_EB2CORE                             BIT(8)
+#define ISO_DIOR                                BIT(9)
+
+#define PWC_EV25V                               BIT(14)
+#define PWC_EV12V                               BIT(15)
+
+#define FEN_BBRSTB                              BIT(0)
+#define FEN_BB_GLB_RSTN                         BIT(1)
+#define FEN_USBA                                BIT(2)
+#define FEN_UPLL                                BIT(3)
+#define FEN_USBD                                BIT(4)
+#define FEN_DIO_PCIE                            BIT(5)
+#define FEN_PCIEA                               BIT(6)
+#define FEN_PPLL                                BIT(7)
+#define FEN_PCIED                               BIT(8)
+#define FEN_DIOE                                BIT(9)
+#define FEN_CPUEN                               BIT(10)
+#define FEN_DCORE                               BIT(11)
+#define FEN_ELDR                                BIT(12)
+#define FEN_DIO_RF                              BIT(13)
+#define FEN_HWPDN                               BIT(14)
+#define FEN_MREGEN                              BIT(15)
+
+#define PFM_LDALL                               BIT(0)
+#define PFM_ALDN                                BIT(1)
+#define PFM_LDKP                                BIT(2)
+#define PFM_WOWL                                BIT(3)
+#define ENPDN                                   BIT(4)
+#define PDN_PL                                  BIT(5)
+#define APFM_ONMAC                              BIT(8)
+#define APFM_OFF                                BIT(9)
+#define APFM_RSM                                BIT(10)
+#define AFSM_HSUS                               BIT(11)
+#define AFSM_PCIE                               BIT(12)
+#define APDM_MAC                                BIT(13)
+#define APDM_HOST                               BIT(14)
+#define APDM_HPDN                               BIT(15)
+#define RDY_MACON                               BIT(16)
+#define SUS_HOST                                BIT(17)
+#define ROP_ALD                                 BIT(20)
+#define ROP_PWR                                 BIT(21)
+#define ROP_SPS                                 BIT(22)
+#define SOP_MRST                                BIT(25)
+#define SOP_FUSE                                BIT(26)
+#define SOP_ABG                                 BIT(27)
+#define SOP_AMB                                 BIT(28)
+#define SOP_RCK                                 BIT(29)
+#define SOP_A8M                                 BIT(30)
+#define XOP_BTCK                                BIT(31)
+
+#define ANAD16V_EN                              BIT(0)
+#define ANA8M                                   BIT(1)
+#define MACSLP                                  BIT(4)
+#define LOADER_CLK_EN                           BIT(5)
+#define _80M_SSC_DIS                            BIT(7)
+#define _80M_SSC_EN_HO                          BIT(8)
+#define PHY_SSC_RSTB                            BIT(9)
+#define SEC_CLK_EN                              BIT(10)
+#define MAC_CLK_EN                              BIT(11)
+#define SYS_CLK_EN                              BIT(12)
+#define RING_CLK_EN                             BIT(13)
+
+#define BOOT_FROM_EEPROM                        BIT(4)
+#define EEPROM_EN                               BIT(5)
+
+#define AFE_BGEN                                BIT(0)
+#define AFE_MBEN                                BIT(1)
+#define MAC_ID_EN                               BIT(7)
+
+#define WLOCK_ALL                               BIT(0)
+#define WLOCK_00                                BIT(1)
+#define WLOCK_04                                BIT(2)
+#define WLOCK_08                                BIT(3)
+#define WLOCK_40                                BIT(4)
+#define R_DIS_PRST_0                            BIT(5)
+#define R_DIS_PRST_1                            BIT(6)
+#define LOCK_ALL_EN                             BIT(7)
+
+#define RF_EN                                   BIT(0)
+#define RF_RSTB                                 BIT(1)
+#define RF_SDMRSTB                              BIT(2)
+
+#define LDA15_EN                                BIT(0)
+#define LDA15_STBY                              BIT(1)
+#define LDA15_OBUF                              BIT(2)
+#define LDA15_REG_VOS                           BIT(3)
+#define _LDA15_VOADJ(x)                         (((x) & 0x7) << 4)
+
+#define LDV12_EN                                BIT(0)
+#define LDV12_SDBY                              BIT(1)
+#define LPLDO_HSM                               BIT(2)
+#define LPLDO_LSM_DIS                           BIT(3)
+#define _LDV12_VADJ(x)                          (((x) & 0xF) << 4)
+
+#define XTAL_EN                                 BIT(0)
+#define XTAL_BSEL                               BIT(1)
+#define _XTAL_BOSC(x)                           (((x) & 0x3) << 2)
+#define _XTAL_CADJ(x)                           (((x) & 0xF) << 4)
+#define XTAL_GATE_USB                           BIT(8)
+#define _XTAL_USB_DRV(x)                        (((x) & 0x3) << 9)
+#define XTAL_GATE_AFE                           BIT(11)
+#define _XTAL_AFE_DRV(x)                        (((x) & 0x3) << 12)
+#define XTAL_RF_GATE                            BIT(14)
+#define _XTAL_RF_DRV(x)                         (((x) & 0x3) << 15)
+#define XTAL_GATE_DIG                           BIT(17)
+#define _XTAL_DIG_DRV(x)                        (((x) & 0x3) << 18)
+#define XTAL_BT_GATE                            BIT(20)
+#define _XTAL_BT_DRV(x)                         (((x) & 0x3) << 21)
+#define _XTAL_GPIO(x)                           (((x) & 0x7) << 23)
+
+#define CKDLY_AFE                               BIT(26)
+#define CKDLY_USB                               BIT(27)
+#define CKDLY_DIG                               BIT(28)
+#define CKDLY_BT                                BIT(29)
+
+#define APLL_EN                                 BIT(0)
+#define APLL_320_EN                             BIT(1)
+#define APLL_FREF_SEL                           BIT(2)
+#define APLL_EDGE_SEL                           BIT(3)
+#define APLL_WDOGB                              BIT(4)
+#define APLL_LPFEN                              BIT(5)
+
+#define APLL_REF_CLK_13MHZ                      0x1
+#define APLL_REF_CLK_19_2MHZ                    0x2
+#define APLL_REF_CLK_20MHZ                      0x3
+#define APLL_REF_CLK_25MHZ                      0x4
+#define APLL_REF_CLK_26MHZ                      0x5
+#define APLL_REF_CLK_38_4MHZ                    0x6
+#define APLL_REF_CLK_40MHZ                      0x7
+
+#define APLL_320EN                              BIT(14)
+#define APLL_80EN                               BIT(15)
+#define APLL_1MEN                               BIT(24)
+
+#define ALD_EN                                  BIT(18)
+#define EF_PD                                   BIT(19)
+#define EF_FLAG                                 BIT(31)
+
+#define EF_TRPT                                 BIT(7)
+#define LDOE25_EN                               BIT(31)
+
+#define RSM_EN                                  BIT(0)
+#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 SIC_SWRST                               BIT(11)
+#define ENSIC                                   BIT(12)
+#define SIC_23                                  BIT(13)
+#define ENHDP                                   BIT(14)
+#define SIC_LBK                                 BIT(15)
+
+#define LED0PL                                  BIT(4)
+#define LED1PL                                  BIT(12)
+#define LED0DIS                                 BIT(7)
+
+#define MCUFWDL_EN                              BIT(0)
+#define MCUFWDL_RDY                             BIT(1)
+#define FWDL_CHKSUM_RPT                         BIT(2)
+#define MACINI_RDY                              BIT(3)
+#define BBINI_RDY                               BIT(4)
+#define RFINI_RDY                               BIT(5)
+#define WINTINI_RDY                             BIT(6)
+#define CPRST                                   BIT(23)
+
+#define XCLK_VLD                                BIT(0)
+#define ACLK_VLD                                BIT(1)
+#define UCLK_VLD                                BIT(2)
+#define PCLK_VLD                                BIT(3)
+#define PCIRSTB                                 BIT(4)
+#define V15_VLD                                 BIT(5)
+#define TRP_B15V_EN                             BIT(7)
+#define SIC_IDLE                                BIT(8)
+#define BD_MAC2                                 BIT(9)
+#define BD_MAC1                                 BIT(10)
+#define IC_MACPHY_MODE                          BIT(11)
+#define VENDOR_ID                               BIT(19)
+#define PAD_HWPD_IDN                            BIT(22)
+#define TRP_VAUX_EN                             BIT(23)
+#define TRP_BT_EN                               BIT(24)
+#define BD_PKG_SEL                              BIT(25)
+#define BD_HCI_SEL                              BIT(26)
+#define TYPE_ID                                 BIT(27)
+
+#define CHIP_VER_RTL_MASK                       0xF000
+#define CHIP_VER_RTL_SHIFT                      12
+
+#define REG_LBMODE                              (REG_CR + 3)
+
+#define HCI_TXDMA_EN                            BIT(0)
+#define HCI_RXDMA_EN                            BIT(1)
+#define TXDMA_EN                                BIT(2)
+#define RXDMA_EN                                BIT(3)
+#define PROTOCOL_EN                             BIT(4)
+#define SCHEDULE_EN                             BIT(5)
+#define MACTXEN                                 BIT(6)
+#define MACRXEN                                 BIT(7)
+#define ENSWBCN                                 BIT(8)
+#define ENSEC                                   BIT(9)
+
+#define _NETTYPE(x)                             (((x) & 0x3) << 16)
+#define MASK_NETTYPE                            0x30000
+#define NT_NO_LINK                              0x0
+#define NT_LINK_AD_HOC                          0x1
+#define NT_LINK_AP                              0x2
+#define NT_AS_AP                                0x3
+
+#define _LBMODE(x)                              (((x) & 0xF) << 24)
+#define MASK_LBMODE                             0xF000000
+#define LOOPBACK_NORMAL                         0x0
+#define LOOPBACK_IMMEDIATELY                    0xB
+#define LOOPBACK_MAC_DELAY                      0x3
+#define LOOPBACK_PHY                            0x1
+#define LOOPBACK_DMA                            0x7
+
+#define GET_RX_PAGE_SIZE(value)         ((value) & 0xF)
+#define GET_TX_PAGE_SIZE(value)         (((value) & 0xF0) >> 4)
+#define _PSRX_MASK                              0xF
+#define _PSTX_MASK                              0xF0
+#define _PSRX(x)                                (x)
+#define _PSTX(x)                                ((x) << 4)
+
+#define PBP_64                                  0x0
+#define PBP_128                                 0x1
+#define PBP_256                                 0x2
+#define PBP_512                                 0x3
+#define PBP_1024                                0x4
+
+#define RXDMA_ARBBW_EN                          BIT(0)
+#define RXSHFT_EN                               BIT(1)
+#define RXDMA_AGG_EN                            BIT(2)
+#define QS_VO_QUEUE                             BIT(8)
+#define QS_VI_QUEUE                             BIT(9)
+#define QS_BE_QUEUE                             BIT(10)
+#define QS_BK_QUEUE                             BIT(11)
+#define QS_MANAGER_QUEUE                        BIT(12)
+#define QS_HIGH_QUEUE                           BIT(13)
+
+#define HQSEL_VOQ                               BIT(0)
+#define HQSEL_VIQ                               BIT(1)
+#define HQSEL_BEQ                               BIT(2)
+#define HQSEL_BKQ                               BIT(3)
+#define HQSEL_MGTQ                              BIT(4)
+#define HQSEL_HIQ                               BIT(5)
+
+#define _TXDMA_HIQ_MAP(x)                       (((x)&0x3) << 14)
+#define _TXDMA_MGQ_MAP(x)                       (((x)&0x3) << 12)
+#define _TXDMA_BKQ_MAP(x)                       (((x)&0x3) << 10)
+#define _TXDMA_BEQ_MAP(x)                       (((x)&0x3) << 8)
+#define _TXDMA_VIQ_MAP(x)                       (((x)&0x3) << 6)
+#define _TXDMA_VOQ_MAP(x)                       (((x)&0x3) << 4)
+
+#define QUEUE_LOW                               1
+#define QUEUE_NORMAL                            2
+#define QUEUE_HIGH                              3
+
+#define _LLT_NO_ACTIVE                          0x0
+#define _LLT_WRITE_ACCESS                       0x1
+#define _LLT_READ_ACCESS                        0x2
+
+#define _LLT_INIT_DATA(x)                       ((x) & 0xFF)
+#define _LLT_INIT_ADDR(x)                       (((x) & 0xFF) << 8)
+#define _LLT_OP(x)                              (((x) & 0x3) << 30)
+#define _LLT_OP_VALUE(x)                        (((x) >> 30) & 0x3)
+
+#define BB_WRITE_READ_MASK                      (BIT(31) | BIT(30))
+#define BB_WRITE_EN                             BIT(30)
+#define BB_READ_EN                              BIT(31)
+
+#define _HPQ(x)                         ((x) & 0xFF)
+#define _LPQ(x)                         (((x) & 0xFF) << 8)
+#define _PUBQ(x)                        (((x) & 0xFF) << 16)
+#define _NPQ(x)                         ((x) & 0xFF)
+
+#define HPQ_PUBLIC_DIS                          BIT(24)
+#define LPQ_PUBLIC_DIS                          BIT(25)
+#define LD_RQPN                                 BIT(31)
+
+#define BCN_VALID                               BIT(16)
+#define BCN_HEAD(x)                     (((x) & 0xFF) << 8)
+#define BCN_HEAD_MASK                           0xFF00
+
+#define BLK_DESC_NUM_SHIFT                      4
+#define BLK_DESC_NUM_MASK                       0xF
+
+#define DROP_DATA_EN                            BIT(9)
+
+#define EN_AMPDU_RTY_NEW                        BIT(7)
+
+#define _INIRTSMCS_SEL(x)                       ((x) & 0x3F)
+
+#define _SPEC_SIFS_CCK(x)                       ((x) & 0xFF)
+#define _SPEC_SIFS_OFDM(x)                      (((x) & 0xFF) << 8)
+
+#define RATE_REG_BITMAP_ALL                     0xFFFFF
+
+#define _RRSC_BITMAP(x)                         ((x) & 0xFFFFF)
+
+#define _RRSR_RSC(x)                            (((x) & 0x3) << 21)
+#define RRSR_RSC_RESERVED                       0x0
+#define RRSR_RSC_UPPER_SUBCHANNEL               0x1
+#define RRSR_RSC_LOWER_SUBCHANNEL               0x2
+#define RRSR_RSC_DUPLICATE_MODE                 0x3
+
+#define USE_SHORT_G1                            BIT(20)
+
+#define _AGGLMT_MCS0(x)                         ((x) & 0xF)
+#define _AGGLMT_MCS1(x)                         (((x) & 0xF) << 4)
+#define _AGGLMT_MCS2(x)                         (((x) & 0xF) << 8)
+#define _AGGLMT_MCS3(x)                         (((x) & 0xF) << 12)
+#define _AGGLMT_MCS4(x)                         (((x) & 0xF) << 16)
+#define _AGGLMT_MCS5(x)                         (((x) & 0xF) << 20)
+#define _AGGLMT_MCS6(x)                         (((x) & 0xF) << 24)
+#define _AGGLMT_MCS7(x)                         (((x) & 0xF) << 28)
+
+#define RETRY_LIMIT_SHORT_SHIFT         8
+#define RETRY_LIMIT_LONG_SHIFT          0
+
+#define _DARF_RC1(x)                    ((x) & 0x1F)
+#define _DARF_RC2(x)                    (((x) & 0x1F) << 8)
+#define _DARF_RC3(x)                    (((x) & 0x1F) << 16)
+#define _DARF_RC4(x)                    (((x) & 0x1F) << 24)
+#define _DARF_RC5(x)                    ((x) & 0x1F)
+#define _DARF_RC6(x)                    (((x) & 0x1F) << 8)
+#define _DARF_RC7(x)                    (((x) & 0x1F) << 16)
+#define _DARF_RC8(x)                    (((x) & 0x1F) << 24)
+
+#define _RARF_RC1(x)                    ((x) & 0x1F)
+#define _RARF_RC2(x)                    (((x) & 0x1F) << 8)
+#define _RARF_RC3(x)                    (((x) & 0x1F) << 16)
+#define _RARF_RC4(x)                    (((x) & 0x1F) << 24)
+#define _RARF_RC5(x)                    ((x) & 0x1F)
+#define _RARF_RC6(x)                    (((x) & 0x1F) << 8)
+#define _RARF_RC7(x)                    (((x) & 0x1F) << 16)
+#define _RARF_RC8(x)                    (((x) & 0x1F) << 24)
+
+#define AC_PARAM_TXOP_LIMIT_OFFSET      16
+#define AC_PARAM_ECW_MAX_OFFSET         12
+#define AC_PARAM_ECW_MIN_OFFSET         8
+#define AC_PARAM_AIFS_OFFSET            0
+
+#define _AIFS(x)                        (x)
+#define _ECW_MAX_MIN(x)                 ((x) << 8)
+#define _TXOP_LIMIT(x)                  ((x) << 16)
+
+#define _BCNIFS(x)                      ((x) & 0xFF)
+#define _BCNECW(x)                      ((((x) & 0xF)) << 8)
+
+#define _LRL(x)                         ((x) & 0x3F)
+#define _SRL(x)                         (((x) & 0x3F) << 8)
+
+#define _SIFS_CCK_CTX(x)                ((x) & 0xFF)
+#define _SIFS_CCK_TRX(x)                (((x) & 0xFF) << 8)
+
+#define _SIFS_OFDM_CTX(x)               ((x) & 0xFF)
+#define _SIFS_OFDM_TRX(x)               (((x) & 0xFF) << 8)
+
+#define _TBTT_PROHIBIT_HOLD(x)          (((x) & 0xFF) << 8)
+
+#define DIS_EDCA_CNT_DWN                BIT(11)
+
+#define EN_MBSSID                       BIT(1)
+#define EN_TXBCN_RPT                    BIT(2)
+#define EN_BCN_FUNCTION                 BIT(3)
+
+#define TSFTR_RST                       BIT(0)
+#define TSFTR1_RST                      BIT(1)
+
+#define STOP_BCNQ                       BIT(6)
+
+#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 APSDOFF                         BIT(6)
+#define APSDOFF_STATUS                  BIT(7)
+
+#define BW_20MHZ                        BIT(2)
+
+#define RATE_BITMAP_ALL                 0xFFFFF
+
+#define RATE_RRSR_CCK_ONLY_1M           0xFFFF1
+
+#define TSFRST                          BIT(0)
+#define DIS_GCLK                        BIT(1)
+#define PAD_SEL                         BIT(2)
+#define PWR_ST                          BIT(6)
+#define PWRBIT_OW_EN                    BIT(7)
+#define ACRC                            BIT(8)
+#define CFENDFORM                       BIT(9)
+#define ICV                             BIT(10)
+
+#define AAP                             BIT(0)
+#define APM                             BIT(1)
+#define AM                              BIT(2)
+#define AB                              BIT(3)
+#define ADD3                            BIT(4)
+#define APWRMGT                         BIT(5)
+#define CBSSID                          BIT(6)
+#define CBSSID_DATA                     BIT(6)
+#define CBSSID_BCN                      BIT(7)
+#define ACRC32                          BIT(8)
+#define AICV                            BIT(9)
+#define ADF                             BIT(11)
+#define ACF                             BIT(12)
+#define AMF                             BIT(13)
+#define HTC_LOC_CTRL                    BIT(14)
+#define UC_DATA_EN                      BIT(16)
+#define BM_DATA_EN                      BIT(17)
+#define MFBEN                           BIT(22)
+#define LSIGEN                          BIT(23)
+#define ENMBID                          BIT(24)
+#define APP_BASSN                       BIT(27)
+#define APP_PHYSTS                      BIT(28)
+#define APP_ICV                         BIT(29)
+#define APP_MIC                         BIT(30)
+#define APP_FCS                         BIT(31)
+
+#define _MIN_SPACE(x)                   ((x) & 0x7)
+#define _SHORT_GI_PADDING(x)            (((x) & 0x1F) << 3)
+
+#define RXERR_TYPE_OFDM_PPDU            0
+#define RXERR_TYPE_OFDM_FALSE_ALARM     1
+#define RXERR_TYPE_OFDM_MPDU_OK         2
+#define RXERR_TYPE_OFDM_MPDU_FAIL       3
+#define RXERR_TYPE_CCK_PPDU             4
+#define RXERR_TYPE_CCK_FALSE_ALARM      5
+#define RXERR_TYPE_CCK_MPDU_OK          6
+#define RXERR_TYPE_CCK_MPDU_FAIL        7
+#define RXERR_TYPE_HT_PPDU              8
+#define RXERR_TYPE_HT_FALSE_ALARM       9
+#define RXERR_TYPE_HT_MPDU_TOTAL        10
+#define RXERR_TYPE_HT_MPDU_OK           11
+#define RXERR_TYPE_HT_MPDU_FAIL         12
+#define RXERR_TYPE_RX_FULL_DROP         15
+
+#define RXERR_COUNTER_MASK              0xFFFFF
+#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_TXBCUSEDK                   BIT(6)
+#define SCR_RXBCUSEDK                   BIT(7)
+
+#define XCLK_VLD                        BIT(0)
+#define ACLK_VLD                        BIT(1)
+#define UCLK_VLD                        BIT(2)
+#define PCLK_VLD                        BIT(3)
+#define PCIRSTB                         BIT(4)
+#define V15_VLD                         BIT(5)
+#define TRP_B15V_EN                     BIT(7)
+#define SIC_IDLE                        BIT(8)
+#define BD_MAC2                         BIT(9)
+#define BD_MAC1                         BIT(10)
+#define IC_MACPHY_MODE                  BIT(11)
+#define BT_FUNC                         BIT(16)
+#define VENDOR_ID                       BIT(19)
+#define PAD_HWPD_IDN                    BIT(22)
+#define TRP_VAUX_EN                     BIT(23)
+#define TRP_BT_EN                       BIT(24)
+#define BD_PKG_SEL                      BIT(25)
+#define BD_HCI_SEL                      BIT(26)
+#define TYPE_ID                         BIT(27)
+
+#define USB_IS_HIGH_SPEED               0
+#define USB_IS_FULL_SPEED               1
+#define USB_SPEED_MASK                  BIT(5)
+
+#define USB_NORMAL_SIE_EP_MASK          0xF
+#define USB_NORMAL_SIE_EP_SHIFT         4
+
+#define USB_TEST_EP_MASK                0x30
+#define USB_TEST_EP_SHIFT               4
+
+#define USB_AGG_EN                      BIT(3)
+
+#define MAC_ADDR_LEN                    6
+#define LAST_ENTRY_OF_TX_PKT_BUFFER     255
+
+#define POLLING_LLT_THRESHOLD           20
+#define POLLING_READY_TIMEOUT_COUNT     3000
+
+#define MAX_MSS_DENSITY_2T              0x13
+#define MAX_MSS_DENSITY_1T              0x0A
+
+#define EPROM_CMD_OPERATING_MODE_MASK   ((1<<7)|(1<<6))
+#define EPROM_CMD_CONFIG                0x3
+#define EPROM_CMD_LOAD                  1
+
+#define HWSET_MAX_SIZE_92S              HWSET_MAX_SIZE
+
+#define HAL_8192C_HW_GPIO_WPS_BIT       BIT(2)
+
+#define RA_LSSIWRITE_8821A              0xc90
+#define RB_LSSIWRITE_8821A              0xe90
+
+#define RA_PIREAD_8821A                 0xd04
+#define RB_PIREAD_8821A                 0xd44
+#define RA_SIREAD_8821A                 0xd08
+#define RB_SIREAD_8821A                 0xd48
+
+#define RPMAC_RESET                     0x100
+#define RPMAC_TXSTART                   0x104
+#define RPMAC_TXLEGACYSIG               0x108
+#define RPMAC_TXHTSIG1                  0x10c
+#define RPMAC_TXHTSIG2                  0x110
+#define RPMAC_PHYDEBUG                  0x114
+#define RPMAC_TXPACKETNUM               0x118
+#define RPMAC_TXIDLE                    0x11c
+#define RPMAC_TXMACHEADER0              0x120
+#define RPMAC_TXMACHEADER1              0x124
+#define RPMAC_TXMACHEADER2              0x128
+#define RPMAC_TXMACHEADER3              0x12c
+#define RPMAC_TXMACHEADER4              0x130
+#define RPMAC_TXMACHEADER5              0x134
+#define RPMAC_TXDADATYPE                0x138
+#define RPMAC_TXRANDOMSEED              0x13c
+#define RPMAC_CCKPLCPPREAMBLE           0x140
+#define RPMAC_CCKPLCPHEADER             0x144
+#define RPMAC_CCKCRC16                  0x148
+#define RPMAC_OFDMRXCRC32OK             0x170
+#define RPMAC_OFDMRXCRC32ER             0x174
+#define RPMAC_OFDMRXPARITYER            0x178
+#define RPMAC_OFDMRXCRC8ER              0x17c
+#define RPMAC_CCKCRXRC16ER              0x180
+#define RPMAC_CCKCRXRC32ER              0x184
+#define RPMAC_CCKCRXRC32OK              0x188
+#define RPMAC_TXSTATUS                  0x18c
+
+#define RFPGA0_RFMOD                    0x800
+
+#define RFPGA0_TXINFO                   0x804
+#define RFPGA0_PSDFUNCTION              0x808
+
+#define RFPGA0_TXGAINSTAGE              0x80c
+
+#define RFPGA0_RFTIMING1                0x810
+#define RFPGA0_RFTIMING2                0x814
+
+#define RFPGA0_XA_HSSIPARAMETER1        0x820
+#define RFPGA0_XA_HSSIPARAMETER2        0x824
+#define RFPGA0_XB_HSSIPARAMETER1        0x828
+#define RFPGA0_XB_HSSIPARAMETER2        0x82c
+#define RCCAONSEC                       0x838
+
+#define RFPGA0_XA_LSSIPARAMETER         0x840
+#define RFPGA0_XB_LSSIPARAMETER         0x844
+#define RL1PEAKTH                       0x848
+
+#define RFPGA0_RFWAKEUPPARAMETER        0x850
+#define RFPGA0_RFSLEEPUPPARAMETER       0x854
+
+#define RFPGA0_XAB_SWITCHCONTROL        0x858
+#define RFPGA0_XCD_SWITCHCONTROL        0x85c
+
+#define RFPGA0_XA_RFINTERFACEOE         0x860
+#define RFC_AREA                        0x860
+#define RFPGA0_XB_RFINTERFACEOE         0x864
+
+#define RFPGA0_XAB_RFINTERFACESW        0x870
+#define RFPGA0_XCD_RFINTERFACESW        0x874
+
+#define RFPGA0_XAB_RFPARAMETER          0x878
+#define RFPGA0_XCD_RFPARAMETER          0x87c
+
+#define RFPGA0_ANALOGPARAMETER1         0x880
+#define RFPGA0_ANALOGPARAMETER2         0x884
+#define RFPGA0_ANALOGPARAMETER3         0x888
+#define RFPGA0_ANALOGPARAMETER4         0x88c
+
+#define RFPGA0_XA_LSSIREADBACK          0x8a0
+#define RFPGA0_XB_LSSIREADBACK          0x8a4
+#define RFPGA0_XC_LSSIREADBACK          0x8a8
+#define RRFMOD                          0x8ac
+#define RHSSIREAD_8821AE                0x8b0
+
+#define RFPGA0_PSDREPORT                0x8b4
+#define TRANSCEIVEA_HSPI_READBACK       0x8b8
+#define TRANSCEIVEB_HSPI_READBACK       0x8bc
+#define RADC_BUF_CLK                    0x8c4
+#define RFPGA0_XAB_RFINTERFACERB        0x8e0
+#define RFPGA0_XCD_RFINTERFACERB        0x8e4
+
+#define RFPGA1_RFMOD                    0x900
+
+#define RFPGA1_TXBLOCK                  0x904
+#define RFPGA1_DEBUGSELECT              0x908
+#define RFPGA1_TXINFO                   0x90c
+
+#define RCCK_SYSTEM                     0xa00
+#define BCCK_SYSTEM                     0x10
+
+#define RCCK0_AFESETTING                0xa04
+#define RCCK0_CCA                       0xa08
+
+#define RCCK0_RXAGC1                    0xa0c
+#define RCCK0_RXAGC2                    0xa10
+
+#define RCCK0_RXHP                      0xa14
+
+#define RCCK0_DSPPARAMETER1             0xa18
+#define RCCK0_DSPPARAMETER2             0xa1c
+
+#define RCCK0_TXFILTER1                 0xa20
+#define RCCK0_TXFILTER2                 0xa24
+#define RCCK0_DEBUGPORT                 0xa28
+#define RCCK0_FALSEALARMREPORT          0xa2c
+#define RCCK0_TRSSIREPORT               0xa50
+#define RCCK0_RXREPORT                  0xa54
+#define RCCK0_FACOUNTERLOWER            0xa5c
+#define RCCK0_FACOUNTERUPPER            0xa58
+#define RCCK0_CCA_CNT                   0xa60
+
+/* PageB(0xB00) */
+#define RPDP_ANTA                       0xb00
+#define RPDP_ANTA_4                     0xb04
+#define RPDP_ANTA_8                     0xb08
+#define RPDP_ANTA_C                     0xb0c
+#define RPDP_ANTA_10                    0xb10
+#define RPDP_ANTA_14                    0xb14
+#define RPDP_ANTA_18                    0xb18
+#define RPDP_ANTA_1C                    0xb1c
+#define RPDP_ANTA_20                    0xb20
+#define RPDP_ANTA_24                    0xb24
+
+#define RCONFIG_PMPD_ANTA               0xb28
+#define RCONFIG_RAM64x16                0xb2c
+
+#define RBNDA                           0xb30
+#define RHSSIPAR                        0xb34
+
+#define RCONFIG_ANTA                    0xb68
+#define RCONFIG_ANTB                    0xb6c
+
+#define RPDP_ANTB                       0xb70
+#define RPDP_ANTB_4                     0xb74
+#define RPDP_ANTB_8                     0xb78
+#define RPDP_ANTB_C                     0xb7c
+#define RPDP_ANTB_10                    0xb80
+#define RPDP_ANTB_14                    0xb84
+#define RPDP_ANTB_18                    0xb88
+#define RPDP_ANTB_1C                    0xb8c
+#define RPDP_ANTB_20                    0xb90
+#define RPDP_ANTB_24                    0xb94
+
+#define RCONFIG_PMPD_ANTB               0xb98
+
+#define RBNDB                           0xba0
+
+#define RAPK                            0xbd8
+#define RPM_RX0_ANTA                    0xbdc
+#define RPM_RX1_ANTA                    0xbe0
+#define RPM_RX2_ANTA                    0xbe4
+#define RPM_RX3_ANTA                    0xbe8
+#define RPM_RX0_ANTB                    0xbec
+#define RPM_RX1_ANTB                    0xbf0
+#define RPM_RX2_ANTB                    0xbf4
+#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
+
+/*Page C*/
+#define ROFDM0_LSTF                     0xc00
+
+#define ROFDM0_TRXPATHENABLE            0xc04
+#define ROFDM0_TRMUXPAR                 0xc08
+#define ROFDM0_TRSWISOLATION            0xc0c
+
+#define ROFDM0_XARXAFE                  0xc10
+#define ROFDM0_XARXIQIMBALANCE          0xc14
+#define ROFDM0_XBRXAFE                  0xc18
+#define ROFDM0_XBRXIQIMBALANCE          0xc1c
+#define ROFDM0_XCRXAFE                  0xc20
+#define ROFDM0_XCRXIQIMBANLANCE         0xc24
+#define ROFDM0_XDRXAFE                  0xc28
+#define ROFDM0_XDRXIQIMBALANCE          0xc2c
+
+#define ROFDM0_RXDETECTOR1              0xc30
+#define ROFDM0_RXDETECTOR2              0xc34
+#define ROFDM0_RXDETECTOR3              0xc38
+#define ROFDM0_RXDETECTOR4              0xc3c
+
+#define ROFDM0_RXDSP                    0xc40
+#define ROFDM0_CFOANDDAGC               0xc44
+#define ROFDM0_CCADROPTHRESHOLD         0xc48
+#define ROFDM0_ECCATHRESHOLD            0xc4c
+
+#define ROFDM0_XAAGCCORE1               0xc50
+#define ROFDM0_XAAGCCORE2               0xc54
+#define ROFDM0_XBAGCCORE1               0xc58
+#define ROFDM0_XBAGCCORE2               0xc5c
+#define ROFDM0_XCAGCCORE1               0xc60
+#define ROFDM0_XCAGCCORE2               0xc64
+#define ROFDM0_XDAGCCORE1               0xc68
+#define ROFDM0_XDAGCCORE2               0xc6c
+
+#define ROFDM0_AGCPARAMETER1            0xc70
+#define ROFDM0_AGCPARAMETER2            0xc74
+#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_RXIQEXTANTA              0xca0
+#define ROFDM0_TXCOEFF1                 0xca4
+#define ROFDM0_TXCOEFF2                 0xca8
+#define ROFDM0_TXCOEFF3                 0xcac
+#define ROFDM0_TXCOEFF4                 0xcb0
+#define ROFDM0_TXCOEFF5                 0xcb4
+#define ROFDM0_TXCOEFF6                 0xcb8
+
+/*Path_A RFE cotrol */
+#define RA_RFE_CTRL_8812                0xcb8
+/*Path_B RFE control*/
+#define RB_RFE_CTRL_8812                0xeb8
+
+#define ROFDM0_RXHPPARAMETER            0xce0
+#define ROFDM0_TXPSEUDONOISEWGT         0xce4
+#define ROFDM0_FRAMESYNC                0xcf0
+#define ROFDM0_DFSREPORT                0xcf4
+
+#define ROFDM1_LSTF                     0xd00
+#define ROFDM1_TRXPATHENABLE            0xd04
+
+#define ROFDM1_CF0                      0xd08
+#define ROFDM1_CSI1                     0xd10
+#define ROFDM1_SBD                      0xd14
+#define ROFDM1_CSI2                     0xd18
+#define ROFDM1_CFOTRACKING              0xd2c
+#define ROFDM1_TRXMESAURE1              0xd34
+#define ROFDM1_INTFDET                  0xd3c
+#define ROFDM1_PSEUDONOISESTATEAB       0xd50
+#define ROFDM1_PSEUDONOISESTATECD       0xd54
+#define ROFDM1_RXPSEUDONOISEWGT         0xd58
+
+#define ROFDM_PHYCOUNTER1               0xda0
+#define ROFDM_PHYCOUNTER2               0xda4
+#define ROFDM_PHYCOUNTER3               0xda8
+
+#define ROFDM_SHORTCFOAB                0xdac
+#define ROFDM_SHORTCFOCD                0xdb0
+#define ROFDM_LONGCFOAB                 0xdb4
+#define ROFDM_LONGCFOCD                 0xdb8
+#define ROFDM_TAILCF0AB                 0xdbc
+#define ROFDM_TAILCF0CD                 0xdc0
+#define ROFDM_PWMEASURE1                0xdc4
+#define ROFDM_PWMEASURE2                0xdc8
+#define ROFDM_BWREPORT                  0xdcc
+#define ROFDM_AGCREPORT                 0xdd0
+#define ROFDM_RXSNR                     0xdd4
+#define ROFDM_RXEVMCSI                  0xdd8
+#define ROFDM_SIGREPORT                 0xddc
+
+#define RTXAGC_A_CCK11_CCK1             0xc20
+#define RTXAGC_A_OFDM18_OFDM6           0xc24
+#define RTXAGC_A_OFDM54_OFDM24          0xc28
+#define RTXAGC_A_MCS03_MCS00            0xc2c
+#define RTXAGC_A_MCS07_MCS04            0xc30
+#define RTXAGC_A_MCS11_MCS08            0xc34
+#define RTXAGC_A_MCS15_MCS12            0xc38
+#define RTXAGC_A_NSS1INDEX3_NSS1INDEX0  0xc3c
+#define RTXAGC_A_NSS1INDEX7_NSS1INDEX4  0xc40
+#define RTXAGC_A_NSS2INDEX1_NSS1INDEX8  0xc44
+#define RTXAGC_A_NSS2INDEX5_NSS2INDEX2  0xc48
+#define RTXAGC_A_NSS2INDEX9_NSS2INDEX6  0xc4c
+#define RTXAGC_B_CCK11_CCK1             0xe20
+#define RTXAGC_B_OFDM18_OFDM6           0xe24
+#define RTXAGC_B_OFDM54_OFDM24          0xe28
+#define RTXAGC_B_MCS03_MCS00            0xe2c
+#define RTXAGC_B_MCS07_MCS04            0xe30
+#define RTXAGC_B_MCS11_MCS08            0xe34
+#define RTXAGC_B_MCS15_MCS12            0xe38
+#define RTXAGC_B_NSS1INDEX3_NSS1INDEX0  0xe3c
+#define RTXAGC_B_NSS1INDEX7_NSS1INDEX4  0xe40
+#define RTXAGC_B_NSS2INDEX1_NSS1INDEX8  0xe44
+#define RTXAGC_B_NSS2INDEX5_NSS2INDEX2  0xe48
+#define RTXAGC_B_NSS2INDEX9_NSS2INDEX6  0xe4c
+
+#define RA_TXPWRTRAING                  0xc54
+#define RB_TXPWRTRAING                  0xe54
+
+#define RFPGA0_IQK                      0xe28
+#define RTX_IQK_TONE_A                  0xe30
+#define RRX_IQK_TONE_A                  0xe34
+#define RTX_IQK_PI_A                    0xe38
+#define RRX_IQK_PI_A                    0xe3c
+
+#define RTX_IQK                         0xe40
+#define RRX_IQK                         0xe44
+#define RIQK_AGC_PTS                    0xe48
+#define RIQK_AGC_RSP                    0xe4c
+#define RTX_IQK_TONE_B                  0xe50
+#define RRX_IQK_TONE_B                  0xe54
+#define RTX_IQK_PI_B                    0xe58
+#define RRX_IQK_PI_B                    0xe5c
+#define RIQK_AGC_CONT                   0xe60
+
+#define RBLUE_TOOTH                     0xe6c
+#define RRX_WAIT_CCA                    0xe70
+#define RTX_CCK_RFON                    0xe74
+#define RTX_CCK_BBON                    0xe78
+#define RTX_OFDM_RFON                   0xe7c
+#define RTX_OFDM_BBON                   0xe80
+#define RTX_TO_RX                       0xe84
+#define RTX_TO_TX                       0xe88
+#define RRX_CCK                         0xe8c
+
+#define RTX_POWER_BEFORE_IQK_A          0xe94
+#define RTX_POWER_AFTER_IQK_A           0xe9c
+
+#define RRX_POWER_BEFORE_IQK_A          0xea0
+#define RRX_POWER_BEFORE_IQK_A_2        0xea4
+#define RRX_POWER_AFTER_IQK_A           0xea8
+#define RRX_POWER_AFTER_IQK_A_2         0xeac
+
+#define RTX_POWER_BEFORE_IQK_B          0xeb4
+#define RTX_POWER_AFTER_IQK_B           0xebc
+
+#define RRX_POER_BEFORE_IQK_B           0xec0
+#define RRX_POER_BEFORE_IQK_B_2         0xec4
+#define RRX_POWER_AFTER_IQK_B           0xec8
+#define RRX_POWER_AFTER_IQK_B_2         0xecc
+
+#define RRX_OFDM                        0xed0
+#define RRX_WAIT_RIFS                   0xed4
+#define RRX_TO_RX                       0xed8
+#define RSTANDBY                        0xedc
+#define RSLEEP                          0xee0
+#define RPMPD_ANAEN                     0xeec
+
+#define RZEBRA1_HSSIENABLE              0x0
+#define RZEBRA1_TRXENABLE1              0x1
+#define RZEBRA1_TRXENABLE2              0x2
+#define RZEBRA1_AGC                     0x4
+#define RZEBRA1_CHARGEPUMP              0x5
+#define RZEBRA1_CHANNEL                 0x7
+
+#define RZEBRA1_TXGAIN                  0x8
+#define RZEBRA1_TXLPF                   0x9
+#define RZEBRA1_RXLPF                   0xb
+#define RZEBRA1_RXHPFCORNER             0xc
+
+#define RGLOBALCTRL                     0
+#define RRTL8256_TXLPF                  19
+#define RRTL8256_RXLPF                  11
+#define RRTL8258_TXLPF                  0x11
+#define RRTL8258_RXLPF                  0x13
+#define RRTL8258_RSSILPF                0xa
+
+#define RF_AC                           0x00
+
+#define RF_IQADJ_G1                     0x01
+#define RF_IQADJ_G2                     0x02
+#define RF_POW_TRSW                     0x05
+
+#define RF_GAIN_RX                      0x06
+#define RF_GAIN_TX                      0x07
+
+#define RF_TXM_IDAC                     0x08
+#define RF_BS_IQGEN                     0x0F
+
+#define RF_MODE1                        0x10
+#define RF_MODE2                        0x11
+
+#define RF_RX_AGC_HP                    0x12
+#define RF_TX_AGC                       0x13
+#define RF_BIAS                         0x14
+#define RF_IPA                          0x15
+#define RF_POW_ABILITY                  0x17
+#define RF_MODE_AG                      0x18
+#define RRFCHANNEL                      0x18
+#define RF_CHNLBW                       0x18
+#define RF_TOP                          0x19
+
+#define RF_RX_G1                        0x1A
+#define RF_RX_G2                        0x1B
+
+#define RF_RX_BB2                       0x1C
+#define RF_RX_BB1                       0x1D
+
+#define RF_RCK1                         0x1E
+#define RF_RCK2                         0x1F
+
+#define RF_TX_G1                        0x20
+#define RF_TX_G2                        0x21
+#define RF_TX_G3                        0x22
+
+#define RF_TX_BB1                       0x23
+#define RF_T_METER                      0x24
+#define RF_T_METER_88E                  0x42
+#define  RF_T_METER_8812A               0x42
+
+#define RF_SYN_G1                       0x25
+#define RF_SYN_G2                       0x26
+#define RF_SYN_G3                       0x27
+#define RF_SYN_G4                       0x28
+#define RF_SYN_G5                       0x29
+#define RF_SYN_G6                       0x2A
+#define RF_SYN_G7                       0x2B
+#define RF_SYN_G8                       0x2C
+
+#define RF_RCK_OS                       0x30
+#define RF_TXPA_G1                      0x31
+#define RF_TXPA_G2                      0x32
+#define RF_TXPA_G3                      0x33
+
+#define RF_TX_BIAS_A                    0x35
+#define RF_TX_BIAS_D                    0x36
+#define RF_LOBF_9                       0x38
+#define RF_RXRF_A3                      0x3C
+#define RF_TRSW                         0x3F
+
+#define RF_TXRF_A2                      0x41
+#define RF_TXPA_G4                      0x46
+#define RF_TXPA_A4                      0x4B
+
+#define RF_APK                          0x63
+
+#define RF_WE_LUT                       0xEF
+
+#define BBBRESETB                       0x100
+#define BGLOBALRESETB                   0x200
+#define BOFDMTXSTART                    0x4
+#define BCCKTXSTART                     0x8
+#define BCRC32DEBUG                     0x100
+#define BPMACLOOPBACK                   0x10
+#define BTXLSIG                         0xffffff
+#define BOFDMTXRATE                     0xf
+#define BOFDMTXRESERVED                 0x10
+#define BOFDMTXLENGTH                   0x1ffe0
+#define BOFDMTXPARITY                   0x20000
+#define BTXHTSIG1                       0xffffff
+#define BTXHTMCSRATE                    0x7f
+#define BTXHTBW                         0x80
+#define BTXHTLENGTH                     0xffff00
+#define BTXHTSIG2                       0xffffff
+#define BTXHTSMOOTHING                  0x1
+#define BTXHTSOUNDING                   0x2
+#define BTXHTRESERVED                   0x4
+#define BTXHTAGGREATION                 0x8
+#define BTXHTSTBC                       0x30
+#define BTXHTADVANCECODING              0x40
+#define BTXHTSHORTGI                    0x80
+#define BTXHTNUMBERHT_LTF               0x300
+#define BTXHTCRC8                       0x3fc00
+#define BCOUNTERRESET                   0x10000
+#define BNUMOFOFDMTX                    0xffff
+#define BNUMOFCCKTX                     0xffff0000
+#define BTXIDLEINTERVAL                 0xffff
+#define BOFDMSERVICE                    0xffff0000
+#define BTXMACHEADER                    0xffffffff
+#define BTXDATAINIT                     0xff
+#define BTXHTMODE                       0x100
+#define BTXDATATYPE                     0x30000
+#define BTXRANDOMSEED                   0xffffffff
+#define BCCKTXPREAMBLE                  0x1
+#define BCCKTXSFD                       0xffff0000
+#define BCCKTXSIG                       0xff
+#define BCCKTXSERVICE                   0xff00
+#define BCCKLENGTHEXT                   0x8000
+#define BCCKTXLENGHT                    0xffff0000
+#define BCCKTXCRC16                     0xffff
+#define BCCKTXSTATUS                    0x1
+#define BOFDMTXSTATUS                   0x2
+#define IS_BB_REG_OFFSET_92S(__offset)  \
+        ((__offset >= 0x800) && (__offset <= 0xfff))
+
+#define BRFMOD                          0x1
+#define BJAPANMODE                      0x2
+#define BCCKTXSC                        0x30
+/* Block & Path enable*/
+#define ROFDMCCKEN                      0x808
+#define BCCKEN                          0x10000000
+#define BOFDMEN                         0x20000000
+/* Rx antenna*/
+#define RRXPATH                         0x808
+#define BRXPATH                         0xff
+/* Tx antenna*/
+#define RTXPATH                         0x80c
+#define BTXPATH                         0x0fffffff
+/* for cck rx path selection*/
+#define RCCK_RX                         0xa04
+#define BCCK_RX                         0x0c000000
+/* Use LSIG for VHT length*/
+#define RVHTLEN_USE_LSIG                0x8c3
+
+#define BOFDMRXADCPHASE                 0x10000
+#define BOFDMTXDACPHASE                 0x40000
+#define BXATXAGC                        0x3f
+
+#define BXBTXAGC                        0xf00
+#define BXCTXAGC                        0xf000
+#define BXDTXAGC                        0xf0000
+
+#define BPASTART                        0xf0000000
+#define BTRSTART                        0x00f00000
+#define BRFSTART                        0x0000f000
+#define BBBSTART                        0x000000f0
+#define BBBCCKSTART                     0x0000000f
+#define BPAEND                          0xf
+#define BTREND                          0x0f000000
+#define BRFEND                          0x000f0000
+#define BCCAMASK                        0x000000f0
+#define BR2RCCAMASK                     0x00000f00
+#define BHSSI_R2TDELAY                  0xf8000000
+#define BHSSI_T2RDELAY                  0xf80000
+#define BCONTXHSSI                      0x400
+#define BIGFROMCCK                      0x200
+#define BAGCADDRESS                     0x3f
+#define BRXHPTX                         0x7000
+#define BRXHP2RX                        0x38000
+#define BRXHPCCKINI                     0xc0000
+#define BAGCTXCODE                      0xc00000
+#define BAGCRXCODE                      0x300000
+
+#define B3WIREDATALENGTH                0x800
+#define B3WIREADDREAALENGTH             0x400
+
+#define B3WIRERFPOWERDOWN               0x1
+#define B5GPAPEPOLARITY                 0x40000000
+#define B2GPAPEPOLARITY                 0x80000000
+#define BRFSW_TXDEFAULTANT              0x3
+#define BRFSW_TXOPTIONANT               0x30
+#define BRFSW_RXDEFAULTANT              0x300
+#define BRFSW_RXOPTIONANT               0x3000
+#define BRFSI_3WIREDATA                 0x1
+#define BRFSI_3WIRECLOCK                0x2
+#define BRFSI_3WIRELOAD                 0x4
+#define BRFSI_3WIRERW                   0x8
+#define BRFSI_3WIRE                     0xf
+
+#define BRFSI_RFENV                     0x10
+
+#define BRFSI_TRSW                      0x20
+#define BRFSI_TRSWB                     0x40
+#define BRFSI_ANTSW                     0x100
+#define BRFSI_ANTSWB                    0x200
+#define BRFSI_PAPE                      0x400
+#define BRFSI_PAPE5G                    0x800
+#define BBANDSELECT                     0x1
+#define BHTSIG2_GI                      0x80
+#define BHTSIG2_SMOOTHING               0x01
+#define BHTSIG2_SOUNDING                0x02
+#define BHTSIG2_AGGREATON               0x08
+#define BHTSIG2_STBC                    0x30
+#define BHTSIG2_ADVCODING               0x40
+#define BHTSIG2_NUMOFHTLTF              0x300
+#define BHTSIG2_CRC8                    0x3fc
+#define BHTSIG1_MCS                     0x7f
+#define BHTSIG1_BANDWIDTH               0x80
+#define BHTSIG1_HTLENGTH                0xffff
+#define BLSIG_RATE                      0xf
+#define BLSIG_RESERVED                  0x10
+#define BLSIG_LENGTH                    0x1fffe
+#define BLSIG_PARITY                    0x20
+#define BCCKRXPHASE                     0x4
+
+#define BLSSIREADADDRESS                0x7f800000
+#define BLSSIREADEDGE                   0x80000000
+
+#define BLSSIREADBACKDATA               0xfffff
+
+#define BLSSIREADOKFLAG                 0x1000
+#define BCCKSAMPLERATE                  0x8
+#define BREGULATOR0STANDBY              0x1
+#define BREGULATORPLLSTANDBY            0x2
+#define BREGULATOR1STANDBY              0x4
+#define BPLLPOWERUP                     0x8
+#define BDPLLPOWERUP                    0x10
+#define BDA10POWERUP                    0x20
+#define BAD7POWERUP                     0x200
+#define BDA6POWERUP                     0x2000
+#define BXTALPOWERUP                    0x4000
+#define B40MDCLKPOWERUP                 0x8000
+#define BDA6DEBUGMODE                   0x20000
+#define BDA6SWING                       0x380000
+
+#define BADCLKPHASE                     0x4000000
+#define B80MCLKDELAY                    0x18000000
+#define BAFEWATCHDOGENABLE              0x20000000
+
+#define BXTALCAP01                      0xc0000000
+#define BXTALCAP23                      0x3
+#define BXTALCAP92X                     0x0f000000
+#define BXTALCAP                        0x0f000000
+
+#define BINTDIFCLKENABLE                0x400
+#define BEXTSIGCLKENABLE                0x800
+#define BBANDGAP_MBIAS_POWERUP          0x10000
+#define BAD11SH_GAIN                    0xc0000
+#define BAD11NPUT_RANGE                 0x700000
+#define BAD110P_CURRENT                 0x3800000
+#define BLPATH_LOOPBACK                 0x4000000
+#define BQPATH_LOOPBACK                 0x8000000
+#define BAFE_LOOPBACK                   0x10000000
+#define BDA10_SWING                     0x7e0
+#define BDA10_REVERSE                   0x800
+#define BDA_CLK_SOURCE                  0x1000
+#define BDA7INPUT_RANGE                 0x6000
+#define BDA7_GAIN                       0x38000
+#define BDA7OUTPUT_CM_MODE              0x40000
+#define BDA7INPUT_CM_MODE               0x380000
+#define BDA7CURRENT                     0xc00000
+#define BREGULATOR_ADJUST               0x7000000
+#define BAD11POWERUP_ATTX               0x1
+#define BDA10PS_ATTX                    0x10
+#define BAD11POWERUP_ATRX               0x100
+#define BDA10PS_ATRX                    0x1000
+#define BCCKRX_AGC_FORMAT               0x200
+#define BPSDFFT_SAMPLE_POINT            0xc000
+#define BPSD_AVERAGE_NUM                0x3000
+#define BIQPATH_CONTROL                 0xc00
+#define BPSD_FREQ                       0x3ff
+#define BPSD_ANTENNA_PATH               0x30
+#define BPSD_IQ_SWITCH                  0x40
+#define BPSD_RX_TRIGGER                 0x400000
+#define BPSD_TX_TRIGGER                 0x80000000
+#define BPSD_SINE_TONE_SCALE            0x7f000000
+#define BPSD_REPORT                     0xffff
+
+#define BOFDM_TXSC                      0x30000000
+#define BCCK_TXON                       0x1
+#define BOFDM_TXON                      0x2
+#define BDEBUG_PAGE                     0xfff
+#define BDEBUG_ITEM                     0xff
+#define BANTL                           0x10
+#define BANT_NONHT                      0x100
+#define BANT_HT1                        0x1000
+#define BANT_HT2                        0x10000
+#define BANT_HT1S1                      0x100000
+#define BANT_NONHTS1                    0x1000000
+
+#define BCCK_BBMODE                     0x3
+#define BCCK_TXPOWERSAVING              0x80
+#define BCCK_RXPOWERSAVING              0x40
+
+#define BCCK_SIDEBAND                   0x10
+
+#define BCCK_SCRAMBLE                   0x8
+#define BCCK_ANTDIVERSITY               0x8000
+#define BCCK_CARRIER_RECOVERY           0x4000
+#define BCCK_TXRATE                     0x3000
+#define BCCK_DCCANCEL                   0x0800
+#define BCCK_ISICANCEL                  0x0400
+#define BCCK_MATCH_FILTER               0x0200
+#define BCCK_EQUALIZER                  0x0100
+#define BCCK_PREAMBLE_DETECT            0x800000
+#define BCCK_FAST_FALSECCA              0x400000
+#define BCCK_CH_ESTSTART                0x300000
+#define BCCK_CCA_COUNT                  0x080000
+#define BCCK_CS_LIM                     0x070000
+#define BCCK_BIST_MODE                  0x80000000
+#define BCCK_CCAMASK                    0x40000000
+#define BCCK_TX_DAC_PHASE               0x4
+#define BCCK_RX_ADC_PHASE               0x20000000
+#define BCCKR_CP_MODE                   0x0100
+#define BCCK_TXDC_OFFSET                0xf0
+#define BCCK_RXDC_OFFSET                0xf
+#define BCCK_CCA_MODE                   0xc000
+#define BCCK_FALSECS_LIM                0x3f00
+#define BCCK_CS_RATIO                   0xc00000
+#define BCCK_CORGBIT_SEL                0x300000
+#define BCCK_PD_LIM                     0x0f0000
+#define BCCK_NEWCCA                     0x80000000
+#define BCCK_RXHP_OF_IG                 0x8000
+#define BCCK_RXIG                       0x7f00
+#define BCCK_LNA_POLARITY               0x800000
+#define BCCK_RX1ST_BAIN                 0x7f0000
+#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
+#define BCCK_RXAGC_REPORTTYPE           0x0300
+#define BCCK_RXDAGC_EN                  0x80000000
+#define BCCK_RXDAGC_PERIOD              0x20000000
+#define BCCK_RXDAGC_SATLEVEL            0x1f000000
+#define BCCK_TIMING_RECOVERY            0x800000
+#define BCCK_TXC0                       0x3f0000
+#define BCCK_TXC1                       0x3f000000
+#define BCCK_TXC2                       0x3f
+#define BCCK_TXC3                       0x3f00
+#define BCCK_TXC4                       0x3f0000
+#define BCCK_TXC5                       0x3f000000
+#define BCCK_TXC6                       0x3f
+#define BCCK_TXC7                       0x3f00
+#define BCCK_DEBUGPORT                  0xff0000
+#define BCCK_DAC_DEBUG                  0x0f000000
+#define BCCK_FALSEALARM_ENABLE          0x8000
+#define BCCK_FALSEALARM_READ            0x4000
+#define BCCK_TRSSI                      0x7f
+#define BCCK_RXAGC_REPORT               0xfe
+#define BCCK_RXREPORT_ANTSEL            0x80000000
+#define BCCK_RXREPORT_MFOFF             0x40000000
+#define BCCK_RXREPORT_SQLOSS            0x20000000
+#define BCCK_RXREPORT_PKTLOSS           0x10000000
+#define BCCK_RXREPORT_LOCKEDBIT         0x08000000
+#define BCCK_RXREPORT_RATEERROR         0x04000000
+#define BCCK_RXREPORT_RXRATE            0x03000000
+#define BCCK_RXFA_COUNTER_LOWER         0xff
+#define BCCK_RXFA_COUNTER_UPPER         0xff000000
+#define BCCK_RXHPAGC_START              0xe000
+#define BCCK_RXHPAGC_FINAL              0x1c00
+#define BCCK_RXFALSEALARM_ENABLE        0x8000
+#define BCCK_FACOUNTER_FREEZE           0x4000
+#define BCCK_TXPATH_SEL                 0x10000000
+#define BCCK_DEFAULT_RXPATH             0xc000000
+#define BCCK_OPTION_RXPATH              0x3000000
+
+#define BNUM_OFSTF                      0x3
+#define BSHIFT_L                        0xc0
+#define BGI_TH                          0xc
+#define BRXPATH_A                       0x1
+#define BRXPATH_B                       0x2
+#define BRXPATH_C                       0x4
+#define BRXPATH_D                       0x8
+#define BTXPATH_A                       0x1
+#define BTXPATH_B                       0x2
+#define BTXPATH_C                       0x4
+#define BTXPATH_D                       0x8
+#define BTRSSI_FREQ                     0x200
+#define BADC_BACKOFF                    0x3000
+#define BDFIR_BACKOFF                   0xc000
+#define BTRSSI_LATCH_PHASE              0x10000
+#define BRX_LDC_OFFSET                  0xff
+#define BRX_QDC_OFFSET                  0xff00
+#define BRX_DFIR_MODE                   0x1800000
+#define BRX_DCNF_TYPE                   0xe000000
+#define BRXIQIMB_A                      0x3ff
+#define BRXIQIMB_B                      0xfc00
+#define BRXIQIMB_C                      0x3f0000
+#define BRXIQIMB_D                      0xffc00000
+#define BDC_DC_NOTCH                    0x60000
+#define BRXNB_NOTCH                     0x1f000000
+#define BPD_TH                          0xf
+#define BPD_TH_OPT2                     0xc000
+#define BPWED_TH                        0x700
+#define BIFMF_WIN_L                     0x800
+#define BPD_OPTION                      0x1000
+#define BMF_WIN_L                       0xe000
+#define BBW_SEARCH_L                    0x30000
+#define BWIN_ENH_L                      0xc0000
+#define BBW_TH                          0x700000
+#define BED_TH2                         0x3800000
+#define BBW_OPTION                      0x4000000
+#define BRADIO_TH                       0x18000000
+#define BWINDOW_L                       0xe0000000
+#define BSBD_OPTION                     0x1
+#define BFRAME_TH                       0x1c
+#define BFS_OPTION                      0x60
+#define BDC_SLOPE_CHECK                 0x80
+#define BFGUARD_COUNTER_DC_L            0xe00
+#define BFRAME_WEIGHT_SHORT             0x7000
+#define BSUB_TUNE                       0xe00000
+#define BFRAME_DC_LENGTH                0xe000000
+#define BSBD_START_OFFSET               0x30000000
+#define BFRAME_TH_2                     0x7
+#define BFRAME_GI2_TH                   0x38
+#define BGI2_SYNC_EN                    0x40
+#define BSARCH_SHORT_EARLY              0x300
+#define BSARCH_SHORT_LATE               0xc00
+#define BSARCH_GI2_LATE                 0x70000
+#define BCFOANTSUM                      0x1
+#define BCFOACC                         0x2
+#define BCFOSTARTOFFSET                 0xc
+#define BCFOLOOPBACK                    0x70
+#define BCFOSUMWEIGHT                   0x80
+#define BDAGCENABLE                     0x10000
+#define BTXIQIMB_A                      0x3ff
+#define BTXIQIMB_b                      0xfc00
+#define BTXIQIMB_C                      0x3f0000
+#define BTXIQIMB_D                      0xffc00000
+#define BTXIDCOFFSET                    0xff
+#define BTXIQDCOFFSET                   0xff00
+#define BTXDFIRMODE                     0x10000
+#define BTXPESUDO_NOISEON               0x4000000
+#define BTXPESUDO_NOISE_A               0xff
+#define BTXPESUDO_NOISE_B               0xff00
+#define BTXPESUDO_NOISE_C               0xff0000
+#define BTXPESUDO_NOISE_D               0xff000000
+#define BCCA_DROPOPTION                 0x20000
+#define BCCA_DROPTHRES                  0xfff00000
+#define BEDCCA_H                        0xf
+#define BEDCCA_L                        0xf0
+#define BLAMBDA_ED                      0x300
+#define BRX_INITIALGAIN                 0x7f
+#define BRX_ANTDIV_EN                   0x80
+#define BRX_AGC_ADDRESS_FOR_LNA         0x7f00
+#define BRX_HIGHPOWER_FLOW              0x8000
+#define BRX_AGC_FREEZE_THRES            0xc0000
+#define BRX_FREEZESTEP_AGC1             0x300000
+#define BRX_FREEZESTEP_AGC2             0xc00000
+#define BRX_FREEZESTEP_AGC3             0x3000000
+#define BRX_FREEZESTEP_AGC0             0xc000000
+#define BRXRSSI_CMP_EN                  0x10000000
+#define BRXQUICK_AGCEN                  0x20000000
+#define BRXAGC_FREEZE_THRES_MODE        0x40000000
+#define BRX_OVERFLOW_CHECKTYPE          0x80000000
+#define BRX_AGCSHIFT                    0x7f
+#define BTRSW_TRI_ONLY                  0x80
+#define BPOWER_THRES                    0x300
+#define BRXAGC_EN                       0x1
+#define BRXAGC_TOGETHER_EN              0x2
+#define BRXAGC_MIN                      0x4
+#define BRXHP_INI                       0x7
+#define BRXHP_TRLNA                     0x70
+#define BRXHP_RSSI                      0x700
+#define BRXHP_BBP1                      0x7000
+#define BRXHP_BBP2                      0x70000
+#define BRXHP_BBP3                      0x700000
+#define BRSSI_H                         0x7f0000
+#define BRSSI_GEN                       0x7f000000
+#define BRXSETTLE_TRSW                  0x7
+#define BRXSETTLE_LNA                   0x38
+#define BRXSETTLE_RSSI                  0x1c0
+#define BRXSETTLE_BBP                   0xe00
+#define BRXSETTLE_RXHP                  0x7000
+#define BRXSETTLE_ANTSW_RSSI            0x38000
+#define BRXSETTLE_ANTSW                 0xc0000
+#define BRXPROCESS_TIME_DAGC            0x300000
+#define BRXSETTLE_HSSI                  0x400000
+#define BRXPROCESS_TIME_BBPPW           0x800000
+#define BRXANTENNA_POWER_SHIFT          0x3000000
+#define BRSSI_TABLE_SELECT              0xc000000
+#define BRXHP_FINAL                     0x7000000
+#define BRXHPSETTLE_BBP                 0x7
+#define BRXHTSETTLE_HSSI                0x8
+#define BRXHTSETTLE_RXHP                0x70
+#define BRXHTSETTLE_BBPPW               0x80
+#define BRXHTSETTLE_IDLE                0x300
+#define BRXHTSETTLE_RESERVED            0x1c00
+#define BRXHT_RXHP_EN                   0x8000
+#define BRXAGC_FREEZE_THRES             0x30000
+#define BRXAGC_TOGETHEREN               0x40000
+#define BRXHTAGC_MIN                    0x80000
+#define BRXHTAGC_EN                     0x100000
+#define BRXHTDAGC_EN                    0x200000
+#define BRXHT_RXHP_BBP                  0x1c00000
+#define BRXHT_RXHP_FINAL                0xe0000000
+#define BRXPW_RADIO_TH                  0x3
+#define BRXPW_RADIO_EN                  0x4
+#define BRXMF_HOLD                      0x3800
+#define BRXPD_DELAY_TH1                 0x38
+#define BRXPD_DELAY_TH2                 0x1c0
+#define BRXPD_DC_COUNT_MAX              0x600
+#define BRXPD_DELAY_TH                  0x8000
+#define BRXPROCESS_DELAY                0xf0000
+#define BRXSEARCHRANGE_GI2_EARLY        0x700000
+#define BRXFRAME_FUARD_COUNTER_L        0x3800000
+#define BRXSGI_GUARD_L                  0xc000000
+#define BRXSGI_SEARCH_L                 0x30000000
+#define BRXSGI_TH                       0xc0000000
+#define BDFSCNT0                        0xff
+#define BDFSCNT1                        0xff00
+#define BDFSFLAG                        0xf0000
+#define BMF_WEIGHT_SUM                  0x300000
+#define BMINIDX_TH                      0x7f000000
+#define BDAFORMAT                       0x40000
+#define BTXCH_EMU_ENABLE                0x01000000
+#define BTRSW_ISOLATION_A               0x7f
+#define BTRSW_ISOLATION_B               0x7f00
+#define BTRSW_ISOLATION_C               0x7f0000
+#define BTRSW_ISOLATION_D               0x7f000000
+#define BEXT_LNA_GAIN                   0x7c00
+
+#define BSTBC_EN                        0x4
+#define BANTENNA_MAPPING                0x10
+#define BNSS                            0x20
+#define BCFO_ANTSUM_ID                  0x200
+#define BPHY_COUNTER_RESET              0x8000000
+#define BCFO_REPORT_GET                 0x4000000
+#define BOFDM_CONTINUE_TX               0x10000000
+#define BOFDM_SINGLE_CARRIER            0x20000000
+#define BOFDM_SINGLE_TONE               0x40000000
+#define BHT_DETECT                      0x100
+#define BCFOEN                          0x10000
+#define BCFOVALUE                       0xfff00000
+#define BSIGTONE_RE                     0x3f
+#define BSIGTONE_IM                     0x7f00
+#define BCOUNTER_CCA                    0xffff
+#define BCOUNTER_PARITYFAIL             0xffff0000
+#define BCOUNTER_RATEILLEGAL            0xffff
+#define BCOUNTER_CRC8FAIL               0xffff0000
+#define BCOUNTER_MCSNOSUPPORT           0xffff
+#define BCOUNTER_FASTSYNC               0xffff
+#define BSHORTCFO                       0xfff
+#define BSHORTCFOT_LENGTH               12
+#define BSHORTCFOF_LENGTH               11
+#define BLONGCFO                        0x7ff
+#define BLONGCFOT_LENGTH                11
+#define BLONGCFOF_LENGTH                11
+#define BTAILCFO                        0x1fff
+#define BTAILCFOT_LENGTH                13
+#define BTAILCFOF_LENGTH                12
+#define BNOISE_EN_PWDB                  0xffff
+#define BCC_POWER_DB                    0xffff0000
+#define BMOISE_PWDB                     0xffff
+#define BPOWERMEAST_LENGTH              10
+#define BPOWERMEASF_LENGTH              3
+#define BRX_HT_BW                       0x1
+#define BRXSC                           0x6
+#define BRX_HT                          0x8
+#define BNB_INTF_DET_ON                 0x1
+#define BINTF_WIN_LEN_CFG               0x30
+#define BNB_INTF_TH_CFG                 0x1c0
+#define BRFGAIN                         0x3f
+#define BTABLESEL                       0x40
+#define BTRSW                           0x80
+#define BRXSNR_A                        0xff
+#define BRXSNR_B                        0xff00
+#define BRXSNR_C                        0xff0000
+#define BRXSNR_D                        0xff000000
+#define BSNR_EVMT_LENGTH                8
+#define BSNR_EVMF_LENGTH                1
+#define BCSI1ST                         0xff
+#define BCSI2ND                         0xff00
+#define BRXEVM1ST                       0xff0000
+#define BRXEVM2ND                       0xff000000
+#define BSIGEVM                         0xff
+#define BPWDB                           0xff00
+#define BSGIEN                          0x10000
+
+#define BSFACTOR_QMA1                   0xf
+#define BSFACTOR_QMA2                   0xf0
+#define BSFACTOR_QMA3                   0xf00
+#define BSFACTOR_QMA4                   0xf000
+#define BSFACTOR_QMA5                   0xf0000
+#define BSFACTOR_QMA6                   0xf0000
+#define BSFACTOR_QMA7                   0xf00000
+#define BSFACTOR_QMA8                   0xf000000
+#define BSFACTOR_QMA9                   0xf0000000
+#define BCSI_SCHEME                     0x100000
+
+#define BNOISE_LVL_TOP_SET              0x3
+#define BCHSMOOTH                       0x4
+#define BCHSMOOTH_CFG1                  0x38
+#define BCHSMOOTH_CFG2                  0x1c0
+#define BCHSMOOTH_CFG3                  0xe00
+#define BCHSMOOTH_CFG4                  0x7000
+#define BMRCMODE                        0x800000
+#define BTHEVMCFG                       0x7000000
+
+#define BLOOP_FIT_TYPE                  0x1
+#define BUPD_CFO                        0x40
+#define BUPD_CFO_OFFDATA                0x80
+#define BADV_UPD_CFO                    0x100
+#define BADV_TIME_CTRL                  0x800
+#define BUPD_CLKO                       0x1000
+#define BFC                             0x6000
+#define BTRACKING_MODE                  0x8000
+#define BPHCMP_ENABLE                   0x10000
+#define BUPD_CLKO_LTF                   0x20000
+#define BCOM_CH_CFO                     0x40000
+#define BCSI_ESTI_MODE                  0x80000
+#define BADV_UPD_EQZ                    0x100000
+#define BUCHCFG                         0x7000000
+#define BUPDEQZ                         0x8000000
+
+#define BRX_PESUDO_NOISE_ON             0x20000000
+#define BRX_PESUDO_NOISE_A              0xff
+#define BRX_PESUDO_NOISE_B              0xff00
+#define BRX_PESUDO_NOISE_C              0xff0000
+#define BRX_PESUDO_NOISE_D              0xff000000
+#define BRX_PESUDO_NOISESTATE_A         0xffff
+#define BRX_PESUDO_NOISESTATE_B         0xffff0000
+#define BRX_PESUDO_NOISESTATE_C         0xffff
+#define BRX_PESUDO_NOISESTATE_D         0xffff0000
+
+#define BZEBRA1_HSSIENABLE              0x8
+#define BZEBRA1_TRXCONTROL              0xc00
+#define BZEBRA1_TRXGAINSETTING          0x07f
+#define BZEBRA1_RXCOUNTER               0xc00
+#define BZEBRA1_TXCHANGEPUMP            0x38
+#define BZEBRA1_RXCHANGEPUMP            0x7
+#define BZEBRA1_CHANNEL_NUM             0xf80
+#define BZEBRA1_TXLPFBW                 0x400
+#define BZEBRA1_RXLPFBW                 0x600
+
+#define BRTL8256REG_MODE_CTRL1          0x100
+#define BRTL8256REG_MODE_CTRL0          0x40
+#define BRTL8256REG_TXLPFBW             0x18
+#define BRTL8256REG_RXLPFBW             0x600
+
+#define BRTL8258_TXLPFBW                0xc
+#define BRTL8258_RXLPFBW                0xc00
+#define BRTL8258_RSSILPFBW              0xc0
+
+#define BBYTE0                          0x1
+#define BBYTE1                          0x2
+#define BBYTE2                          0x4
+#define BBYTE3                          0x8
+#define BWORD0                          0x3
+#define BWORD1                          0xc
+#define BWORD                           0xf
+
+#define MASKBYTE0                       0xff
+#define MASKBYTE1                       0xff00
+#define MASKBYTE2                       0xff0000
+#define MASKBYTE3                       0xff000000
+#define MASKHWORD                       0xffff0000
+#define MASKLWORD                       0x0000ffff
+#define MASKDWORD                       0xffffffff
+#define MASK12BITS                      0xfff
+#define MASKH4BITS                      0xf0000000
+#define MASKOFDM_D                      0xffc00000
+#define MASKCCK                         0x3f3f3f3f
+
+#define MASK4BITS                       0x0f
+#define MASK20BITS                      0xfffff
+#define RFREG_OFFSET_MASK               0xfffff
+
+#define BENABLE                         0x1
+#define BDISABLE                        0x0
+
+#define LEFT_ANTENNA                    0x0
+#define RIGHT_ANTENNA                   0x1
+
+#define TCHECK_TXSTATUS                 500
+#define TUPDATE_RXCOUNTER               100
+
+#define REG_UN_used_register            0x01bf
+
+/* Path_A RFE cotrol pinmux*/
+#define         RA_RFE_PINMUX           0xcb0
+/* Path_B RFE control pinmux*/
+#define         RB_RFE_PINMUX           0xeb0
+
+#define         RA_RFE_INV              0xcb4
+#define         RB_RFE_INV              0xeb4
+
+/* RXIQC */
+/*RxIQ imblance matrix coeff. A & B*/
+#define RA_RXIQC_AB                     0xc10
+/*RxIQ imblance matrix coeff. C & D*/
+#define RA_RXIQC_CD                     0xc14
+/* Pah_A TX scaling factor*/
+#define RA_TXSCALE                      0xc1c
+/* Path_B TX scaling factor*/
+#define RB_TXSCALE                      0xe1c
+/*RxIQ imblance matrix coeff. A & B*/
+#define RB_RXIQC_AB                     0xe10
+/*RxIQ imblance matrix coeff. C & D*/
+#define RB_RXIQC_CD                     0xe14
+/*bit mask for IQC matrix element A & C*/
+#define RXIQC_AC                        0x02ff
+ /*bit mask for IQC matrix element A & C*/
+#define RXIQC_BD                        0x02ff0000
+
+/* 2 EFUSE_TEST (For RTL8723 partially) */
+#define EFUSE_SEL(x)                    (((x) & 0x3) << 8)
+#define EFUSE_SEL_MASK                  0x300
+#define EFUSE_WIFI_SEL_0                0x0
+
+/*REG_MULTI_FUNC_CTRL(For RTL8723 Only)*/
+/* Enable GPIO[9] as WiFi HW PDn source*/
+#define WL_HWPDN_EN                     BIT(0)
+/* WiFi HW PDn polarity control*/
+#define WL_HWPDN_SL                     BIT(1)
+/* WiFi function enable */
+#define WL_FUNC_EN                      BIT(2)
+/* Enable GPIO[9] as WiFi RF HW PDn source */
+#define WL_HWROF_EN                     BIT(3)
+/* Enable GPIO[11] as BT HW PDn source */
+#define BT_HWPDN_EN                     BIT(16)
+/* BT HW PDn polarity control */
+#define BT_HWPDN_SL                     BIT(17)
+/* BT function enable */
+#define BT_FUNC_EN                      BIT(18)
+/* Enable GPIO[11] as BT/GPS RF HW PDn source */
+#define BT_HWROF_EN                     BIT(19)
+/* Enable GPIO[10] as GPS HW PDn source */
+#define GPS_HWPDN_EN                    BIT(20)
+/* GPS HW PDn polarity control */
+#define GPS_HWPDN_SL                    BIT(21)
+/* GPS function enable */
+#define GPS_FUNC_EN                     BIT(22)
+
+#define BMASKBYTE0                      0xff
+#define BMASKBYTE1                      0xff00
+#define BMASKBYTE2                      0xff0000
+#define BMASKBYTE3                      0xff000000
+#define BMASKHWORD                      0xffff0000
+#define BMASKLWORD                      0x0000ffff
+#define BMASKDWORD                      0xffffffff
+#define BMASK12BITS                     0xfff
+#define BMASKH4BITS                     0xf0000000
+#define BMASKOFDM_D                     0xffc00000
+#define BMASKCCK                        0x3f3f3f3f
+
+#define BRFREGOFFSETMASK                0xfffff
+
+#define ODM_REG_CCK_RPT_FORMAT_11AC     0x804
+#define ODM_REG_BB_RX_PATH_11AC         0x808
+/*PAGE 9*/
+#define ODM_REG_OFDM_FA_RST_11AC        0x9A4
+/*PAGE A*/
+#define ODM_REG_CCK_CCA_11AC            0xA0A
+#define ODM_REG_CCK_FA_RST_11AC         0xA2C
+#define ODM_REG_CCK_FA_11AC             0xA5C
+/*PAGE C*/
+#define ODM_REG_IGI_A_11AC              0xC50
+/*PAGE E*/
+#define ODM_REG_IGI_B_11AC              0xE50
+/*PAGE F*/
+#define ODM_REG_OFDM_FA_11AC            0xF48
+
+/* 2 MAC REG LIST */
+
+/* DIG Related */
+#define ODM_BIT_IGI_11AC                0xFFFFFFFF
+#define ODM_BIT_CCK_RPT_FORMAT_11AC     BIT16
+#define ODM_BIT_BB_RX_PATH_11AC         0xF
+
+enum AGGRE_SIZE {
+        HT_AGG_SIZE_8K = 0,
+        HT_AGG_SIZE_16K = 1,
+        HT_AGG_SIZE_32K = 2,
+        HT_AGG_SIZE_64K = 3,
+        VHT_AGG_SIZE_128K = 4,
+        VHT_AGG_SIZE_256K = 5,
+        VHT_AGG_SIZE_512K = 6,
+        VHT_AGG_SIZE_1024K = 7,
+};
+
+#define REG_AMPDU_MAX_LENGTH_8812       0x0458
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/rf.c b/drivers/net/wireless/rtlwifi/rtl8821ae/rf.c
new file mode 100644
index 000000000000..2922538160e5
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/rf.c
@@ -0,0 +1,465 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "rf.h"
+#include "dm.h"
+
+static bool _rtl8821ae_phy_rf6052_config_parafile(struct ieee80211_hw *hw);
+
+void rtl8821ae_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        switch (bandwidth) {
+        case HT_CHANNEL_WIDTH_20:
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, BIT(11)|BIT(10), 3);
+                rtl_set_rfreg(hw, RF90_PATH_B, RF_CHNLBW, BIT(11)|BIT(10), 3);
+                break;
+        case HT_CHANNEL_WIDTH_20_40:
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, BIT(11)|BIT(10), 1);
+                rtl_set_rfreg(hw, RF90_PATH_B, RF_CHNLBW, BIT(11)|BIT(10), 1);
+                break;
+        case HT_CHANNEL_WIDTH_80:
+                rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, BIT(11)|BIT(10), 0);
+                rtl_set_rfreg(hw, RF90_PATH_B, RF_CHNLBW, BIT(11)|BIT(10), 0);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "unknown bandwidth: %#X\n", bandwidth);
+                break;
+        }
+}
+
+void rtl8821ae_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
+                                          u8 *ppowerlevel)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        u32 tx_agc[2] = {0, 0}, tmpval;
+        bool turbo_scanoff = false;
+        u8 idx1, idx2;
+        u8 *ptr;
+        u8 direction;
+        u32 pwrtrac_value;
+
+        if (rtlefuse->eeprom_regulatory != 0)
+                turbo_scanoff = true;
+
+        if (mac->act_scanning) {
+                tx_agc[RF90_PATH_A] = 0x3f3f3f3f;
+                tx_agc[RF90_PATH_B] = 0x3f3f3f3f;
+
+                if (turbo_scanoff) {
+                        for (idx1 = RF90_PATH_A;
+                                idx1 <= RF90_PATH_B;
+                                idx1++) {
+                                tx_agc[idx1] = ppowerlevel[idx1] |
+                                    (ppowerlevel[idx1] << 8) |
+                                    (ppowerlevel[idx1] << 16) |
+                                    (ppowerlevel[idx1] << 24);
+                        }
+                }
+        } else {
+                for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
+                        tx_agc[idx1] = ppowerlevel[idx1] |
+                            (ppowerlevel[idx1] << 8) |
+                            (ppowerlevel[idx1] << 16) |
+                            (ppowerlevel[idx1] << 24);
+                }
+
+                if (rtlefuse->eeprom_regulatory == 0) {
+                        tmpval =
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][6]) +
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][7] <<
+                             8);
+                        tx_agc[RF90_PATH_A] += tmpval;
+
+                        tmpval = (rtlphy->mcs_txpwrlevel_origoffset[0][14]) +
+                            (rtlphy->mcs_txpwrlevel_origoffset[0][15] <<
+                             24);
+                        tx_agc[RF90_PATH_B] += tmpval;
+                }
+        }
+
+        for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
+                ptr = (u8 *)(&tx_agc[idx1]);
+                for (idx2 = 0; idx2 < 4; idx2++) {
+                        if (*ptr > RF6052_MAX_TX_PWR)
+                                *ptr = RF6052_MAX_TX_PWR;
+                        ptr++;
+                }
+        }
+        rtl8821ae_dm_txpower_track_adjust(hw, 1, &direction, &pwrtrac_value);
+        if (direction == 1) {
+                tx_agc[0] += pwrtrac_value;
+                tx_agc[1] += pwrtrac_value;
+        } else if (direction == 2) {
+                tx_agc[0] -= pwrtrac_value;
+                tx_agc[1] -= pwrtrac_value;
+        }
+        tmpval = tx_agc[RF90_PATH_A];
+        rtl_set_bbreg(hw, RTXAGC_A_CCK11_CCK1, MASKDWORD, tmpval);
+
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 1~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
+                 RTXAGC_A_CCK11_CCK1);
+
+        tmpval = tx_agc[RF90_PATH_B];
+        rtl_set_bbreg(hw, RTXAGC_B_CCK11_CCK1, MASKDWORD, tmpval);
+
+        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
+                 RTXAGC_B_CCK11_CCK1);
+}
+
+static void rtl8821ae_phy_get_power_base(struct ieee80211_hw *hw,
+                                         u8 *ppowerlevel_ofdm,
+                                         u8 *ppowerlevel_bw20,
+                                         u8 *ppowerlevel_bw40, u8 channel,
+                                         u32 *ofdmbase, u32 *mcsbase)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u32 powerbase0, powerbase1;
+        u8 i, powerlevel[2];
+
+        for (i = 0; i < 2; i++) {
+                powerbase0 = ppowerlevel_ofdm[i];
+
+                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));
+        }
+
+        for (i = 0; i < 2; i++) {
+                if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20)
+                        powerlevel[i] = ppowerlevel_bw20[i];
+                else
+                        powerlevel[i] = ppowerlevel_bw40[i];
+
+                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));
+        }
+}
+
+static void get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
+                                               u8 channel, u8 index,
+                                               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], pwr_diff = 0, customer_pwr_diff;
+        u32 writeval, customer_limit, rf;
+
+        for (rf = 0; rf < 2; rf++) {
+                switch (rtlefuse->eeprom_regulatory) {
+                case 0:
+                        chnlgroup = 0;
+
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup][index +
+                                                        (rf ? 8 : 0)]
+                            + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, writeval(%c) = 0x%x\n",
+                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        break;
+                case 1:
+                        if (rtlphy->pwrgroup_cnt == 1) {
+                                chnlgroup = 0;
+                        } else {
+                                if (channel < 3)
+                                        chnlgroup = 0;
+                                else if (channel < 6)
+                                        chnlgroup = 1;
+                                else if (channel < 9)
+                                        chnlgroup = 2;
+                                else if (channel < 12)
+                                        chnlgroup = 3;
+                                else if (channel < 14)
+                                        chnlgroup = 4;
+                                else if (channel == 14)
+                                        chnlgroup = 5;
+                        }
+
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
+                            [index + (rf ? 8 : 0)] + ((index < 2) ?
+                                                      powerbase0[rf] :
+                                                      powerbase1[rf]);
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
+                                 ((rf == 0) ? 'A' : 'B'), writeval);
+
+                        break;
+                case 2:
+                        writeval =
+                            ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Better regulatory, writeval(%c) = 0x%x\n",
+                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        break;
+                case 3:
+                        chnlgroup = 0;
+
+                        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
+                                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
+                                         ((rf == 0) ? 'A' : 'B'),
+                                         rtlefuse->pwrgroup_ht40[rf][channel -
+                                                                     1]);
+                        } else {
+                                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                         ((rf == 0) ? 'A' : 'B'),
+                                         rtlefuse->pwrgroup_ht20[rf][channel -
+                                                                     1]);
+                        }
+
+                        if (index < 2)
+                                pwr_diff = rtlefuse->txpwr_legacyhtdiff[rf][channel-1];
+                        else if (rtlphy->current_chan_bw ==  HT_CHANNEL_WIDTH_20)
+                                pwr_diff =
+                                  rtlefuse->txpwr_ht20diff[rf][channel-1];
+
+                        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40)
+                                customer_pwr_diff =
+                                  rtlefuse->pwrgroup_ht40[rf][channel-1];
+                        else
+                                customer_pwr_diff =
+                                  rtlefuse->pwrgroup_ht20[rf][channel-1];
+
+                        if (pwr_diff > customer_pwr_diff)
+                                pwr_diff = 0;
+                        else
+                                pwr_diff = customer_pwr_diff - pwr_diff;
+
+                        for (i = 0; i < 4; i++) {
+                                pwr_diff_limit[i] =
+                                    (u8)((rtlphy->mcs_txpwrlevel_origoffset
+                                    [chnlgroup][index + (rf ? 8 : 0)] &
+                                    (0x7f << (i * 8))) >> (i * 8));
+
+                                if (pwr_diff_limit[i] > pwr_diff)
+                                        pwr_diff_limit[i] = pwr_diff;
+                        }
+
+                        customer_limit = (pwr_diff_limit[3] << 24) |
+                            (pwr_diff_limit[2] << 16) |
+                            (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
+
+                        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]);
+
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Customer, writeval rf(%c)= 0x%x\n",
+                                 ((rf == 0) ? 'A' : 'B'), writeval);
+                        break;
+                default:
+                        chnlgroup = 0;
+                        writeval =
+                            rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
+                            [index + (rf ? 8 : 0)]
+                            + ((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);
+                        break;
+                }
+
+                if (rtlpriv->dm.dynamic_txhighpower_lvl == TXHIGHPWRLEVEL_BT1)
+                        writeval = writeval - 0x06060606;
+                else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
+                         TXHIGHPWRLEVEL_BT2)
+                        writeval = writeval - 0x0c0c0c0c;
+                *(p_outwriteval + rf) = writeval;
+        }
+}
+
+static void _rtl8821ae_write_ofdm_power_reg(struct ieee80211_hw *hw,
+                                            u8 index, u32 *pvalue)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u16 regoffset_a[6] = {
+                RTXAGC_A_OFDM18_OFDM6, RTXAGC_A_OFDM54_OFDM24,
+                RTXAGC_A_MCS03_MCS00, RTXAGC_A_MCS07_MCS04,
+                RTXAGC_A_MCS11_MCS08, RTXAGC_A_MCS15_MCS12
+        };
+        u16 regoffset_b[6] = {
+                RTXAGC_B_OFDM18_OFDM6, RTXAGC_B_OFDM54_OFDM24,
+                RTXAGC_B_MCS03_MCS00, RTXAGC_B_MCS07_MCS04,
+                RTXAGC_B_MCS11_MCS08, RTXAGC_B_MCS15_MCS12
+        };
+        u8 i, rf, pwr_val[4];
+        u32 writeval;
+        u16 regoffset;
+
+        for (rf = 0; rf < 2; rf++) {
+                writeval = pvalue[rf];
+                for (i = 0; i < 4; i++) {
+                        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) |
+                    (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);
+
+                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                        "Set 0x%x = %08x\n", regoffset, writeval);
+        }
+}
+
+void rtl8821ae_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
+                                           u8 *ppowerlevel_ofdm,
+                                           u8 *ppowerlevel_bw20,
+                                           u8 *ppowerlevel_bw40,
+                                           u8 channel)
+{
+        u32 writeval[2], powerbase0[2], powerbase1[2];
+        u8 index;
+        u8 direction;
+        u32 pwrtrac_value;
+
+        rtl8821ae_phy_get_power_base(hw, ppowerlevel_ofdm,
+                                     ppowerlevel_bw20,
+                                     ppowerlevel_bw40,
+                                     channel,
+                                     &powerbase0[0],
+                                     &powerbase1[0]);
+
+        rtl8821ae_dm_txpower_track_adjust(hw, 1, &direction, &pwrtrac_value);
+
+        for (index = 0; index < 6; index++) {
+                get_txpower_writeval_by_regulatory(hw, channel, index,
+                                                   &powerbase0[0],
+                                                   &powerbase1[0],
+                                                   &writeval[0]);
+                if (direction == 1) {
+                        writeval[0] += pwrtrac_value;
+                        writeval[1] += pwrtrac_value;
+                } else if (direction == 2) {
+                        writeval[0] -= pwrtrac_value;
+                        writeval[1] -= pwrtrac_value;
+                }
+                _rtl8821ae_write_ofdm_power_reg(hw, index, &writeval[0]);
+        }
+}
+
+bool rtl8821ae_phy_rf6052_config(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+
+        if (rtlphy->rf_type == RF_1T1R)
+                rtlphy->num_total_rfpath = 1;
+        else
+                rtlphy->num_total_rfpath = 2;
+
+        return _rtl8821ae_phy_rf6052_config_parafile(hw);
+}
+
+static bool _rtl8821ae_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        u8 rfpath;
+        bool rtstatus = true;
+
+        for (rfpath = 0; rfpath < rtlphy->num_total_rfpath; rfpath++) {
+                switch (rfpath) {
+                case RF90_PATH_A: {
+                        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                                rtstatus =
+                                  rtl8812ae_phy_config_rf_with_headerfile(hw,
+                                                        (enum radio_path)rfpath);
+                        else
+                                rtstatus =
+                                  rtl8821ae_phy_config_rf_with_headerfile(hw,
+                                                        (enum radio_path)rfpath);
+                        break;
+                        }
+                case RF90_PATH_B:
+                        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                                rtstatus =
+                                  rtl8812ae_phy_config_rf_with_headerfile(hw,
+                                                        (enum radio_path)rfpath);
+                        else
+                                rtstatus =
+                                  rtl8821ae_phy_config_rf_with_headerfile(hw,
+                                                        (enum radio_path)rfpath);
+                        break;
+                case RF90_PATH_C:
+                        break;
+                case RF90_PATH_D:
+                        break;
+                }
+
+                if (!rtstatus) {
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                                 "Radio[%d] Fail!!", rfpath);
+                        return false;
+                }
+        }
+
+        /*put arrays in dm.c*/
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "\n");
+        return rtstatus;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/rf.h b/drivers/net/wireless/rtlwifi/rtl8821ae/rf.h
new file mode 100644
index 000000000000..d9582ee1c335
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/rf.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_RF_H__
+#define __RTL8821AE_RF_H__
+
+#define RF6052_MAX_TX_PWR               0x3F
+#define RF6052_MAX_REG                  0x3F
+
+void rtl8821ae_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw,
+                                        u8 bandwidth);
+void rtl8821ae_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
+                                          u8 *ppowerlevel);
+void rtl8821ae_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
+                                           u8 *ppowerlevel_ofdm,
+                                           u8 *ppowerlevel_bw20,
+                                           u8 *ppowerlevel_bw40,
+                                           u8 channel);
+bool rtl8821ae_phy_rf6052_config(struct ieee80211_hw *hw);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c
new file mode 100644
index 000000000000..fc92dd6a0d07
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c
@@ -0,0 +1,484 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../core.h"
+#include "../pci.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "hw.h"
+#include "fw.h"
+#include "sw.h"
+#include "trx.h"
+#include "led.h"
+#include "table.h"
+#include "../btcoexist/rtl_btc.h"
+
+#include <linux/vmalloc.h>
+#include <linux/module.h>
+
+static void rtl8821ae_init_aspm_vars(struct ieee80211_hw *hw)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+
+        /*close ASPM for AMD defaultly */
+        rtlpci->const_amdpci_aspm = 0;
+
+        /**
+         * ASPM PS mode.
+         * 0 - Disable ASPM,
+         * 1 - Enable ASPM without Clock Req,
+         * 2 - Enable ASPM with Clock Req,
+         * 3 - Alwyas Enable ASPM with Clock Req,
+         * 4 - Always Enable ASPM without Clock Req.
+         * set defult to RTL8192CE:3 RTL8192E:2
+         */
+        rtlpci->const_pci_aspm = 3;
+
+        /*Setting for PCI-E device */
+        rtlpci->const_devicepci_aspm_setting = 0x03;
+
+        /*Setting for PCI-E bridge */
+        rtlpci->const_hostpci_aspm_setting = 0x02;
+
+        /**
+         * In Hw/Sw Radio Off situation.
+         * 0 - Default,
+         * 1 - From ASPM setting without low Mac Pwr,
+         * 2 - From ASPM setting with low Mac Pwr,
+         * 3 - Bus D3
+         * set default to RTL8192CE:0 RTL8192SE:2
+         */
+        rtlpci->const_hwsw_rfoff_d3 = 0;
+
+        /**
+         * This setting works for those device with
+         * backdoor ASPM setting such as EPHY setting.
+         * 0 - Not support ASPM,
+         * 1 - Support ASPM,
+         * 2 - According to chipset.
+         */
+        rtlpci->const_support_pciaspm = 1;
+}
+
+static void load_wowlan_fw(struct rtl_priv *rtlpriv)
+{
+        /* callback routine to load wowlan firmware after main fw has
+         * been loaded
+         */
+        const struct firmware *wowlan_firmware;
+        char *fw_name = NULL;
+        int err;
+
+        /* for wowlan firmware buf */
+        rtlpriv->rtlhal.wowlan_firmware = vzalloc(0x8000);
+        if (!rtlpriv->rtlhal.wowlan_firmware) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't alloc buffer for wowlan fw.\n");
+                return;
+        }
+
+        if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8821AE)
+                fw_name = "rtlwifi/rtl8821aefw_wowlan.bin";
+        else
+                fw_name = "rtlwifi/rtl8812aefw_wowlan.bin";
+        err = request_firmware(&wowlan_firmware, fw_name, rtlpriv->io.dev);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Failed to request wowlan firmware!\n");
+                goto error;
+        }
+
+        if (wowlan_firmware->size > 0x8000) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Wowlan Firmware is too big!\n");
+                goto error;
+        }
+
+        memcpy(rtlpriv->rtlhal.wowlan_firmware, wowlan_firmware->data,
+               wowlan_firmware->size);
+        rtlpriv->rtlhal.wowlan_fwsize = wowlan_firmware->size;
+        release_firmware(wowlan_firmware);
+
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "WOWLAN FirmwareDownload OK\n");
+        return;
+error:
+        release_firmware(wowlan_firmware);
+        vfree(rtlpriv->rtlhal.wowlan_firmware);
+}
+
+/*InitializeVariables8812E*/
+int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
+{
+        int err = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+        rtl8821ae_bt_reg_init(hw);
+        rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
+        rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();
+
+        rtlpriv->dm.dm_initialgain_enable = 1;
+        rtlpriv->dm.dm_flag = 0;
+        rtlpriv->dm.disable_framebursting = 0;
+        rtlpriv->dm.thermalvalue = 0;
+        rtlpci->transmit_config = CFENDFORM | BIT(15) | BIT(24) | BIT(25);
+
+        mac->ht_enable = true;
+        mac->ht_cur_stbc = 0;
+        mac->ht_stbc_cap = 0;
+        mac->vht_cur_ldpc = 0;
+        mac->vht_ldpc_cap = 0;
+        mac->vht_cur_stbc = 0;
+        mac->vht_stbc_cap = 0;
+
+        rtlpriv->rtlhal.current_bandtype = BAND_ON_2_4G;
+        /*following 2 is for register 5G band, refer to _rtl_init_mac80211()*/
+        rtlpriv->rtlhal.bandset = BAND_ON_BOTH;
+        rtlpriv->rtlhal.macphymode = SINGLEMAC_SINGLEPHY;
+
+        rtlpci->receive_config = (RCR_APPFCS    |
+                                RCR_APP_MIC             |
+                                RCR_APP_ICV             |
+                                RCR_APP_PHYST_RXFF      |
+                                RCR_NONQOS_VHT          |
+                                RCR_HTC_LOC_CTRL        |
+                                RCR_AMF                 |
+                                RCR_ACF                 |
+                        /*This bit controls the PS-Poll packet filter.*/
+                                RCR_ADF                 |
+                                RCR_AICV                |
+                                RCR_ACRC32              |
+                                RCR_AB                  |
+                                RCR_AM                  |
+                                RCR_APM                 |
+                                0);
+
+        rtlpci->irq_mask[0] =
+             (u32)(IMR_PSTIMEOUT                        |
+                                IMR_GTINT3              |
+                                IMR_HSISR_IND_ON_INT    |
+                                IMR_C2HCMD              |
+                                IMR_HIGHDOK             |
+                                IMR_MGNTDOK             |
+                                IMR_BKDOK               |
+                                IMR_BEDOK               |
+                                IMR_VIDOK               |
+                                IMR_VODOK               |
+                                IMR_RDU                 |
+                                IMR_ROK                 |
+                                0);
+
+        rtlpci->irq_mask[1]     =
+                 (u32)(IMR_RXFOVW |
+                                IMR_TXFOVW |
+                                0);
+        rtlpci->sys_irq_mask = (u32)(HSIMR_PDN_INT_EN   |
+                                      HSIMR_RON_INT_EN  |
+                                      0);
+        /* for WOWLAN */
+        rtlpriv->psc.wo_wlan_mode = WAKE_ON_MAGIC_PACKET |
+                                    WAKE_ON_PATTERN_MATCH;
+
+        /* for debug level */
+        rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
+        /* for LPS & IPS */
+        rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
+        rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
+        rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
+        rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
+        if (rtlpriv->cfg->mod_params->disable_watchdog)
+                pr_info("watchdog disabled\n");
+        rtlpriv->psc.reg_fwctrl_lps = 3;
+        rtlpriv->psc.reg_max_lps_awakeintvl = 5;
+        rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
+
+        /* for ASPM, you can close aspm through
+         * set const_support_pciaspm = 0
+         */
+        rtl8821ae_init_aspm_vars(hw);
+
+        if (rtlpriv->psc.reg_fwctrl_lps == 1)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_MIN_MODE;
+        else if (rtlpriv->psc.reg_fwctrl_lps == 2)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_MAX_MODE;
+        else if (rtlpriv->psc.reg_fwctrl_lps == 3)
+                rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
+
+        rtlpriv->rtl_fw_second_cb = load_wowlan_fw;
+        /* for firmware buf */
+        rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
+        if (!rtlpriv->rtlhal.pfirmware) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't alloc buffer for fw.\n");
+                return 1;
+        }
+
+        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE)
+                rtlpriv->cfg->fw_name = "rtlwifi/rtl8812aefw.bin";
+        else
+                rtlpriv->cfg->fw_name = "rtlwifi/rtl8821aefw.bin";
+
+        rtlpriv->max_fw_size = 0x8000;
+        pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl_fw_cb);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Failed to request firmware!\n");
+                return 1;
+        }
+        return 0;
+}
+
+void rtl8821ae_deinit_sw_vars(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (rtlpriv->rtlhal.pfirmware) {
+                vfree(rtlpriv->rtlhal.pfirmware);
+                rtlpriv->rtlhal.pfirmware = NULL;
+        }
+#if (USE_SPECIFIC_FW_TO_SUPPORT_WOWLAN == 1)
+        if (rtlpriv->rtlhal.wowlan_firmware) {
+                vfree(rtlpriv->rtlhal.wowlan_firmware);
+                rtlpriv->rtlhal.wowlan_firmware = NULL;
+        }
+#endif
+}
+
+/* get bt coexist status */
+bool rtl8821ae_get_btc_status(void)
+{
+        return true;
+}
+
+static struct rtl_hal_ops rtl8821ae_hal_ops = {
+        .init_sw_vars = rtl8821ae_init_sw_vars,
+        .deinit_sw_vars = rtl8821ae_deinit_sw_vars,
+        .read_eeprom_info = rtl8821ae_read_eeprom_info,
+        .interrupt_recognized = rtl8821ae_interrupt_recognized,
+        .hw_init = rtl8821ae_hw_init,
+        .hw_disable = rtl8821ae_card_disable,
+        .hw_suspend = rtl8821ae_suspend,
+        .hw_resume = rtl8821ae_resume,
+        .enable_interrupt = rtl8821ae_enable_interrupt,
+        .disable_interrupt = rtl8821ae_disable_interrupt,
+        .set_network_type = rtl8821ae_set_network_type,
+        .set_chk_bssid = rtl8821ae_set_check_bssid,
+        .set_qos = rtl8821ae_set_qos,
+        .set_bcn_reg = rtl8821ae_set_beacon_related_registers,
+        .set_bcn_intv = rtl8821ae_set_beacon_interval,
+        .update_interrupt_mask = rtl8821ae_update_interrupt_mask,
+        .get_hw_reg = rtl8821ae_get_hw_reg,
+        .set_hw_reg = rtl8821ae_set_hw_reg,
+        .update_rate_tbl = rtl8821ae_update_hal_rate_tbl,
+        .fill_tx_desc = rtl8821ae_tx_fill_desc,
+        .fill_tx_cmddesc = rtl8821ae_tx_fill_cmddesc,
+        .query_rx_desc = rtl8821ae_rx_query_desc,
+        .set_channel_access = rtl8821ae_update_channel_access_setting,
+        .radio_onoff_checking = rtl8821ae_gpio_radio_on_off_checking,
+        .set_bw_mode = rtl8821ae_phy_set_bw_mode,
+        .switch_channel = rtl8821ae_phy_sw_chnl,
+        .dm_watchdog = rtl8821ae_dm_watchdog,
+        .scan_operation_backup = rtl8821ae_phy_scan_operation_backup,
+        .set_rf_power_state = rtl8821ae_phy_set_rf_power_state,
+        .led_control = rtl8821ae_led_control,
+        .set_desc = rtl8821ae_set_desc,
+        .get_desc = rtl8821ae_get_desc,
+        .is_tx_desc_closed = rtl8821ae_is_tx_desc_closed,
+        .tx_polling = rtl8821ae_tx_polling,
+        .enable_hw_sec = rtl8821ae_enable_hw_security_config,
+        .set_key = rtl8821ae_set_key,
+        .init_sw_leds = rtl8821ae_init_sw_leds,
+        .get_bbreg = rtl8821ae_phy_query_bb_reg,
+        .set_bbreg = rtl8821ae_phy_set_bb_reg,
+        .get_rfreg = rtl8821ae_phy_query_rf_reg,
+        .set_rfreg = rtl8821ae_phy_set_rf_reg,
+        .fill_h2c_cmd = rtl8821ae_fill_h2c_cmd,
+        .get_btc_status = rtl8821ae_get_btc_status,
+        .rx_command_packet = rtl8821ae_rx_command_packet,
+        .add_wowlan_pattern = rtl8821ae_add_wowlan_pattern,
+};
+
+static struct rtl_mod_params rtl8821ae_mod_params = {
+        .sw_crypto = false,
+        .inactiveps = true,
+        .swctrl_lps = false,
+        .fwctrl_lps = true,
+        .msi_support = true,
+        .debug = DBG_EMERG,
+        .disable_watchdog = 0,
+};
+
+static struct rtl_hal_cfg rtl8821ae_hal_cfg = {
+        .bar_id = 2,
+        .write_readback = true,
+        .name = "rtl8821ae_pci",
+        .fw_name = "rtlwifi/rtl8821aefw.bin",
+        .ops = &rtl8821ae_hal_ops,
+        .mod_params = &rtl8821ae_mod_params,
+        .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
+        .maps[SYS_FUNC_EN] = REG_SYS_FUNC_EN,
+        .maps[SYS_CLK] = REG_SYS_CLKR,
+        .maps[MAC_RCR_AM] = AM,
+        .maps[MAC_RCR_AB] = AB,
+        .maps[MAC_RCR_ACRC32] = ACRC32,
+        .maps[MAC_RCR_ACF] = ACF,
+        .maps[MAC_RCR_AAP] = AAP,
+        .maps[MAC_HIMR] = REG_HIMR,
+        .maps[MAC_HIMRE] = REG_HIMRE,
+
+        .maps[EFUSE_ACCESS] = REG_EFUSE_ACCESS,
+
+        .maps[EFUSE_TEST] = REG_EFUSE_TEST,
+        .maps[EFUSE_CTRL] = REG_EFUSE_CTRL,
+        .maps[EFUSE_CLK] = 0,
+        .maps[EFUSE_CLK_CTRL] = REG_EFUSE_CTRL,
+        .maps[EFUSE_PWC_EV12V] = PWC_EV12V,
+        .maps[EFUSE_FEN_ELDR] = FEN_ELDR,
+        .maps[EFUSE_LOADER_CLK_EN] = LOADER_CLK_EN,
+        .maps[EFUSE_ANA8M] = ANA8M,
+        .maps[EFUSE_HWSET_MAX_SIZE] = HWSET_MAX_SIZE,
+        .maps[EFUSE_MAX_SECTION_MAP] = EFUSE_MAX_SECTION,
+        .maps[EFUSE_REAL_CONTENT_SIZE] = EFUSE_REAL_CONTENT_LEN,
+        .maps[EFUSE_OOB_PROTECT_BYTES_LEN] = EFUSE_OOB_PROTECT_BYTES,
+
+        .maps[RWCAM] = REG_CAMCMD,
+        .maps[WCAMI] = REG_CAMWRITE,
+        .maps[RCAMO] = REG_CAMREAD,
+        .maps[CAMDBG] = REG_CAMDBG,
+        .maps[SECR] = REG_SECCFG,
+        .maps[SEC_CAM_NONE] = CAM_NONE,
+        .maps[SEC_CAM_WEP40] = CAM_WEP40,
+        .maps[SEC_CAM_TKIP] = CAM_TKIP,
+        .maps[SEC_CAM_AES] = CAM_AES,
+        .maps[SEC_CAM_WEP104] = CAM_WEP104,
+
+        .maps[RTL_IMR_BCNDMAINT6] = IMR_BCNDMAINT6,
+        .maps[RTL_IMR_BCNDMAINT5] = IMR_BCNDMAINT5,
+        .maps[RTL_IMR_BCNDMAINT4] = IMR_BCNDMAINT4,
+        .maps[RTL_IMR_BCNDMAINT3] = IMR_BCNDMAINT3,
+        .maps[RTL_IMR_BCNDMAINT2] = IMR_BCNDMAINT2,
+        .maps[RTL_IMR_BCNDMAINT1] = IMR_BCNDMAINT1,
+/*      .maps[RTL_IMR_BCNDOK8] = IMR_BCNDOK8,     */   /*need check*/
+        .maps[RTL_IMR_BCNDOK7] = IMR_BCNDOK7,
+        .maps[RTL_IMR_BCNDOK6] = IMR_BCNDOK6,
+        .maps[RTL_IMR_BCNDOK5] = IMR_BCNDOK5,
+        .maps[RTL_IMR_BCNDOK4] = IMR_BCNDOK4,
+        .maps[RTL_IMR_BCNDOK3] = IMR_BCNDOK3,
+        .maps[RTL_IMR_BCNDOK2] = IMR_BCNDOK2,
+        .maps[RTL_IMR_BCNDOK1] = IMR_BCNDOK1,
+/*      .maps[RTL_IMR_TIMEOUT2] = IMR_TIMEOUT2,*/
+/*      .maps[RTL_IMR_TIMEOUT1] = IMR_TIMEOUT1,*/
+
+        .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
+        .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
+        .maps[RTL_IMR_BCNINT] = IMR_BCNDMAINT0,
+        .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW,
+        .maps[RTL_IMR_RDU] = IMR_RDU,
+        .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND,
+        .maps[RTL_IMR_BDOK] = IMR_BCNDOK0,
+        .maps[RTL_IMR_MGNTDOK] = IMR_MGNTDOK,
+        .maps[RTL_IMR_TBDER] = IMR_TBDER,
+        .maps[RTL_IMR_HIGHDOK] = IMR_HIGHDOK,
+        .maps[RTL_IMR_TBDOK] = IMR_TBDOK,
+        .maps[RTL_IMR_BKDOK] = IMR_BKDOK,
+        .maps[RTL_IMR_BEDOK] = IMR_BEDOK,
+        .maps[RTL_IMR_VIDOK] = IMR_VIDOK,
+        .maps[RTL_IMR_VODOK] = IMR_VODOK,
+        .maps[RTL_IMR_ROK] = IMR_ROK,
+        .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNDMAINT0 | IMR_TBDOK | IMR_TBDER),
+
+        .maps[RTL_RC_CCK_RATE1M] = DESC_RATE1M,
+        .maps[RTL_RC_CCK_RATE2M] =  DESC_RATE2M,
+        .maps[RTL_RC_CCK_RATE5_5M] =  DESC_RATE5_5M,
+        .maps[RTL_RC_CCK_RATE11M] =  DESC_RATE11M,
+        .maps[RTL_RC_OFDM_RATE6M] =  DESC_RATE6M,
+        .maps[RTL_RC_OFDM_RATE9M] =  DESC_RATE9M,
+        .maps[RTL_RC_OFDM_RATE12M] =  DESC_RATE12M,
+        .maps[RTL_RC_OFDM_RATE18M] =  DESC_RATE18M,
+        .maps[RTL_RC_OFDM_RATE24M] =  DESC_RATE24M,
+        .maps[RTL_RC_OFDM_RATE36M] =  DESC_RATE36M,
+        .maps[RTL_RC_OFDM_RATE48M] =  DESC_RATE48M,
+        .maps[RTL_RC_OFDM_RATE54M] =  DESC_RATE54M,
+
+        .maps[RTL_RC_HT_RATEMCS7] =  DESC_RATEMCS7,
+        .maps[RTL_RC_HT_RATEMCS15] =  DESC_RATEMCS15,
+
+        /*VHT hightest rate*/
+        .maps[RTL_RC_VHT_RATE_1SS_MCS7] = DESC_RATEVHT1SS_MCS7,
+        .maps[RTL_RC_VHT_RATE_1SS_MCS8] = DESC_RATEVHT1SS_MCS8,
+        .maps[RTL_RC_VHT_RATE_1SS_MCS9] = DESC_RATEVHT1SS_MCS9,
+        .maps[RTL_RC_VHT_RATE_2SS_MCS7] = DESC_RATEVHT2SS_MCS7,
+        .maps[RTL_RC_VHT_RATE_2SS_MCS8] = DESC_RATEVHT2SS_MCS8,
+        .maps[RTL_RC_VHT_RATE_2SS_MCS9] = DESC_RATEVHT2SS_MCS9,
+};
+
+static struct pci_device_id rtl8821ae_pci_ids[] = {
+        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8812, rtl8821ae_hal_cfg)},
+        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8821, rtl8821ae_hal_cfg)},
+        {},
+};
+
+MODULE_DEVICE_TABLE(pci, rtl8821ae_pci_ids);
+
+MODULE_AUTHOR("Realtek WlanFAE  <wlanfae@realtek.com>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Realtek 8821ae 802.11ac PCI wireless");
+MODULE_FIRMWARE("rtlwifi/rtl8821aefw.bin");
+
+module_param_named(swenc, rtl8821ae_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl8821ae_mod_params.debug, int, 0444);
+module_param_named(ips, rtl8821ae_mod_params.inactiveps, bool, 0444);
+module_param_named(swlps, rtl8821ae_mod_params.swctrl_lps, bool, 0444);
+module_param_named(fwlps, rtl8821ae_mod_params.fwctrl_lps, bool, 0444);
+module_param_named(msi, rtl8821ae_mod_params.msi_support, bool, 0444);
+module_param_named(disable_watchdog, rtl8821ae_mod_params.disable_watchdog,
+                   bool, 0444);
+MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
+MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
+MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
+MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
+MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 1)\n");
+MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");
+
+static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+
+static struct pci_driver rtl8821ae_driver = {
+        .name = KBUILD_MODNAME,
+        .id_table = rtl8821ae_pci_ids,
+        .probe = rtl_pci_probe,
+        .remove = rtl_pci_disconnect,
+        .driver.pm = &rtlwifi_pm_ops,
+};
+
+module_pci_driver(rtl8821ae_driver);
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/sw.h b/drivers/net/wireless/rtlwifi/rtl8821ae/sw.h
new file mode 100644
index 000000000000..d001e7ce3052
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/sw.h
@@ -0,0 +1,34 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_SW_H__
+#define __RTL8821AE_SW_H__
+
+int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw);
+void rtl8821ae_deinit_sw_vars(struct ieee80211_hw *hw);
+void rtl8821ae_init_var_map(struct ieee80211_hw *hw);
+bool rtl8821ae_get_btc_status(void);
+
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/table.c b/drivers/net/wireless/rtlwifi/rtl8821ae/table.c
new file mode 100644
index 000000000000..62a0fb76f080
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/table.c
@@ -0,0 +1,4572 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "table.h"
+u32 RTL8812AE_PHY_REG_ARRAY[] = {
+                0x800, 0x8020D010,
+                0x804, 0x080112E0,
+                0x808, 0x0E028233,
+                0x80C, 0x12131113,
+                0x810, 0x20101263,
+                0x814, 0x020C3D10,
+                0x818, 0x03A00385,
+                0x820, 0x00000000,
+                0x824, 0x00030FE0,
+                0x828, 0x00000000,
+                0x82C, 0x002083DD,
+                0x830, 0x2AAA6C86,
+                0x834, 0x0037A706,
+                0x838, 0x06C89B44,
+                0x83C, 0x0000095B,
+                0x840, 0xC0000001,
+                0x844, 0x40003CDE,
+                0x848, 0x6210FF8B,
+                0x84C, 0x6CFDFFB8,
+                0x850, 0x28874706,
+                0x854, 0x0001520C,
+                0x858, 0x8060E000,
+                0x85C, 0x74210168,
+                0x860, 0x6929C321,
+                0x864, 0x79727432,
+                0x868, 0x8CA7A314,
+                0x86C, 0x338C2878,
+                0x870, 0x03333333,
+                0x874, 0x31602C2E,
+                0x878, 0x00003152,
+                0x87C, 0x000FC000,
+                0x8A0, 0x00000013,
+                0x8A4, 0x7F7F7F7F,
+                0x8A8, 0xA202033E,
+                0x8AC, 0x0FF0FA0A,
+                0x8B0, 0x00000600,
+                0x8B4, 0x000FC080,
+                0x8B8, 0x6C0057FF,
+                0x8BC, 0x4CA520A3,
+                0x8C0, 0x27F00020,
+                0x8C4, 0x00000000,
+                0x8C8, 0x00013169,
+                0x8CC, 0x08248492,
+                0x8D0, 0x0000B800,
+                0x8DC, 0x00000000,
+                0x8D4, 0x940008A0,
+                0x8D8, 0x290B5612,
+                0x8F8, 0x400002C0,
+                0x8FC, 0x00000000,
+        0xFF0F07D8, 0xABCD,
+                0x900, 0x00000701,
+        0xFF0F07D0, 0xCDEF,
+                0x900, 0x00000701,
+        0xCDCDCDCD, 0xCDCD,
+                0x900, 0x00000700,
+        0xFF0F07D8, 0xDEAD,
+                0x90C, 0x00000000,
+                0x910, 0x0000FC00,
+                0x914, 0x00000404,
+                0x918, 0x1C1028C0,
+                0x91C, 0x64B11A1C,
+                0x920, 0xE0767233,
+                0x924, 0x055AA500,
+                0x928, 0x00000004,
+                0x92C, 0xFFFE0000,
+                0x930, 0xFFFFFFFE,
+                0x934, 0x001FFFFF,
+                0x960, 0x00000000,
+                0x964, 0x00000000,
+                0x968, 0x00000000,
+                0x96C, 0x00000000,
+                0x970, 0x801FFFFF,
+                0x978, 0x00000000,
+                0x97C, 0x00000000,
+                0x980, 0x00000000,
+                0x984, 0x00000000,
+                0x988, 0x00000000,
+                0x990, 0x27100000,
+                0x994, 0xFFFF0100,
+                0x998, 0xFFFFFF5C,
+                0x99C, 0xFFFFFFFF,
+                0x9A0, 0x000000FF,
+                0x9A4, 0x00080080,
+                0x9A8, 0x00000000,
+                0x9AC, 0x00000000,
+                0x9B0, 0x81081008,
+                0x9B4, 0x00000000,
+                0x9B8, 0x01081008,
+                0x9BC, 0x01081008,
+                0x9D0, 0x00000000,
+                0x9D4, 0x00000000,
+                0x9D8, 0x00000000,
+                0x9DC, 0x00000000,
+                0x9E4, 0x00000002,
+                0x9E8, 0x000002D5,
+                0xA00, 0x00D047C8,
+                0xA04, 0x01FF000C,
+                0xA08, 0x8C838300,
+                0xA0C, 0x2E7F000F,
+                0xA10, 0x9500BB78,
+                0xA14, 0x11144028,
+                0xA18, 0x00881117,
+                0xA1C, 0x89140F00,
+                0xA20, 0x1A1B0000,
+                0xA24, 0x090E1317,
+                0xA28, 0x00000204,
+                0xA2C, 0x00900000,
+                0xA70, 0x101FFF00,
+                0xA74, 0x00000008,
+                0xA78, 0x00000900,
+                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,
+                0xC00, 0x00000007,
+                0xC04, 0x00042020,
+                0xC08, 0x80410231,
+                0xC0C, 0x00000000,
+                0xC10, 0x00000100,
+                0xC14, 0x01000000,
+                0xC1C, 0x40000003,
+                0xC20, 0x12121212,
+                0xC24, 0x12121212,
+                0xC28, 0x12121212,
+                0xC2C, 0x12121212,
+                0xC30, 0x12121212,
+                0xC34, 0x12121212,
+                0xC38, 0x12121212,
+                0xC3C, 0x12121212,
+                0xC40, 0x12121212,
+                0xC44, 0x12121212,
+                0xC48, 0x12121212,
+                0xC4C, 0x12121212,
+                0xC50, 0x00000020,
+                0xC54, 0x0008121C,
+                0xC58, 0x30000C1C,
+                0xC5C, 0x00000058,
+                0xC60, 0x34344443,
+                0xC64, 0x07003333,
+                0xC68, 0x59791979,
+                0xC6C, 0x59795979,
+                0xC70, 0x19795979,
+                0xC74, 0x19795979,
+                0xC78, 0x19791979,
+                0xC7C, 0x19791979,
+                0xC80, 0x19791979,
+                0xC84, 0x19791979,
+                0xC94, 0x0100005C,
+                0xC98, 0x00000000,
+                0xC9C, 0x00000000,
+                0xCA0, 0x00000029,
+                0xCA4, 0x08040201,
+                0xCA8, 0x80402010,
+        0xFF0F0740, 0xABCD,
+                0xCB0, 0x77547717,
+        0xFF0F01C0, 0xCDEF,
+                0xCB0, 0x77547717,
+        0xFF0F02C0, 0xCDEF,
+                0xCB0, 0x77547717,
+        0xFF0F07D8, 0xCDEF,
+                0xCB0, 0x54547710,
+        0xFF0F07D0, 0xCDEF,
+                0xCB0, 0x54547710,
+        0xCDCDCDCD, 0xCDCD,
+                0xCB0, 0x77547777,
+        0xFF0F0740, 0xDEAD,
+                0xCB4, 0x00000077,
+                0xCB8, 0x00508242,
+                0xE00, 0x00000007,
+                0xE04, 0x00042020,
+                0xE08, 0x80410231,
+                0xE0C, 0x00000000,
+                0xE10, 0x00000100,
+                0xE14, 0x01000000,
+                0xE1C, 0x40000003,
+                0xE20, 0x12121212,
+                0xE24, 0x12121212,
+                0xE28, 0x12121212,
+                0xE2C, 0x12121212,
+                0xE30, 0x12121212,
+                0xE34, 0x12121212,
+                0xE38, 0x12121212,
+                0xE3C, 0x12121212,
+                0xE40, 0x12121212,
+                0xE44, 0x12121212,
+                0xE48, 0x12121212,
+                0xE4C, 0x12121212,
+                0xE50, 0x00000020,
+                0xE54, 0x0008121C,
+                0xE58, 0x30000C1C,
+                0xE5C, 0x00000058,
+                0xE60, 0x34344443,
+                0xE64, 0x07003333,
+                0xE68, 0x59791979,
+                0xE6C, 0x59795979,
+                0xE70, 0x19795979,
+                0xE74, 0x19795979,
+                0xE78, 0x19791979,
+                0xE7C, 0x19791979,
+                0xE80, 0x19791979,
+                0xE84, 0x19791979,
+                0xE94, 0x0100005C,
+                0xE98, 0x00000000,
+                0xE9C, 0x00000000,
+                0xEA0, 0x00000029,
+                0xEA4, 0x08040201,
+                0xEA8, 0x80402010,
+        0xFF0F0740, 0xABCD,
+                0xEB0, 0x77547717,
+        0xFF0F01C0, 0xCDEF,
+                0xEB0, 0x77547717,
+        0xFF0F02C0, 0xCDEF,
+                0xEB0, 0x77547717,
+        0xFF0F07D8, 0xCDEF,
+                0xEB0, 0x54547710,
+        0xFF0F07D0, 0xCDEF,
+                0xEB0, 0x54547710,
+        0xCDCDCDCD, 0xCDCD,
+                0xEB0, 0x77547777,
+        0xFF0F0740, 0xDEAD,
+                0xEB4, 0x00000077,
+                0xEB8, 0x00508242,
+};
+
+u32 RTL8821AE_PHY_REG_ARRAY[] = {
+        0x800, 0x0020D090,
+        0x804, 0x080112E0,
+        0x808, 0x0E028211,
+        0x80C, 0x92131111,
+        0x810, 0x20101261,
+        0x814, 0x020C3D10,
+        0x818, 0x03A00385,
+        0x820, 0x00000000,
+        0x824, 0x00030FE0,
+        0x828, 0x00000000,
+        0x82C, 0x002081DD,
+        0x830, 0x2AAA8E24,
+        0x834, 0x0037A706,
+        0x838, 0x06489B44,
+        0x83C, 0x0000095B,
+        0x840, 0xC0000001,
+        0x844, 0x40003CDE,
+        0x848, 0x62103F8B,
+        0x84C, 0x6CFDFFB8,
+        0x850, 0x28874706,
+        0x854, 0x0001520C,
+        0x858, 0x8060E000,
+        0x85C, 0x74210168,
+        0x860, 0x6929C321,
+        0x864, 0x79727432,
+        0x868, 0x8CA7A314,
+        0x86C, 0x888C2878,
+        0x870, 0x08888888,
+        0x874, 0x31612C2E,
+        0x878, 0x00000152,
+        0x87C, 0x000FD000,
+        0x8A0, 0x00000013,
+        0x8A4, 0x7F7F7F7F,
+        0x8A8, 0xA2000338,
+        0x8AC, 0x0FF0FA0A,
+        0x8B4, 0x000FC080,
+        0x8B8, 0x6C10D7FF,
+        0x8BC, 0x0CA52090,
+        0x8C0, 0x1BF00020,
+        0x8C4, 0x00000000,
+        0x8C8, 0x00013169,
+        0x8CC, 0x08248492,
+        0x8D4, 0x940008A0,
+        0x8D8, 0x290B5612,
+        0x8F8, 0x400002C0,
+        0x8FC, 0x00000000,
+        0x900, 0x00000700,
+        0x90C, 0x00000000,
+        0x910, 0x0000FC00,
+        0x914, 0x00000404,
+        0x918, 0x1C1028C0,
+        0x91C, 0x64B11A1C,
+        0x920, 0xE0767233,
+        0x924, 0x055AA500,
+        0x928, 0x00000004,
+        0x92C, 0xFFFE0000,
+        0x930, 0xFFFFFFFE,
+        0x934, 0x001FFFFF,
+        0x960, 0x00000000,
+        0x964, 0x00000000,
+        0x968, 0x00000000,
+        0x96C, 0x00000000,
+        0x970, 0x801FFFFF,
+        0x974, 0x000003FF,
+        0x978, 0x00000000,
+        0x97C, 0x00000000,
+        0x980, 0x00000000,
+        0x984, 0x00000000,
+        0x988, 0x00000000,
+        0x990, 0x27100000,
+        0x994, 0xFFFF0100,
+        0x998, 0xFFFFFF5C,
+        0x99C, 0xFFFFFFFF,
+        0x9A0, 0x000000FF,
+        0x9A4, 0x00480080,
+        0x9A8, 0x00000000,
+        0x9AC, 0x00000000,
+        0x9B0, 0x81081008,
+        0x9B4, 0x01081008,
+        0x9B8, 0x01081008,
+        0x9BC, 0x01081008,
+        0x9D0, 0x00000000,
+        0x9D4, 0x00000000,
+        0x9D8, 0x00000000,
+        0x9DC, 0x00000000,
+        0x9E0, 0x00005D00,
+        0x9E4, 0x00000002,
+        0x9E8, 0x00000001,
+        0xA00, 0x00D047C8,
+        0xA04, 0x01FF000C,
+        0xA08, 0x8C8A8300,
+        0xA0C, 0x2E68000F,
+        0xA10, 0x9500BB78,
+        0xA14, 0x11144028,
+        0xA18, 0x00881117,
+        0xA1C, 0x89140F00,
+        0xA20, 0x1A1B0000,
+        0xA24, 0x090E1317,
+        0xA28, 0x00000204,
+        0xA2C, 0x00900000,
+        0xA70, 0x101FFF00,
+        0xA74, 0x00000008,
+        0xA78, 0x00000900,
+        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,
+        0xC00, 0x00000007,
+        0xC04, 0x00042020,
+        0xC08, 0x80410231,
+        0xC0C, 0x00000000,
+        0xC10, 0x00000100,
+        0xC14, 0x01000000,
+        0xC1C, 0x40000003,
+        0xC20, 0x2C2C2C2C,
+        0xC24, 0x30303030,
+        0xC28, 0x30303030,
+        0xC2C, 0x2C2C2C2C,
+        0xC30, 0x2C2C2C2C,
+        0xC34, 0x2C2C2C2C,
+        0xC38, 0x2C2C2C2C,
+        0xC3C, 0x2A2A2A2A,
+        0xC40, 0x2A2A2A2A,
+        0xC44, 0x2A2A2A2A,
+        0xC48, 0x2A2A2A2A,
+        0xC4C, 0x2A2A2A2A,
+        0xC50, 0x00000020,
+        0xC54, 0x001C1208,
+        0xC58, 0x30000C1C,
+        0xC5C, 0x00000058,
+        0xC60, 0x34344443,
+        0xC64, 0x07003333,
+        0xC68, 0x19791979,
+        0xC6C, 0x19791979,
+        0xC70, 0x19791979,
+        0xC74, 0x19791979,
+        0xC78, 0x19791979,
+        0xC7C, 0x19791979,
+        0xC80, 0x19791979,
+        0xC84, 0x19791979,
+        0xC94, 0x0100005C,
+        0xC98, 0x00000000,
+        0xC9C, 0x00000000,
+        0xCA0, 0x00000029,
+        0xCA4, 0x08040201,
+        0xCA8, 0x80402010,
+        0xCB0, 0x77775747,
+        0xCB4, 0x10000077,
+        0xCB8, 0x00508240,
+};
+
+u32 RTL8812AE_PHY_REG_ARRAY_PG[] = {
+        0, 0, 0, 0x00000c20, 0xffffffff, 0x34363840,
+        0, 0, 0, 0x00000c24, 0xffffffff, 0x42424444,
+        0, 0, 0, 0x00000c28, 0xffffffff, 0x30323638,
+        0, 0, 0, 0x00000c2c, 0xffffffff, 0x40424444,
+        0, 0, 0, 0x00000c30, 0xffffffff, 0x28303236,
+        0, 0, 1, 0x00000c34, 0xffffffff, 0x38404242,
+        0, 0, 1, 0x00000c38, 0xffffffff, 0x26283034,
+        0, 0, 0, 0x00000c3c, 0xffffffff, 0x40424444,
+        0, 0, 0, 0x00000c40, 0xffffffff, 0x28303236,
+        0, 0, 0, 0x00000c44, 0xffffffff, 0x42422426,
+        0, 0, 1, 0x00000c48, 0xffffffff, 0x30343840,
+        0, 0, 1, 0x00000c4c, 0xffffffff, 0x22242628,
+        0, 1, 0, 0x00000e20, 0xffffffff, 0x34363840,
+        0, 1, 0, 0x00000e24, 0xffffffff, 0x42424444,
+        0, 1, 0, 0x00000e28, 0xffffffff, 0x30323638,
+        0, 1, 0, 0x00000e2c, 0xffffffff, 0x40424444,
+        0, 1, 0, 0x00000e30, 0xffffffff, 0x28303236,
+        0, 1, 1, 0x00000e34, 0xffffffff, 0x38404242,
+        0, 1, 1, 0x00000e38, 0xffffffff, 0x26283034,
+        0, 1, 0, 0x00000e3c, 0xffffffff, 0x40424444,
+        0, 1, 0, 0x00000e40, 0xffffffff, 0x28303236,
+        0, 1, 0, 0x00000e44, 0xffffffff, 0x42422426,
+        0, 1, 1, 0x00000e48, 0xffffffff, 0x30343840,
+        0, 1, 1, 0x00000e4c, 0xffffffff, 0x22242628,
+        1, 0, 0, 0x00000c24, 0xffffffff, 0x42424444,
+        1, 0, 0, 0x00000c28, 0xffffffff, 0x30323640,
+        1, 0, 0, 0x00000c2c, 0xffffffff, 0x40424444,
+        1, 0, 0, 0x00000c30, 0xffffffff, 0x28303236,
+        1, 0, 1, 0x00000c34, 0xffffffff, 0x38404242,
+        1, 0, 1, 0x00000c38, 0xffffffff, 0x26283034,
+        1, 0, 0, 0x00000c3c, 0xffffffff, 0x40424444,
+        1, 0, 0, 0x00000c40, 0xffffffff, 0x28303236,
+        1, 0, 0, 0x00000c44, 0xffffffff, 0x42422426,
+        1, 0, 1, 0x00000c48, 0xffffffff, 0x30343840,
+        1, 0, 1, 0x00000c4c, 0xffffffff, 0x22242628,
+        1, 1, 0, 0x00000e24, 0xffffffff, 0x42424444,
+        1, 1, 0, 0x00000e28, 0xffffffff, 0x30323640,
+        1, 1, 0, 0x00000e2c, 0xffffffff, 0x40424444,
+        1, 1, 0, 0x00000e30, 0xffffffff, 0x28303236,
+        1, 1, 1, 0x00000e34, 0xffffffff, 0x38404242,
+        1, 1, 1, 0x00000e38, 0xffffffff, 0x26283034,
+        1, 1, 0, 0x00000e3c, 0xffffffff, 0x40424444,
+        1, 1, 0, 0x00000e40, 0xffffffff, 0x28303236,
+        1, 1, 0, 0x00000e44, 0xffffffff, 0x42422426,
+        1, 1, 1, 0x00000e48, 0xffffffff, 0x30343840,
+        1, 1, 1, 0x00000e4c, 0xffffffff, 0x22242628
+};
+
+u32 RTL8821AE_PHY_REG_ARRAY_PG[] = {
+        0, 0, 0, 0x00000c20, 0xffffffff, 0x32343638,
+        0, 0, 0, 0x00000c24, 0xffffffff, 0x36363838,
+        0, 0, 0, 0x00000c28, 0xffffffff, 0x28303234,
+        0, 0, 0, 0x00000c2c, 0xffffffff, 0x34363838,
+        0, 0, 0, 0x00000c30, 0xffffffff, 0x26283032,
+        0, 0, 0, 0x00000c3c, 0xffffffff, 0x32343636,
+        0, 0, 0, 0x00000c40, 0xffffffff, 0x24262830,
+        0, 0, 0, 0x00000c44, 0x0000ffff, 0x00002022,
+        1, 0, 0, 0x00000c24, 0xffffffff, 0x34343636,
+        1, 0, 0, 0x00000c28, 0xffffffff, 0x26283032,
+        1, 0, 0, 0x00000c2c, 0xffffffff, 0x32343636,
+        1, 0, 0, 0x00000c30, 0xffffffff, 0x24262830,
+        1, 0, 0, 0x00000c3c, 0xffffffff, 0x32343636,
+        1, 0, 0, 0x00000c40, 0xffffffff, 0x24262830,
+        1, 0, 0, 0x00000c44, 0x0000ffff, 0x00002022
+};
+
+u32 RTL8812AE_RADIOA_ARRAY[] = {
+                0x000, 0x00010000,
+                0x018, 0x0001712A,
+                0x056, 0x00051CF2,
+                0x066, 0x00040000,
+                0x01E, 0x00080000,
+                0x089, 0x00000080,
+        0xFF0F0740, 0xABCD,
+                0x086, 0x00014B38,
+        0xFF0F02C0, 0xCDEF,
+                0x086, 0x00014B38,
+        0xFF0F01C0, 0xCDEF,
+                0x086, 0x00014B38,
+        0xFF0F07D8, 0xCDEF,
+                0x086, 0x00014B3A,
+        0xFF0F07D0, 0xCDEF,
+                0x086, 0x00014B3A,
+        0xCDCDCDCD, 0xCDCD,
+                0x086, 0x00014B38,
+        0xFF0F0740, 0xDEAD,
+                0x0B1, 0x0001FC1A,
+                0x0B3, 0x000F0810,
+                0x0B4, 0x0001A78D,
+                0x0BA, 0x00086180,
+                0x018, 0x00000006,
+                0x0EF, 0x00002000,
+        0xFF0F07D8, 0xABCD,
+                0x03B, 0x0003F218,
+                0x03B, 0x00030A58,
+                0x03B, 0x0002FA58,
+                0x03B, 0x00022590,
+                0x03B, 0x0001FA50,
+                0x03B, 0x00010248,
+                0x03B, 0x00008240,
+        0xFF0F07D0, 0xCDEF,
+                0x03B, 0x0003F218,
+                0x03B, 0x00030A58,
+                0x03B, 0x0002FA58,
+                0x03B, 0x00022590,
+                0x03B, 0x0001FA50,
+                0x03B, 0x00010248,
+                0x03B, 0x00008240,
+        0xCDCDCDCD, 0xCDCD,
+                0x03B, 0x00038A58,
+                0x03B, 0x00037A58,
+                0x03B, 0x0002A590,
+                0x03B, 0x00027A50,
+                0x03B, 0x00018248,
+                0x03B, 0x00010240,
+                0x03B, 0x00008240,
+        0xFF0F07D8, 0xDEAD,
+                0x0EF, 0x00000100,
+        0xFF0F07D8, 0xABCD,
+                0x034, 0x0000A4EE,
+                0x034, 0x00009076,
+                0x034, 0x00008073,
+                0x034, 0x00007070,
+                0x034, 0x0000606D,
+                0x034, 0x0000506A,
+                0x034, 0x00004049,
+                0x034, 0x00003046,
+                0x034, 0x00002028,
+                0x034, 0x00001025,
+                0x034, 0x00000022,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0000ADF4,
+                0x034, 0x00009DF1,
+                0x034, 0x00008DEE,
+                0x034, 0x00007DEB,
+                0x034, 0x00006DE8,
+                0x034, 0x00005CEC,
+                0x034, 0x00004CE9,
+                0x034, 0x000034EA,
+                0x034, 0x000024E7,
+                0x034, 0x0000146B,
+                0x034, 0x0000006D,
+        0xFF0F07D8, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x0EF, 0x000020A2,
+                0x0DF, 0x00000080,
+                0x035, 0x00000192,
+                0x035, 0x00008192,
+                0x035, 0x00010192,
+                0x036, 0x00000024,
+                0x036, 0x00008024,
+                0x036, 0x00010024,
+                0x036, 0x00018024,
+                0x0EF, 0x00000000,
+                0x051, 0x00000C21,
+                0x052, 0x000006D9,
+                0x053, 0x000FC649,
+                0x054, 0x0000017E,
+                0x0EF, 0x00000002,
+                0x008, 0x00008400,
+                0x018, 0x0001712A,
+                0x0EF, 0x00001000,
+                0x03A, 0x00000080,
+                0x03B, 0x0003A02C,
+                0x03C, 0x00004000,
+                0x03A, 0x00000400,
+                0x03B, 0x0003202C,
+                0x03C, 0x00010000,
+                0x03A, 0x000000A0,
+                0x03B, 0x0002B064,
+                0x03C, 0x00004000,
+                0x03A, 0x000000D8,
+                0x03B, 0x00023070,
+                0x03C, 0x00004000,
+                0x03A, 0x00000468,
+                0x03B, 0x0001B870,
+                0x03C, 0x00010000,
+                0x03A, 0x00000098,
+                0x03B, 0x00012085,
+                0x03C, 0x000E4000,
+                0x03A, 0x00000418,
+                0x03B, 0x0000A080,
+                0x03C, 0x000F0000,
+                0x03A, 0x00000418,
+                0x03B, 0x00002080,
+                0x03C, 0x00010000,
+                0x03A, 0x00000080,
+                0x03B, 0x0007A02C,
+                0x03C, 0x00004000,
+                0x03A, 0x00000400,
+                0x03B, 0x0007202C,
+                0x03C, 0x00010000,
+                0x03A, 0x000000A0,
+                0x03B, 0x0006B064,
+                0x03C, 0x00004000,
+                0x03A, 0x000000D8,
+                0x03B, 0x00023070,
+                0x03C, 0x00004000,
+                0x03A, 0x00000468,
+                0x03B, 0x0005B870,
+                0x03C, 0x00010000,
+                0x03A, 0x00000098,
+                0x03B, 0x00052085,
+                0x03C, 0x000E4000,
+                0x03A, 0x00000418,
+                0x03B, 0x0004A080,
+                0x03C, 0x000F0000,
+                0x03A, 0x00000418,
+                0x03B, 0x00042080,
+                0x03C, 0x00010000,
+                0x03A, 0x00000080,
+                0x03B, 0x000BA02C,
+                0x03C, 0x00004000,
+                0x03A, 0x00000400,
+                0x03B, 0x000B202C,
+                0x03C, 0x00010000,
+                0x03A, 0x000000A0,
+                0x03B, 0x000AB064,
+                0x03C, 0x00004000,
+                0x03A, 0x000000D8,
+                0x03B, 0x000A3070,
+                0x03C, 0x00004000,
+                0x03A, 0x00000468,
+                0x03B, 0x0009B870,
+                0x03C, 0x00010000,
+                0x03A, 0x00000098,
+                0x03B, 0x00092085,
+                0x03C, 0x000E4000,
+                0x03A, 0x00000418,
+                0x03B, 0x0008A080,
+                0x03C, 0x000F0000,
+                0x03A, 0x00000418,
+                0x03B, 0x00082080,
+                0x03C, 0x00010000,
+                0x0EF, 0x00001100,
+        0xFF0F0740, 0xABCD,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xFF0F01C0, 0xCDEF,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xFF0F07D8, 0xCDEF,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xFF0F07D0, 0xCDEF,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0004ADF5,
+                0x034, 0x00049DF2,
+                0x034, 0x00048DEF,
+                0x034, 0x00047DEC,
+                0x034, 0x00046DE9,
+                0x034, 0x00045DC9,
+                0x034, 0x00044CE8,
+                0x034, 0x000438CA,
+                0x034, 0x00042889,
+                0x034, 0x0004184A,
+                0x034, 0x0004044A,
+        0xFF0F0740, 0xDEAD,
+        0xFF0F0740, 0xABCD,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xFF0F01C0, 0xCDEF,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xFF0F07D8, 0xCDEF,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xFF0F07D0, 0xCDEF,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0002ADF5,
+                0x034, 0x00029DF2,
+                0x034, 0x00028DEF,
+                0x034, 0x00027DEC,
+                0x034, 0x00026DE9,
+                0x034, 0x00025DC9,
+                0x034, 0x00024CE8,
+                0x034, 0x000238CA,
+                0x034, 0x00022889,
+                0x034, 0x0002184A,
+                0x034, 0x0002044A,
+        0xFF0F0740, 0xDEAD,
+        0xFF0F0740, 0xABCD,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xFF0F01C0, 0xCDEF,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xFF0F07D8, 0xCDEF,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xFF0F07D0, 0xCDEF,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0000AFF7,
+                0x034, 0x00009DF7,
+                0x034, 0x00008DF4,
+                0x034, 0x00007DF1,
+                0x034, 0x00006DEE,
+                0x034, 0x00005DCD,
+                0x034, 0x00004CEB,
+                0x034, 0x000038CC,
+                0x034, 0x0000288B,
+                0x034, 0x0000184C,
+                0x034, 0x0000044C,
+        0xFF0F0740, 0xDEAD,
+                0x0EF, 0x00000000,
+        0xFF0F0740, 0xABCD,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001D4,
+                0x035, 0x000081D4,
+                0x035, 0x000101D4,
+                0x035, 0x000201B4,
+                0x035, 0x000281B4,
+                0x035, 0x000301B4,
+                0x035, 0x000401B4,
+                0x035, 0x000481B4,
+                0x035, 0x000501B4,
+        0xFF0F02C0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001D4,
+                0x035, 0x000081D4,
+                0x035, 0x000101D4,
+                0x035, 0x000201B4,
+                0x035, 0x000281B4,
+                0x035, 0x000301B4,
+                0x035, 0x000401B4,
+                0x035, 0x000481B4,
+                0x035, 0x000501B4,
+        0xFF0F01C0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001D4,
+                0x035, 0x000081D4,
+                0x035, 0x000101D4,
+                0x035, 0x000201B4,
+                0x035, 0x000281B4,
+                0x035, 0x000301B4,
+                0x035, 0x000401B4,
+                0x035, 0x000481B4,
+                0x035, 0x000501B4,
+        0xFF0F07D8, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001D4,
+                0x035, 0x000081D4,
+                0x035, 0x000101D4,
+                0x035, 0x000201B4,
+                0x035, 0x000281B4,
+                0x035, 0x000301B4,
+                0x035, 0x000401B4,
+                0x035, 0x000481B4,
+                0x035, 0x000501B4,
+        0xFF0F07D0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001D4,
+                0x035, 0x000081D4,
+                0x035, 0x000101D4,
+                0x035, 0x000201B4,
+                0x035, 0x000281B4,
+                0x035, 0x000301B4,
+                0x035, 0x000401B4,
+                0x035, 0x000481B4,
+                0x035, 0x000501B4,
+        0xCDCDCDCD, 0xCDCD,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x00000188,
+                0x035, 0x00008147,
+                0x035, 0x00010147,
+                0x035, 0x000201D7,
+                0x035, 0x000281D7,
+                0x035, 0x000301D7,
+                0x035, 0x000401D8,
+                0x035, 0x000481D8,
+                0x035, 0x000501D8,
+        0xFF0F0740, 0xDEAD,
+                0x0EF, 0x00000000,
+        0xFF0F0740, 0xABCD,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00004BFB,
+                0x036, 0x0000CBFB,
+                0x036, 0x00014BFB,
+                0x036, 0x0001CBFB,
+                0x036, 0x00024F4B,
+                0x036, 0x0002CF4B,
+                0x036, 0x00034F4B,
+                0x036, 0x0003CF4B,
+                0x036, 0x00044F4B,
+                0x036, 0x0004CF4B,
+                0x036, 0x00054F4B,
+                0x036, 0x0005CF4B,
+        0xFF0F02C0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00004BFB,
+                0x036, 0x0000CBFB,
+                0x036, 0x00014BFB,
+                0x036, 0x0001CBFB,
+                0x036, 0x00024F4B,
+                0x036, 0x0002CF4B,
+                0x036, 0x00034F4B,
+                0x036, 0x0003CF4B,
+                0x036, 0x00044F4B,
+                0x036, 0x0004CF4B,
+                0x036, 0x00054F4B,
+                0x036, 0x0005CF4B,
+        0xFF0F01C0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00004BFB,
+                0x036, 0x0000CBFB,
+                0x036, 0x00014BFB,
+                0x036, 0x0001CBFB,
+                0x036, 0x00024F4B,
+                0x036, 0x0002CF4B,
+                0x036, 0x00034F4B,
+                0x036, 0x0003CF4B,
+                0x036, 0x00044F4B,
+                0x036, 0x0004CF4B,
+                0x036, 0x00054F4B,
+                0x036, 0x0005CF4B,
+        0xFF0F07D8, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00004BFB,
+                0x036, 0x0000CBFB,
+                0x036, 0x00014BFB,
+                0x036, 0x0001CBFB,
+                0x036, 0x00024F4B,
+                0x036, 0x0002CF4B,
+                0x036, 0x00034F4B,
+                0x036, 0x0003CF4B,
+                0x036, 0x00044F4B,
+                0x036, 0x0004CF4B,
+                0x036, 0x00054F4B,
+                0x036, 0x0005CF4B,
+        0xFF0F07D0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00004BFB,
+                0x036, 0x0000CBFB,
+                0x036, 0x00014BFB,
+                0x036, 0x0001CBFB,
+                0x036, 0x00024F4B,
+                0x036, 0x0002CF4B,
+                0x036, 0x00034F4B,
+                0x036, 0x0003CF4B,
+                0x036, 0x00044F4B,
+                0x036, 0x0004CF4B,
+                0x036, 0x00054F4B,
+                0x036, 0x0005CF4B,
+        0xCDCDCDCD, 0xCDCD,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00084EB4,
+                0x036, 0x0008CC35,
+                0x036, 0x00094C35,
+                0x036, 0x0009CC35,
+                0x036, 0x000A4935,
+                0x036, 0x000ACC35,
+                0x036, 0x000B4C35,
+                0x036, 0x000BCC35,
+                0x036, 0x000C4EB4,
+                0x036, 0x000CCEB5,
+                0x036, 0x000D4EB5,
+                0x036, 0x000DCEB5,
+        0xFF0F0740, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00000008,
+        0xFF0F0740, 0xABCD,
+                0x03C, 0x000002CC,
+                0x03C, 0x00000522,
+                0x03C, 0x00000902,
+        0xFF0F02C0, 0xCDEF,
+                0x03C, 0x000002CC,
+                0x03C, 0x00000522,
+                0x03C, 0x00000902,
+        0xFF0F01C0, 0xCDEF,
+                0x03C, 0x000002CC,
+                0x03C, 0x00000522,
+                0x03C, 0x00000902,
+        0xFF0F07D8, 0xCDEF,
+                0x03C, 0x000002CC,
+                0x03C, 0x00000522,
+                0x03C, 0x00000902,
+        0xFF0F07D0, 0xCDEF,
+                0x03C, 0x000002CC,
+                0x03C, 0x00000522,
+                0x03C, 0x00000902,
+        0xCDCDCDCD, 0xCDCD,
+                0x03C, 0x000002A8,
+                0x03C, 0x000005A2,
+                0x03C, 0x00000880,
+        0xFF0F0740, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000002,
+                0x0DF, 0x00000080,
+                0x01F, 0x00040064,
+        0xFF0F0740, 0xABCD,
+                0x061, 0x000FDD43,
+                0x062, 0x00038F4B,
+                0x063, 0x00032117,
+                0x064, 0x000194AC,
+                0x065, 0x000931D1,
+        0xFF0F02C0, 0xCDEF,
+                0x061, 0x000FDD43,
+                0x062, 0x00038F4B,
+                0x063, 0x00032117,
+                0x064, 0x000194AC,
+                0x065, 0x000931D1,
+        0xFF0F01C0, 0xCDEF,
+                0x061, 0x000FDD43,
+                0x062, 0x00038F4B,
+                0x063, 0x00032117,
+                0x064, 0x000194AC,
+                0x065, 0x000931D1,
+        0xFF0F07D8, 0xCDEF,
+                0x061, 0x000FDD43,
+                0x062, 0x00038F4B,
+                0x063, 0x00032117,
+                0x064, 0x000194AC,
+                0x065, 0x000931D1,
+        0xFF0F07D0, 0xCDEF,
+                0x061, 0x000FDD43,
+                0x062, 0x00038F4B,
+                0x063, 0x00032117,
+                0x064, 0x000194AC,
+                0x065, 0x000931D1,
+        0xCDCDCDCD, 0xCDCD,
+                0x061, 0x000E5D53,
+                0x062, 0x00038FCD,
+                0x063, 0x000314EB,
+                0x064, 0x000196AC,
+                0x065, 0x000911D7,
+        0xFF0F0740, 0xDEAD,
+                0x008, 0x00008400,
+                0x01C, 0x000739D2,
+                0x0B4, 0x0001E78D,
+                0x018, 0x0001F12A,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x0B4, 0x0001A78D,
+                0x018, 0x0001712A,
+
+};
+
+u32 RTL8812AE_RADIOB_ARRAY[] = {
+                0x056, 0x00051CF2,
+                0x066, 0x00040000,
+                0x089, 0x00000080,
+        0xFF0F0740, 0xABCD,
+                0x086, 0x00014B38,
+        0xFF0F01C0, 0xCDEF,
+                0x086, 0x00014B38,
+        0xFF0F02C0, 0xCDEF,
+                0x086, 0x00014B38,
+        0xFF0F07D8, 0xCDEF,
+                0x086, 0x00014B3A,
+        0xFF0F07D0, 0xCDEF,
+                0x086, 0x00014B3A,
+        0xCDCDCDCD, 0xCDCD,
+                0x086, 0x00014B38,
+        0xFF0F0740, 0xDEAD,
+                0x018, 0x00000006,
+                0x0EF, 0x00002000,
+        0xFF0F07D8, 0xABCD,
+                0x03B, 0x0003F218,
+                0x03B, 0x00030A58,
+                0x03B, 0x0002FA58,
+                0x03B, 0x00022590,
+                0x03B, 0x0001FA50,
+                0x03B, 0x00010248,
+                0x03B, 0x00008240,
+        0xFF0F07D0, 0xCDEF,
+                0x03B, 0x0003F218,
+                0x03B, 0x00030A58,
+                0x03B, 0x0002FA58,
+                0x03B, 0x00022590,
+                0x03B, 0x0001FA50,
+                0x03B, 0x00010248,
+                0x03B, 0x00008240,
+        0xCDCDCDCD, 0xCDCD,
+                0x03B, 0x00038A58,
+                0x03B, 0x00037A58,
+                0x03B, 0x0002A590,
+                0x03B, 0x00027A50,
+                0x03B, 0x00018248,
+                0x03B, 0x00010240,
+                0x03B, 0x00008240,
+        0xFF0F07D8, 0xDEAD,
+                0x0EF, 0x00000100,
+        0xFF0F07D8, 0xABCD,
+                0x034, 0x0000A4EE,
+                0x034, 0x00009076,
+                0x034, 0x00008073,
+                0x034, 0x00007070,
+                0x034, 0x0000606D,
+                0x034, 0x0000506A,
+                0x034, 0x00004049,
+                0x034, 0x00003046,
+                0x034, 0x00002028,
+                0x034, 0x00001025,
+                0x034, 0x00000022,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0000ADF4,
+                0x034, 0x00009DF1,
+                0x034, 0x00008DEE,
+                0x034, 0x00007DEB,
+                0x034, 0x00006DE8,
+                0x034, 0x00005CEC,
+                0x034, 0x00004CE9,
+                0x034, 0x000034EA,
+                0x034, 0x000024E7,
+                0x034, 0x0000146B,
+                0x034, 0x0000006D,
+        0xFF0F07D8, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x0EF, 0x000020A2,
+                0x0DF, 0x00000080,
+                0x035, 0x00000192,
+                0x035, 0x00008192,
+                0x035, 0x00010192,
+                0x036, 0x00000024,
+                0x036, 0x00008024,
+                0x036, 0x00010024,
+                0x036, 0x00018024,
+                0x0EF, 0x00000000,
+                0x051, 0x00000C21,
+                0x052, 0x000006D9,
+                0x053, 0x000FC649,
+                0x054, 0x0000017E,
+                0x0EF, 0x00000002,
+                0x008, 0x00008400,
+                0x018, 0x0001712A,
+                0x0EF, 0x00001000,
+                0x03A, 0x00000080,
+                0x03B, 0x0003A02C,
+                0x03C, 0x00004000,
+                0x03A, 0x00000400,
+                0x03B, 0x0003202C,
+                0x03C, 0x00010000,
+                0x03A, 0x000000A0,
+                0x03B, 0x0002B064,
+                0x03C, 0x00004000,
+                0x03A, 0x000000D8,
+                0x03B, 0x00023070,
+                0x03C, 0x00004000,
+                0x03A, 0x00000468,
+                0x03B, 0x0001B870,
+                0x03C, 0x00010000,
+                0x03A, 0x00000098,
+                0x03B, 0x00012085,
+                0x03C, 0x000E4000,
+                0x03A, 0x00000418,
+                0x03B, 0x0000A080,
+                0x03C, 0x000F0000,
+                0x03A, 0x00000418,
+                0x03B, 0x00002080,
+                0x03C, 0x00010000,
+                0x03A, 0x00000080,
+                0x03B, 0x0007A02C,
+                0x03C, 0x00004000,
+                0x03A, 0x00000400,
+                0x03B, 0x0007202C,
+                0x03C, 0x00010000,
+                0x03A, 0x000000A0,
+                0x03B, 0x0006B064,
+                0x03C, 0x00004000,
+                0x03A, 0x000000D8,
+                0x03B, 0x00063070,
+                0x03C, 0x00004000,
+                0x03A, 0x00000468,
+                0x03B, 0x0005B870,
+                0x03C, 0x00010000,
+                0x03A, 0x00000098,
+                0x03B, 0x00052085,
+                0x03C, 0x000E4000,
+                0x03A, 0x00000418,
+                0x03B, 0x0004A080,
+                0x03C, 0x000F0000,
+                0x03A, 0x00000418,
+                0x03B, 0x00042080,
+                0x03C, 0x00010000,
+                0x03A, 0x00000080,
+                0x03B, 0x000BA02C,
+                0x03C, 0x00004000,
+                0x03A, 0x00000400,
+                0x03B, 0x000B202C,
+                0x03C, 0x00010000,
+                0x03A, 0x000000A0,
+                0x03B, 0x000AB064,
+                0x03C, 0x00004000,
+                0x03A, 0x000000D8,
+                0x03B, 0x000A3070,
+                0x03C, 0x00004000,
+                0x03A, 0x00000468,
+                0x03B, 0x0009B870,
+                0x03C, 0x00010000,
+                0x03A, 0x00000098,
+                0x03B, 0x00092085,
+                0x03C, 0x000E4000,
+                0x03A, 0x00000418,
+                0x03B, 0x0008A080,
+                0x03C, 0x000F0000,
+                0x03A, 0x00000418,
+                0x03B, 0x00082080,
+                0x03C, 0x00010000,
+                0x0EF, 0x00001100,
+        0xFF0F0740, 0xABCD,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xFF0F01C0, 0xCDEF,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xFF0F07D8, 0xCDEF,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xFF0F07D0, 0xCDEF,
+                0x034, 0x0004A0B2,
+                0x034, 0x000490AF,
+                0x034, 0x00048070,
+                0x034, 0x0004706D,
+                0x034, 0x00046050,
+                0x034, 0x0004504D,
+                0x034, 0x0004404A,
+                0x034, 0x00043047,
+                0x034, 0x0004200A,
+                0x034, 0x00041007,
+                0x034, 0x00040004,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0004ADF5,
+                0x034, 0x00049DF2,
+                0x034, 0x00048DEF,
+                0x034, 0x00047DEC,
+                0x034, 0x00046DE9,
+                0x034, 0x00045DC9,
+                0x034, 0x00044CE8,
+                0x034, 0x000438CA,
+                0x034, 0x00042889,
+                0x034, 0x0004184A,
+                0x034, 0x0004044A,
+        0xFF0F0740, 0xDEAD,
+        0xFF0F0740, 0xABCD,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xFF0F01C0, 0xCDEF,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xFF0F07D8, 0xCDEF,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xFF0F07D0, 0xCDEF,
+                0x034, 0x0002A0B2,
+                0x034, 0x000290AF,
+                0x034, 0x00028070,
+                0x034, 0x0002706D,
+                0x034, 0x00026050,
+                0x034, 0x0002504D,
+                0x034, 0x0002404A,
+                0x034, 0x00023047,
+                0x034, 0x0002200A,
+                0x034, 0x00021007,
+                0x034, 0x00020004,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0002ADF5,
+                0x034, 0x00029DF2,
+                0x034, 0x00028DEF,
+                0x034, 0x00027DEC,
+                0x034, 0x00026DE9,
+                0x034, 0x00025DC9,
+                0x034, 0x00024CE8,
+                0x034, 0x000238CA,
+                0x034, 0x00022889,
+                0x034, 0x0002184A,
+                0x034, 0x0002044A,
+        0xFF0F0740, 0xDEAD,
+        0xFF0F0740, 0xABCD,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xFF0F01C0, 0xCDEF,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xFF0F07D8, 0xCDEF,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xFF0F07D0, 0xCDEF,
+                0x034, 0x0000A0B2,
+                0x034, 0x000090AF,
+                0x034, 0x00008070,
+                0x034, 0x0000706D,
+                0x034, 0x00006050,
+                0x034, 0x0000504D,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x0000200A,
+                0x034, 0x00001007,
+                0x034, 0x00000004,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0000AFF7,
+                0x034, 0x00009DF7,
+                0x034, 0x00008DF4,
+                0x034, 0x00007DF1,
+                0x034, 0x00006DEE,
+                0x034, 0x00005DCD,
+                0x034, 0x00004CEB,
+                0x034, 0x000038CC,
+                0x034, 0x0000288B,
+                0x034, 0x0000184C,
+                0x034, 0x0000044C,
+        0xFF0F0740, 0xDEAD,
+                0x0EF, 0x00000000,
+        0xFF0F0740, 0xABCD,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001C5,
+                0x035, 0x000081C5,
+                0x035, 0x000101C5,
+                0x035, 0x00020174,
+                0x035, 0x00028174,
+                0x035, 0x00030174,
+                0x035, 0x00040185,
+                0x035, 0x00048185,
+                0x035, 0x00050185,
+                0x0EF, 0x00000000,
+        0xFF0F01C0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001C5,
+                0x035, 0x000081C5,
+                0x035, 0x000101C5,
+                0x035, 0x00020174,
+                0x035, 0x00028174,
+                0x035, 0x00030174,
+                0x035, 0x00040185,
+                0x035, 0x00048185,
+                0x035, 0x00050185,
+                0x0EF, 0x00000000,
+        0xFF0F02C0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001C5,
+                0x035, 0x000081C5,
+                0x035, 0x000101C5,
+                0x035, 0x00020174,
+                0x035, 0x00028174,
+                0x035, 0x00030174,
+                0x035, 0x00040185,
+                0x035, 0x00048185,
+                0x035, 0x00050185,
+                0x0EF, 0x00000000,
+        0xFF0F07D8, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001C5,
+                0x035, 0x000081C5,
+                0x035, 0x000101C5,
+                0x035, 0x00020174,
+                0x035, 0x00028174,
+                0x035, 0x00030174,
+                0x035, 0x00040185,
+                0x035, 0x00048185,
+                0x035, 0x00050185,
+                0x0EF, 0x00000000,
+        0xFF0F07D0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x000001C5,
+                0x035, 0x000081C5,
+                0x035, 0x000101C5,
+                0x035, 0x00020174,
+                0x035, 0x00028174,
+                0x035, 0x00030174,
+                0x035, 0x00040185,
+                0x035, 0x00048185,
+                0x035, 0x00050185,
+                0x0EF, 0x00000000,
+        0xCDCDCDCD, 0xCDCD,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+                0x035, 0x00000186,
+                0x035, 0x00008186,
+                0x035, 0x00010185,
+                0x035, 0x000201D5,
+                0x035, 0x000281D5,
+                0x035, 0x000301D5,
+                0x035, 0x000401D5,
+                0x035, 0x000481D5,
+                0x035, 0x000501D5,
+                0x0EF, 0x00000000,
+        0xFF0F0740, 0xDEAD,
+        0xFF0F0740, 0xABCD,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00005B8B,
+                0x036, 0x0000DB8B,
+                0x036, 0x00015B8B,
+                0x036, 0x0001DB8B,
+                0x036, 0x000262DB,
+                0x036, 0x0002E2DB,
+                0x036, 0x000362DB,
+                0x036, 0x0003E2DB,
+                0x036, 0x0004553B,
+                0x036, 0x0004D53B,
+                0x036, 0x0005553B,
+                0x036, 0x0005D53B,
+        0xFF0F01C0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00005B8B,
+                0x036, 0x0000DB8B,
+                0x036, 0x00015B8B,
+                0x036, 0x0001DB8B,
+                0x036, 0x000262DB,
+                0x036, 0x0002E2DB,
+                0x036, 0x000362DB,
+                0x036, 0x0003E2DB,
+                0x036, 0x0004553B,
+                0x036, 0x0004D53B,
+                0x036, 0x0005553B,
+                0x036, 0x0005D53B,
+        0xFF0F02C0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00005B8B,
+                0x036, 0x0000DB8B,
+                0x036, 0x00015B8B,
+                0x036, 0x0001DB8B,
+                0x036, 0x000262DB,
+                0x036, 0x0002E2DB,
+                0x036, 0x000362DB,
+                0x036, 0x0003E2DB,
+                0x036, 0x0004553B,
+                0x036, 0x0004D53B,
+                0x036, 0x0005553B,
+                0x036, 0x0005D53B,
+        0xFF0F07D8, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00005B8B,
+                0x036, 0x0000DB8B,
+                0x036, 0x00015B8B,
+                0x036, 0x0001DB8B,
+                0x036, 0x000262DB,
+                0x036, 0x0002E2DB,
+                0x036, 0x000362DB,
+                0x036, 0x0003E2DB,
+                0x036, 0x0004553B,
+                0x036, 0x0004D53B,
+                0x036, 0x0005553B,
+                0x036, 0x0005D53B,
+        0xFF0F07D0, 0xCDEF,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00005B8B,
+                0x036, 0x0000DB8B,
+                0x036, 0x00015B8B,
+                0x036, 0x0001DB8B,
+                0x036, 0x000262DB,
+                0x036, 0x0002E2DB,
+                0x036, 0x000362DB,
+                0x036, 0x0003E2DB,
+                0x036, 0x0004553B,
+                0x036, 0x0004D53B,
+                0x036, 0x0005553B,
+                0x036, 0x0005D53B,
+        0xCDCDCDCD, 0xCDCD,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+                0x036, 0x00084EB4,
+                0x036, 0x0008C9B4,
+                0x036, 0x000949B4,
+                0x036, 0x0009C9B4,
+                0x036, 0x000A4935,
+                0x036, 0x000AC935,
+                0x036, 0x000B4935,
+                0x036, 0x000BC935,
+                0x036, 0x000C4EB4,
+                0x036, 0x000CCEB4,
+                0x036, 0x000D4EB4,
+                0x036, 0x000DCEB4,
+        0xFF0F0740, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00000008,
+        0xFF0F0740, 0xABCD,
+                0x03C, 0x000002DC,
+                0x03C, 0x00000524,
+                0x03C, 0x00000902,
+        0xFF0F01C0, 0xCDEF,
+                0x03C, 0x000002DC,
+                0x03C, 0x00000524,
+                0x03C, 0x00000902,
+        0xFF0F02C0, 0xCDEF,
+                0x03C, 0x000002DC,
+                0x03C, 0x00000524,
+                0x03C, 0x00000902,
+        0xFF0F07D8, 0xCDEF,
+                0x03C, 0x000002DC,
+                0x03C, 0x00000524,
+                0x03C, 0x00000902,
+        0xFF0F07D0, 0xCDEF,
+                0x03C, 0x000002DC,
+                0x03C, 0x00000524,
+                0x03C, 0x00000902,
+        0xCDCDCDCD, 0xCDCD,
+                0x03C, 0x000002AA,
+                0x03C, 0x000005A2,
+                0x03C, 0x00000880,
+        0xFF0F0740, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000002,
+                0x0DF, 0x00000080,
+        0xFF0F0740, 0xABCD,
+                0x061, 0x000EAC43,
+                0x062, 0x00038F47,
+                0x063, 0x00031157,
+                0x064, 0x0001C4AC,
+                0x065, 0x000931D1,
+        0xFF0F01C0, 0xCDEF,
+                0x061, 0x000EAC43,
+                0x062, 0x00038F47,
+                0x063, 0x00031157,
+                0x064, 0x0001C4AC,
+                0x065, 0x000931D1,
+        0xFF0F02C0, 0xCDEF,
+                0x061, 0x000EAC43,
+                0x062, 0x00038F47,
+                0x063, 0x00031157,
+                0x064, 0x0001C4AC,
+                0x065, 0x000931D1,
+        0xFF0F07D8, 0xCDEF,
+                0x061, 0x000EAC43,
+                0x062, 0x00038F47,
+                0x063, 0x00031157,
+                0x064, 0x0001C4AC,
+                0x065, 0x000931D1,
+        0xFF0F07D0, 0xCDEF,
+                0x061, 0x000EAC43,
+                0x062, 0x00038F47,
+                0x063, 0x00031157,
+                0x064, 0x0001C4AC,
+                0x065, 0x000931D1,
+        0xCDCDCDCD, 0xCDCD,
+                0x061, 0x000E5D53,
+                0x062, 0x00038FCD,
+                0x063, 0x000314EB,
+                0x064, 0x000196AC,
+                0x065, 0x000931D7,
+        0xFF0F0740, 0xDEAD,
+                0x008, 0x00008400,
+
+};
+
+u32 RTL8821AE_RADIOA_ARRAY[] = {
+                0x018, 0x0001712A,
+                0x056, 0x00051CF2,
+                0x066, 0x00040000,
+                0x000, 0x00010000,
+                0x01E, 0x00080000,
+                0x082, 0x00000830,
+                0x083, 0x00021800,
+                0x084, 0x00028000,
+                0x085, 0x00048000,
+                0x086, 0x00094838,
+                0x087, 0x00044980,
+                0x088, 0x00048000,
+                0x089, 0x0000D480,
+                0x08A, 0x00042240,
+                0x08B, 0x000F0380,
+                0x08C, 0x00090000,
+                0x08D, 0x00022852,
+                0x08E, 0x00065540,
+                0x08F, 0x00088001,
+                0x0EF, 0x00020000,
+                0x03E, 0x00000380,
+                0x03F, 0x00090018,
+                0x03E, 0x00020380,
+                0x03F, 0x000A0018,
+                0x03E, 0x00040308,
+                0x03F, 0x000A0018,
+                0x03E, 0x00060018,
+                0x03F, 0x000A0018,
+                0x0EF, 0x00000000,
+                0x018, 0x0001712A,
+                0x089, 0x00000080,
+                0x08B, 0x00080180,
+                0x0EF, 0x00001000,
+                0x03A, 0x00000244,
+                0x03B, 0x00038027,
+                0x03C, 0x00082000,
+                0x03A, 0x00000244,
+                0x03B, 0x00030113,
+                0x03C, 0x00082000,
+                0x03A, 0x0000014C,
+                0x03B, 0x00028027,
+                0x03C, 0x00082000,
+                0x03A, 0x000000CC,
+                0x03B, 0x00027027,
+                0x03C, 0x00042000,
+                0x03A, 0x0000014C,
+                0x03B, 0x0001F913,
+                0x03C, 0x00042000,
+                0x03A, 0x0000010C,
+                0x03B, 0x00017F10,
+                0x03C, 0x00012000,
+                0x03A, 0x000000D0,
+                0x03B, 0x00008027,
+                0x03C, 0x000CA000,
+                0x03A, 0x00000244,
+                0x03B, 0x00078027,
+                0x03C, 0x00082000,
+                0x03A, 0x00000244,
+                0x03B, 0x00070113,
+                0x03C, 0x00082000,
+                0x03A, 0x0000014C,
+                0x03B, 0x00068027,
+                0x03C, 0x00082000,
+                0x03A, 0x000000CC,
+                0x03B, 0x00067027,
+                0x03C, 0x00042000,
+                0x03A, 0x0000014C,
+                0x03B, 0x0005F913,
+                0x03C, 0x00042000,
+                0x03A, 0x0000010C,
+                0x03B, 0x00057F10,
+                0x03C, 0x00012000,
+                0x03A, 0x000000D0,
+                0x03B, 0x00048027,
+                0x03C, 0x000CA000,
+                0x03A, 0x00000244,
+                0x03B, 0x000B8027,
+                0x03C, 0x00082000,
+                0x03A, 0x00000244,
+                0x03B, 0x000B0113,
+                0x03C, 0x00082000,
+                0x03A, 0x0000014C,
+                0x03B, 0x000A8027,
+                0x03C, 0x00082000,
+                0x03A, 0x000000CC,
+                0x03B, 0x000A7027,
+                0x03C, 0x00042000,
+                0x03A, 0x0000014C,
+                0x03B, 0x0009F913,
+                0x03C, 0x00042000,
+                0x03A, 0x0000010C,
+                0x03B, 0x00097F10,
+                0x03C, 0x00012000,
+                0x03A, 0x000000D0,
+                0x03B, 0x00088027,
+                0x03C, 0x000CA000,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00001100,
+        0xFF0F0104, 0xABCD,
+                0x034, 0x0004ADF3,
+                0x034, 0x00049DF0,
+        0xFF0F0204, 0xCDEF,
+                0x034, 0x0004ADF3,
+                0x034, 0x00049DF0,
+        0xFF0F0404, 0xCDEF,
+                0x034, 0x0004ADF3,
+                0x034, 0x00049DF0,
+        0xFF0F0200, 0xCDEF,
+                0x034, 0x0004ADF5,
+                0x034, 0x00049DF2,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0004A0F3,
+                0x034, 0x000490B1,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0004ADF7,
+                0x034, 0x00049DF3,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F0104, 0xABCD,
+                0x034, 0x00048DED,
+                0x034, 0x00047DEA,
+                0x034, 0x00046DE7,
+                0x034, 0x00045CE9,
+                0x034, 0x00044CE6,
+                0x034, 0x000438C6,
+                0x034, 0x00042886,
+                0x034, 0x00041486,
+                0x034, 0x00040447,
+        0xFF0F0204, 0xCDEF,
+                0x034, 0x00048DED,
+                0x034, 0x00047DEA,
+                0x034, 0x00046DE7,
+                0x034, 0x00045CE9,
+                0x034, 0x00044CE6,
+                0x034, 0x000438C6,
+                0x034, 0x00042886,
+                0x034, 0x00041486,
+                0x034, 0x00040447,
+        0xFF0F0404, 0xCDEF,
+                0x034, 0x00048DED,
+                0x034, 0x00047DEA,
+                0x034, 0x00046DE7,
+                0x034, 0x00045CE9,
+                0x034, 0x00044CE6,
+                0x034, 0x000438C6,
+                0x034, 0x00042886,
+                0x034, 0x00041486,
+                0x034, 0x00040447,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x000480AE,
+                0x034, 0x000470AB,
+                0x034, 0x0004608B,
+                0x034, 0x00045069,
+                0x034, 0x00044048,
+                0x034, 0x00043045,
+                0x034, 0x00042026,
+                0x034, 0x00041023,
+                0x034, 0x00040002,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x00048DEF,
+                0x034, 0x00047DEC,
+                0x034, 0x00046DE9,
+                0x034, 0x00045CCB,
+                0x034, 0x0004488D,
+                0x034, 0x0004348D,
+                0x034, 0x0004248A,
+                0x034, 0x0004108D,
+                0x034, 0x0004008A,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F0200, 0xABCD,
+                0x034, 0x0002ADF4,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0002A0F3,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0002ADF7,
+        0xFF0F0200, 0xDEAD,
+        0xFF0F0104, 0xABCD,
+                0x034, 0x00029DF4,
+        0xFF0F0204, 0xCDEF,
+                0x034, 0x00029DF4,
+        0xFF0F0404, 0xCDEF,
+                0x034, 0x00029DF4,
+        0xFF0F0200, 0xCDEF,
+                0x034, 0x00029DF1,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x000290F0,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x00029DF2,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F0104, 0xABCD,
+                0x034, 0x00028DF1,
+                0x034, 0x00027DEE,
+                0x034, 0x00026DEB,
+                0x034, 0x00025CEC,
+                0x034, 0x00024CE9,
+                0x034, 0x000238CA,
+                0x034, 0x00022889,
+                0x034, 0x00021489,
+                0x034, 0x0002044A,
+        0xFF0F0204, 0xCDEF,
+                0x034, 0x00028DF1,
+                0x034, 0x00027DEE,
+                0x034, 0x00026DEB,
+                0x034, 0x00025CEC,
+                0x034, 0x00024CE9,
+                0x034, 0x000238CA,
+                0x034, 0x00022889,
+                0x034, 0x00021489,
+                0x034, 0x0002044A,
+        0xFF0F0404, 0xCDEF,
+                0x034, 0x00028DF1,
+                0x034, 0x00027DEE,
+                0x034, 0x00026DEB,
+                0x034, 0x00025CEC,
+                0x034, 0x00024CE9,
+                0x034, 0x000238CA,
+                0x034, 0x00022889,
+                0x034, 0x00021489,
+                0x034, 0x0002044A,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x000280AF,
+                0x034, 0x000270AC,
+                0x034, 0x0002608B,
+                0x034, 0x00025069,
+                0x034, 0x00024048,
+                0x034, 0x00023045,
+                0x034, 0x00022026,
+                0x034, 0x00021023,
+                0x034, 0x00020002,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x00028DEE,
+                0x034, 0x00027DEB,
+                0x034, 0x00026CCD,
+                0x034, 0x00025CCA,
+                0x034, 0x0002488C,
+                0x034, 0x0002384C,
+                0x034, 0x00022849,
+                0x034, 0x00021449,
+                0x034, 0x0002004D,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F02C0, 0xABCD,
+                0x034, 0x0000A0D7,
+                0x034, 0x000090D3,
+                0x034, 0x000080B1,
+                0x034, 0x000070AE,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x0000ADF7,
+                0x034, 0x00009DF4,
+                0x034, 0x00008DF1,
+                0x034, 0x00007DEE,
+        0xFF0F02C0, 0xDEAD,
+        0xFF0F0104, 0xABCD,
+                0x034, 0x00006DEB,
+                0x034, 0x00005CEC,
+                0x034, 0x00004CE9,
+                0x034, 0x000038CA,
+                0x034, 0x00002889,
+                0x034, 0x00001489,
+                0x034, 0x0000044A,
+        0xFF0F0204, 0xCDEF,
+                0x034, 0x00006DEB,
+                0x034, 0x00005CEC,
+                0x034, 0x00004CE9,
+                0x034, 0x000038CA,
+                0x034, 0x00002889,
+                0x034, 0x00001489,
+                0x034, 0x0000044A,
+        0xFF0F0404, 0xCDEF,
+                0x034, 0x00006DEB,
+                0x034, 0x00005CEC,
+                0x034, 0x00004CE9,
+                0x034, 0x000038CA,
+                0x034, 0x00002889,
+                0x034, 0x00001489,
+                0x034, 0x0000044A,
+        0xFF0F02C0, 0xCDEF,
+                0x034, 0x0000608D,
+                0x034, 0x0000506B,
+                0x034, 0x0000404A,
+                0x034, 0x00003047,
+                0x034, 0x00002044,
+                0x034, 0x00001025,
+                0x034, 0x00000004,
+        0xCDCDCDCD, 0xCDCD,
+                0x034, 0x00006DCD,
+                0x034, 0x00005CCD,
+                0x034, 0x00004CCA,
+                0x034, 0x0000388C,
+                0x034, 0x00002888,
+                0x034, 0x00001488,
+                0x034, 0x00000486,
+        0xFF0F0104, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000040,
+        0xFF0F0104, 0xABCD,
+                0x035, 0x00000187,
+                0x035, 0x00008187,
+                0x035, 0x00010187,
+                0x035, 0x00020188,
+                0x035, 0x00028188,
+                0x035, 0x00030188,
+                0x035, 0x00040188,
+                0x035, 0x00048188,
+                0x035, 0x00050188,
+        0xFF0F0204, 0xCDEF,
+                0x035, 0x00000187,
+                0x035, 0x00008187,
+                0x035, 0x00010187,
+                0x035, 0x00020188,
+                0x035, 0x00028188,
+                0x035, 0x00030188,
+                0x035, 0x00040188,
+                0x035, 0x00048188,
+                0x035, 0x00050188,
+        0xFF0F0404, 0xCDEF,
+                0x035, 0x00000187,
+                0x035, 0x00008187,
+                0x035, 0x00010187,
+                0x035, 0x00020188,
+                0x035, 0x00028188,
+                0x035, 0x00030188,
+                0x035, 0x00040188,
+                0x035, 0x00048188,
+                0x035, 0x00050188,
+        0xCDCDCDCD, 0xCDCD,
+                0x035, 0x00000145,
+                0x035, 0x00008145,
+                0x035, 0x00010145,
+                0x035, 0x00020196,
+                0x035, 0x00028196,
+                0x035, 0x00030196,
+                0x035, 0x000401C7,
+                0x035, 0x000481C7,
+                0x035, 0x000501C7,
+        0xFF0F0104, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000010,
+        0xFF0F0104, 0xABCD,
+                0x036, 0x00085733,
+                0x036, 0x0008D733,
+                0x036, 0x00095733,
+                0x036, 0x0009D733,
+                0x036, 0x000A64B4,
+                0x036, 0x000AE4B4,
+                0x036, 0x000B64B4,
+                0x036, 0x000BE4B4,
+                0x036, 0x000C64B4,
+                0x036, 0x000CE4B4,
+                0x036, 0x000D64B4,
+                0x036, 0x000DE4B4,
+        0xFF0F0204, 0xCDEF,
+                0x036, 0x00085733,
+                0x036, 0x0008D733,
+                0x036, 0x00095733,
+                0x036, 0x0009D733,
+                0x036, 0x000A64B4,
+                0x036, 0x000AE4B4,
+                0x036, 0x000B64B4,
+                0x036, 0x000BE4B4,
+                0x036, 0x000C64B4,
+                0x036, 0x000CE4B4,
+                0x036, 0x000D64B4,
+                0x036, 0x000DE4B4,
+        0xFF0F0404, 0xCDEF,
+                0x036, 0x00085733,
+                0x036, 0x0008D733,
+                0x036, 0x00095733,
+                0x036, 0x0009D733,
+                0x036, 0x000A64B4,
+                0x036, 0x000AE4B4,
+                0x036, 0x000B64B4,
+                0x036, 0x000BE4B4,
+                0x036, 0x000C64B4,
+                0x036, 0x000CE4B4,
+                0x036, 0x000D64B4,
+                0x036, 0x000DE4B4,
+        0xCDCDCDCD, 0xCDCD,
+                0x036, 0x000056B3,
+                0x036, 0x0000D6B3,
+                0x036, 0x000156B3,
+                0x036, 0x0001D6B3,
+                0x036, 0x00026634,
+                0x036, 0x0002E634,
+                0x036, 0x00036634,
+                0x036, 0x0003E634,
+                0x036, 0x000467B4,
+                0x036, 0x0004E7B4,
+                0x036, 0x000567B4,
+                0x036, 0x0005E7B4,
+        0xFF0F0104, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00000008,
+        0xFF0F0104, 0xABCD,
+                0x03C, 0x000001C8,
+                0x03C, 0x00000492,
+        0xFF0F0204, 0xCDEF,
+                0x03C, 0x000001C8,
+                0x03C, 0x00000492,
+        0xFF0F0404, 0xCDEF,
+                0x03C, 0x000001C8,
+                0x03C, 0x00000492,
+        0xCDCDCDCD, 0xCDCD,
+                0x03C, 0x0000022A,
+                0x03C, 0x00000594,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F0104, 0xABCD,
+                0x03C, 0x00000800,
+        0xFF0F0204, 0xCDEF,
+                0x03C, 0x00000800,
+        0xFF0F0404, 0xCDEF,
+                0x03C, 0x00000800,
+        0xFF0F02C0, 0xCDEF,
+                0x03C, 0x00000820,
+        0xCDCDCDCD, 0xCDCD,
+                0x03C, 0x00000900,
+        0xFF0F0104, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x018, 0x0001712A,
+                0x0EF, 0x00000002,
+        0xFF0F0104, 0xABCD,
+                0x008, 0x0004E400,
+        0xFF0F0204, 0xCDEF,
+                0x008, 0x0004E400,
+        0xFF0F0404, 0xCDEF,
+                0x008, 0x0004E400,
+        0xCDCDCDCD, 0xCDCD,
+                0x008, 0x00002000,
+        0xFF0F0104, 0xDEAD,
+                0x0EF, 0x00000000,
+                0x0DF, 0x000000C0,
+                0x01F, 0x00040064,
+        0xFF0F0104, 0xABCD,
+                0x058, 0x000A7284,
+                0x059, 0x000600EC,
+        0xFF0F0204, 0xCDEF,
+                0x058, 0x000A7284,
+                0x059, 0x000600EC,
+        0xFF0F0404, 0xCDEF,
+                0x058, 0x000A7284,
+                0x059, 0x000600EC,
+        0xCDCDCDCD, 0xCDCD,
+                0x058, 0x00081184,
+                0x059, 0x0006016C,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F0104, 0xABCD,
+                0x061, 0x000E8D73,
+                0x062, 0x00093FC5,
+        0xFF0F0204, 0xCDEF,
+                0x061, 0x000E8D73,
+                0x062, 0x00093FC5,
+        0xFF0F0404, 0xCDEF,
+                0x061, 0x000E8D73,
+                0x062, 0x00093FC5,
+        0xCDCDCDCD, 0xCDCD,
+                0x061, 0x000EAD53,
+                0x062, 0x00093BC4,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F0104, 0xABCD,
+                0x063, 0x000110E9,
+        0xFF0F0204, 0xCDEF,
+                0x063, 0x000110E9,
+        0xFF0F0404, 0xCDEF,
+                0x063, 0x000110E9,
+        0xFF0F0200, 0xCDEF,
+                0x063, 0x000710E9,
+        0xFF0F02C0, 0xCDEF,
+                0x063, 0x000110E9,
+        0xCDCDCDCD, 0xCDCD,
+                0x063, 0x000714E9,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F0104, 0xABCD,
+                0x064, 0x0001C27C,
+        0xFF0F0204, 0xCDEF,
+                0x064, 0x0001C27C,
+        0xFF0F0404, 0xCDEF,
+                0x064, 0x0001C27C,
+        0xCDCDCDCD, 0xCDCD,
+                0x064, 0x0001C67C,
+        0xFF0F0104, 0xDEAD,
+        0xFF0F0200, 0xABCD,
+                0x065, 0x00093016,
+        0xFF0F02C0, 0xCDEF,
+                0x065, 0x00093015,
+        0xCDCDCDCD, 0xCDCD,
+                0x065, 0x00091016,
+        0xFF0F0200, 0xDEAD,
+                0x018, 0x00000006,
+                0x0EF, 0x00002000,
+                0x03B, 0x0003824B,
+                0x03B, 0x0003024B,
+                0x03B, 0x0002844B,
+                0x03B, 0x00020F4B,
+                0x03B, 0x00018F4B,
+                0x03B, 0x000104B2,
+                0x03B, 0x00008049,
+                0x03B, 0x00000148,
+                0x03B, 0x0007824B,
+                0x03B, 0x0007024B,
+                0x03B, 0x0006824B,
+                0x03B, 0x00060F4B,
+                0x03B, 0x00058F4B,
+                0x03B, 0x000504B2,
+                0x03B, 0x00048049,
+                0x03B, 0x00040148,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00000100,
+                0x034, 0x0000ADF3,
+                0x034, 0x00009DEF,
+                0x034, 0x00008DEC,
+                0x034, 0x00007DE9,
+                0x034, 0x00006CED,
+                0x034, 0x00005CE9,
+                0x034, 0x000044E9,
+                0x034, 0x000034E6,
+                0x034, 0x0000246A,
+                0x034, 0x00001467,
+                0x034, 0x00000068,
+                0x0EF, 0x00000000,
+                0x0ED, 0x00000010,
+                0x044, 0x0000ADF2,
+                0x044, 0x00009DEF,
+                0x044, 0x00008DEC,
+                0x044, 0x00007DE9,
+                0x044, 0x00006CEC,
+                0x044, 0x00005CE9,
+                0x044, 0x000044EC,
+                0x044, 0x000034E9,
+                0x044, 0x0000246C,
+                0x044, 0x00001469,
+                0x044, 0x0000006C,
+                0x0ED, 0x00000000,
+                0x0ED, 0x00000001,
+                0x040, 0x00038DA7,
+                0x040, 0x000300C2,
+                0x040, 0x000288E2,
+                0x040, 0x000200B8,
+                0x040, 0x000188A5,
+                0x040, 0x00010FBC,
+                0x040, 0x00008F71,
+                0x040, 0x00000240,
+                0x0ED, 0x00000000,
+                0x0EF, 0x000020A2,
+                0x0DF, 0x00000080,
+                0x035, 0x00000120,
+                0x035, 0x00008120,
+                0x035, 0x00010120,
+                0x036, 0x00000085,
+                0x036, 0x00008085,
+                0x036, 0x00010085,
+                0x036, 0x00018085,
+                0x0EF, 0x00000000,
+                0x051, 0x00000C31,
+                0x052, 0x00000622,
+                0x053, 0x000FC70B,
+                0x054, 0x0000017E,
+                0x056, 0x00051DF3,
+                0x051, 0x00000C01,
+                0x052, 0x000006D6,
+                0x053, 0x000FC649,
+                0x070, 0x00049661,
+                0x071, 0x0007843E,
+                0x072, 0x00000382,
+                0x074, 0x00051400,
+                0x035, 0x00000160,
+                0x035, 0x00008160,
+                0x035, 0x00010160,
+                0x036, 0x00000124,
+                0x036, 0x00008124,
+                0x036, 0x00010124,
+                0x036, 0x00018124,
+                0x0ED, 0x0000000C,
+                0x045, 0x00000140,
+                0x045, 0x00008140,
+                0x045, 0x00010140,
+                0x046, 0x00000124,
+                0x046, 0x00008124,
+                0x046, 0x00010124,
+                0x046, 0x00018124,
+                0x0DF, 0x00000088,
+                0x0B3, 0x000F0E18,
+                0x0B4, 0x0001214C,
+                0x0B7, 0x0003000C,
+                0x01C, 0x000539D2,
+                0x018, 0x0001F12A,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
+                0x018, 0x0001712A,
+};
+
+u32 RTL8812AE_MAC_REG_ARRAY[] = {
+                0x010, 0x0000000C,
+        0xFF0F0180, 0xABCD,
+                0x025, 0x0000000F,
+        0xFF0F01C0, 0xCDEF,
+                0x025, 0x0000000F,
+        0xCDCDCDCD, 0xCDCD,
+                0x025, 0x0000006F,
+        0xFF0F0180, 0xDEAD,
+                0x072, 0x00000000,
+                0x428, 0x0000000A,
+                0x429, 0x00000010,
+                0x430, 0x00000000,
+                0x431, 0x00000000,
+                0x432, 0x00000000,
+                0x433, 0x00000001,
+                0x434, 0x00000004,
+                0x435, 0x00000005,
+                0x436, 0x00000007,
+                0x437, 0x00000008,
+                0x43C, 0x00000004,
+                0x43D, 0x00000005,
+                0x43E, 0x00000007,
+                0x43F, 0x00000008,
+                0x440, 0x0000005D,
+                0x441, 0x00000001,
+                0x442, 0x00000000,
+                0x444, 0x00000010,
+                0x445, 0x00000000,
+                0x446, 0x00000000,
+                0x447, 0x00000000,
+                0x448, 0x00000000,
+                0x449, 0x000000F0,
+                0x44A, 0x0000000F,
+                0x44B, 0x0000003E,
+                0x44C, 0x00000010,
+                0x44D, 0x00000000,
+                0x44E, 0x00000000,
+                0x44F, 0x00000000,
+                0x450, 0x00000000,
+                0x451, 0x000000F0,
+                0x452, 0x0000000F,
+                0x453, 0x00000000,
+                0x45B, 0x00000080,
+                0x460, 0x00000066,
+                0x461, 0x00000066,
+                0x4C8, 0x000000FF,
+                0x4C9, 0x00000008,
+                0x4CC, 0x000000FF,
+                0x4CD, 0x000000FF,
+                0x4CE, 0x00000001,
+                0x500, 0x00000026,
+                0x501, 0x000000A2,
+                0x502, 0x0000002F,
+                0x503, 0x00000000,
+                0x504, 0x00000028,
+                0x505, 0x000000A3,
+                0x506, 0x0000005E,
+                0x507, 0x00000000,
+                0x508, 0x0000002B,
+                0x509, 0x000000A4,
+                0x50A, 0x0000005E,
+                0x50B, 0x00000000,
+                0x50C, 0x0000004F,
+                0x50D, 0x000000A4,
+                0x50E, 0x00000000,
+                0x50F, 0x00000000,
+                0x512, 0x0000001C,
+                0x514, 0x0000000A,
+                0x516, 0x0000000A,
+                0x525, 0x0000004F,
+                0x550, 0x00000010,
+                0x551, 0x00000010,
+                0x559, 0x00000002,
+                0x55C, 0x00000050,
+                0x55D, 0x000000FF,
+                0x604, 0x00000001,
+                0x605, 0x00000030,
+                0x607, 0x00000003,
+                0x608, 0x0000000E,
+                0x609, 0x0000002A,
+                0x620, 0x000000FF,
+                0x621, 0x000000FF,
+                0x622, 0x000000FF,
+                0x623, 0x000000FF,
+                0x624, 0x000000FF,
+                0x625, 0x000000FF,
+                0x626, 0x000000FF,
+                0x627, 0x000000FF,
+                0x638, 0x00000050,
+                0x63C, 0x0000000A,
+                0x63D, 0x0000000A,
+                0x63E, 0x0000000E,
+                0x63F, 0x0000000E,
+                0x640, 0x00000080,
+                0x642, 0x00000040,
+                0x643, 0x00000000,
+                0x652, 0x000000C8,
+                0x66E, 0x00000005,
+                0x700, 0x00000021,
+                0x701, 0x00000043,
+                0x702, 0x00000065,
+                0x703, 0x00000087,
+                0x708, 0x00000021,
+                0x709, 0x00000043,
+                0x70A, 0x00000065,
+                0x70B, 0x00000087,
+                0x718, 0x00000040,
+
+};
+
+u32 RTL8821AE_MAC_REG_ARRAY[] = {
+                0x428, 0x0000000A,
+                0x429, 0x00000010,
+                0x430, 0x00000000,
+                0x431, 0x00000000,
+                0x432, 0x00000000,
+                0x433, 0x00000001,
+                0x434, 0x00000004,
+                0x435, 0x00000005,
+                0x436, 0x00000007,
+                0x437, 0x00000008,
+                0x43C, 0x00000004,
+                0x43D, 0x00000005,
+                0x43E, 0x00000007,
+                0x43F, 0x00000008,
+                0x440, 0x0000005D,
+                0x441, 0x00000001,
+                0x442, 0x00000000,
+                0x444, 0x00000010,
+                0x445, 0x00000000,
+                0x446, 0x00000000,
+                0x447, 0x00000000,
+                0x448, 0x00000000,
+                0x449, 0x000000F0,
+                0x44A, 0x0000000F,
+                0x44B, 0x0000003E,
+                0x44C, 0x00000010,
+                0x44D, 0x00000000,
+                0x44E, 0x00000000,
+                0x44F, 0x00000000,
+                0x450, 0x00000000,
+                0x451, 0x000000F0,
+                0x452, 0x0000000F,
+                0x453, 0x00000000,
+                0x456, 0x0000005E,
+                0x460, 0x00000066,
+                0x461, 0x00000066,
+                0x4C8, 0x0000003F,
+                0x4C9, 0x000000FF,
+                0x4CC, 0x000000FF,
+                0x4CD, 0x000000FF,
+                0x4CE, 0x00000001,
+                0x500, 0x00000026,
+                0x501, 0x000000A2,
+                0x502, 0x0000002F,
+                0x503, 0x00000000,
+                0x504, 0x00000028,
+                0x505, 0x000000A3,
+                0x506, 0x0000005E,
+                0x507, 0x00000000,
+                0x508, 0x0000002B,
+                0x509, 0x000000A4,
+                0x50A, 0x0000005E,
+                0x50B, 0x00000000,
+                0x50C, 0x0000004F,
+                0x50D, 0x000000A4,
+                0x50E, 0x00000000,
+                0x50F, 0x00000000,
+                0x512, 0x0000001C,
+                0x514, 0x0000000A,
+                0x516, 0x0000000A,
+                0x525, 0x0000004F,
+                0x550, 0x00000010,
+                0x551, 0x00000010,
+                0x559, 0x00000002,
+                0x55C, 0x00000050,
+                0x55D, 0x000000FF,
+                0x605, 0x00000030,
+                0x607, 0x00000007,
+                0x608, 0x0000000E,
+                0x609, 0x0000002A,
+                0x620, 0x000000FF,
+                0x621, 0x000000FF,
+                0x622, 0x000000FF,
+                0x623, 0x000000FF,
+                0x624, 0x000000FF,
+                0x625, 0x000000FF,
+                0x626, 0x000000FF,
+                0x627, 0x000000FF,
+                0x638, 0x00000050,
+                0x63C, 0x0000000A,
+                0x63D, 0x0000000A,
+                0x63E, 0x0000000E,
+                0x63F, 0x0000000E,
+                0x640, 0x00000040,
+                0x642, 0x00000040,
+                0x643, 0x00000000,
+                0x652, 0x000000C8,
+                0x66E, 0x00000005,
+                0x700, 0x00000021,
+                0x701, 0x00000043,
+                0x702, 0x00000065,
+                0x703, 0x00000087,
+                0x708, 0x00000021,
+                0x709, 0x00000043,
+                0x70A, 0x00000065,
+                0x70B, 0x00000087,
+                0x718, 0x00000040,
+};
+
+u32 RTL8812AE_AGC_TAB_ARRAY[] = {
+        0xFF0F07D8, 0xABCD,
+                0x81C, 0xFC000001,
+                0x81C, 0xFB020001,
+                0x81C, 0xFA040001,
+                0x81C, 0xF9060001,
+                0x81C, 0xF8080001,
+                0x81C, 0xF70A0001,
+                0x81C, 0xF60C0001,
+                0x81C, 0xF50E0001,
+                0x81C, 0xF4100001,
+                0x81C, 0xF3120001,
+                0x81C, 0xF2140001,
+                0x81C, 0xF1160001,
+                0x81C, 0xF0180001,
+                0x81C, 0xEF1A0001,
+                0x81C, 0xEE1C0001,
+                0x81C, 0xED1E0001,
+                0x81C, 0xEC200001,
+                0x81C, 0xEB220001,
+                0x81C, 0xEA240001,
+                0x81C, 0xCD260001,
+                0x81C, 0xCC280001,
+                0x81C, 0xCB2A0001,
+                0x81C, 0xCA2C0001,
+                0x81C, 0xC92E0001,
+                0x81C, 0xC8300001,
+                0x81C, 0xA6320001,
+                0x81C, 0xA5340001,
+                0x81C, 0xA4360001,
+                0x81C, 0xA3380001,
+                0x81C, 0xA23A0001,
+                0x81C, 0x883C0001,
+                0x81C, 0x873E0001,
+                0x81C, 0x86400001,
+                0x81C, 0x85420001,
+                0x81C, 0x84440001,
+                0x81C, 0x83460001,
+                0x81C, 0x82480001,
+                0x81C, 0x814A0001,
+                0x81C, 0x484C0001,
+                0x81C, 0x474E0001,
+                0x81C, 0x46500001,
+                0x81C, 0x45520001,
+                0x81C, 0x44540001,
+                0x81C, 0x43560001,
+                0x81C, 0x42580001,
+                0x81C, 0x415A0001,
+                0x81C, 0x255C0001,
+                0x81C, 0x245E0001,
+                0x81C, 0x23600001,
+                0x81C, 0x22620001,
+                0x81C, 0x21640001,
+                0x81C, 0x21660001,
+                0x81C, 0x21680001,
+                0x81C, 0x216A0001,
+                0x81C, 0x216C0001,
+                0x81C, 0x216E0001,
+                0x81C, 0x21700001,
+                0x81C, 0x21720001,
+                0x81C, 0x21740001,
+                0x81C, 0x21760001,
+                0x81C, 0x21780001,
+                0x81C, 0x217A0001,
+                0x81C, 0x217C0001,
+                0x81C, 0x217E0001,
+        0xFF0F07D0, 0xCDEF,
+                0x81C, 0xF9000001,
+                0x81C, 0xF8020001,
+                0x81C, 0xF7040001,
+                0x81C, 0xF6060001,
+                0x81C, 0xF5080001,
+                0x81C, 0xF40A0001,
+                0x81C, 0xF30C0001,
+                0x81C, 0xF20E0001,
+                0x81C, 0xF1100001,
+                0x81C, 0xF0120001,
+                0x81C, 0xEF140001,
+                0x81C, 0xEE160001,
+                0x81C, 0xED180001,
+                0x81C, 0xEC1A0001,
+                0x81C, 0xEB1C0001,
+                0x81C, 0xEA1E0001,
+                0x81C, 0xCD200001,
+                0x81C, 0xCC220001,
+                0x81C, 0xCB240001,
+                0x81C, 0xCA260001,
+                0x81C, 0xC9280001,
+                0x81C, 0xC82A0001,
+                0x81C, 0xC72C0001,
+                0x81C, 0xC62E0001,
+                0x81C, 0xA5300001,
+                0x81C, 0xA4320001,
+                0x81C, 0xA3340001,
+                0x81C, 0xA2360001,
+                0x81C, 0x88380001,
+                0x81C, 0x873A0001,
+                0x81C, 0x863C0001,
+                0x81C, 0x853E0001,
+                0x81C, 0x84400001,
+                0x81C, 0x83420001,
+                0x81C, 0x82440001,
+                0x81C, 0x81460001,
+                0x81C, 0x48480001,
+                0x81C, 0x474A0001,
+                0x81C, 0x464C0001,
+                0x81C, 0x454E0001,
+                0x81C, 0x44500001,
+                0x81C, 0x43520001,
+                0x81C, 0x42540001,
+                0x81C, 0x41560001,
+                0x81C, 0x25580001,
+                0x81C, 0x245A0001,
+                0x81C, 0x235C0001,
+                0x81C, 0x225E0001,
+                0x81C, 0x21600001,
+                0x81C, 0x21620001,
+                0x81C, 0x21640001,
+                0x81C, 0x21660001,
+                0x81C, 0x21680001,
+                0x81C, 0x216A0001,
+                0x81C, 0x236C0001,
+                0x81C, 0x226E0001,
+                0x81C, 0x21700001,
+                0x81C, 0x21720001,
+                0x81C, 0x21740001,
+                0x81C, 0x21760001,
+                0x81C, 0x21780001,
+                0x81C, 0x217A0001,
+                0x81C, 0x217C0001,
+                0x81C, 0x217E0001,
+        0xCDCDCDCD, 0xCDCD,
+                0x81C, 0xFF000001,
+                0x81C, 0xFF020001,
+                0x81C, 0xFF040001,
+                0x81C, 0xFF060001,
+                0x81C, 0xFF080001,
+                0x81C, 0xFE0A0001,
+                0x81C, 0xFD0C0001,
+                0x81C, 0xFC0E0001,
+                0x81C, 0xFB100001,
+                0x81C, 0xFA120001,
+                0x81C, 0xF9140001,
+                0x81C, 0xF8160001,
+                0x81C, 0xF7180001,
+                0x81C, 0xF61A0001,
+                0x81C, 0xF51C0001,
+                0x81C, 0xF41E0001,
+                0x81C, 0xF3200001,
+                0x81C, 0xF2220001,
+                0x81C, 0xF1240001,
+                0x81C, 0xF0260001,
+                0x81C, 0xEF280001,
+                0x81C, 0xEE2A0001,
+                0x81C, 0xED2C0001,
+                0x81C, 0xEC2E0001,
+                0x81C, 0xEB300001,
+                0x81C, 0xEA320001,
+                0x81C, 0xE9340001,
+                0x81C, 0xE8360001,
+                0x81C, 0xE7380001,
+                0x81C, 0xE63A0001,
+                0x81C, 0xE53C0001,
+                0x81C, 0xC73E0001,
+                0x81C, 0xC6400001,
+                0x81C, 0xC5420001,
+                0x81C, 0xC4440001,
+                0x81C, 0xC3460001,
+                0x81C, 0xC2480001,
+                0x81C, 0xC14A0001,
+                0x81C, 0xA74C0001,
+                0x81C, 0xA64E0001,
+                0x81C, 0xA5500001,
+                0x81C, 0xA4520001,
+                0x81C, 0xA3540001,
+                0x81C, 0xA2560001,
+                0x81C, 0xA1580001,
+                0x81C, 0x675A0001,
+                0x81C, 0x665C0001,
+                0x81C, 0x655E0001,
+                0x81C, 0x64600001,
+                0x81C, 0x63620001,
+                0x81C, 0x48640001,
+                0x81C, 0x47660001,
+                0x81C, 0x46680001,
+                0x81C, 0x456A0001,
+                0x81C, 0x446C0001,
+                0x81C, 0x436E0001,
+                0x81C, 0x42700001,
+                0x81C, 0x41720001,
+                0x81C, 0x41740001,
+                0x81C, 0x41760001,
+                0x81C, 0x41780001,
+                0x81C, 0x417A0001,
+                0x81C, 0x417C0001,
+                0x81C, 0x417E0001,
+        0xFF0F07D8, 0xDEAD,
+        0xFF0F0180, 0xABCD,
+                0x81C, 0xFC800001,
+                0x81C, 0xFB820001,
+                0x81C, 0xFA840001,
+                0x81C, 0xF9860001,
+                0x81C, 0xF8880001,
+                0x81C, 0xF78A0001,
+                0x81C, 0xF68C0001,
+                0x81C, 0xF58E0001,
+                0x81C, 0xF4900001,
+                0x81C, 0xF3920001,
+                0x81C, 0xF2940001,
+                0x81C, 0xF1960001,
+                0x81C, 0xF0980001,
+                0x81C, 0xEF9A0001,
+                0x81C, 0xEE9C0001,
+                0x81C, 0xED9E0001,
+                0x81C, 0xECA00001,
+                0x81C, 0xEBA20001,
+                0x81C, 0xEAA40001,
+                0x81C, 0xE9A60001,
+                0x81C, 0xE8A80001,
+                0x81C, 0xE7AA0001,
+                0x81C, 0xE6AC0001,
+                0x81C, 0xE5AE0001,
+                0x81C, 0xE4B00001,
+                0x81C, 0xE3B20001,
+                0x81C, 0xA8B40001,
+                0x81C, 0xA7B60001,
+                0x81C, 0xA6B80001,
+                0x81C, 0xA5BA0001,
+                0x81C, 0xA4BC0001,
+                0x81C, 0xA3BE0001,
+                0x81C, 0xA2C00001,
+                0x81C, 0xA1C20001,
+                0x81C, 0x68C40001,
+                0x81C, 0x67C60001,
+                0x81C, 0x66C80001,
+                0x81C, 0x65CA0001,
+                0x81C, 0x64CC0001,
+                0x81C, 0x47CE0001,
+                0x81C, 0x46D00001,
+                0x81C, 0x45D20001,
+                0x81C, 0x44D40001,
+                0x81C, 0x43D60001,
+                0x81C, 0x42D80001,
+                0x81C, 0x08DA0001,
+                0x81C, 0x07DC0001,
+                0x81C, 0x06DE0001,
+                0x81C, 0x05E00001,
+                0x81C, 0x04E20001,
+                0x81C, 0x03E40001,
+                0x81C, 0x02E60001,
+                0x81C, 0x01E80001,
+                0x81C, 0x01EA0001,
+                0x81C, 0x01EC0001,
+                0x81C, 0x01EE0001,
+                0x81C, 0x01F00001,
+                0x81C, 0x01F20001,
+                0x81C, 0x01F40001,
+                0x81C, 0x01F60001,
+                0x81C, 0x01F80001,
+                0x81C, 0x01FA0001,
+                0x81C, 0x01FC0001,
+                0x81C, 0x01FE0001,
+        0xFF0F0280, 0xCDEF,
+                0x81C, 0xFC800001,
+                0x81C, 0xFB820001,
+                0x81C, 0xFA840001,
+                0x81C, 0xF9860001,
+                0x81C, 0xF8880001,
+                0x81C, 0xF78A0001,
+                0x81C, 0xF68C0001,
+                0x81C, 0xF58E0001,
+                0x81C, 0xF4900001,
+                0x81C, 0xF3920001,
+                0x81C, 0xF2940001,
+                0x81C, 0xF1960001,
+                0x81C, 0xF0980001,
+                0x81C, 0xEF9A0001,
+                0x81C, 0xEE9C0001,
+                0x81C, 0xED9E0001,
+                0x81C, 0xECA00001,
+                0x81C, 0xEBA20001,
+                0x81C, 0xEAA40001,
+                0x81C, 0xE9A60001,
+                0x81C, 0xE8A80001,
+                0x81C, 0xE7AA0001,
+                0x81C, 0xE6AC0001,
+                0x81C, 0xE5AE0001,
+                0x81C, 0xE4B00001,
+                0x81C, 0xE3B20001,
+                0x81C, 0xA8B40001,
+                0x81C, 0xA7B60001,
+                0x81C, 0xA6B80001,
+                0x81C, 0xA5BA0001,
+                0x81C, 0xA4BC0001,
+                0x81C, 0xA3BE0001,
+                0x81C, 0xA2C00001,
+                0x81C, 0xA1C20001,
+                0x81C, 0x68C40001,
+                0x81C, 0x67C60001,
+                0x81C, 0x66C80001,
+                0x81C, 0x65CA0001,
+                0x81C, 0x64CC0001,
+                0x81C, 0x47CE0001,
+                0x81C, 0x46D00001,
+                0x81C, 0x45D20001,
+                0x81C, 0x44D40001,
+                0x81C, 0x43D60001,
+                0x81C, 0x42D80001,
+                0x81C, 0x08DA0001,
+                0x81C, 0x07DC0001,
+                0x81C, 0x06DE0001,
+                0x81C, 0x05E00001,
+                0x81C, 0x04E20001,
+                0x81C, 0x03E40001,
+                0x81C, 0x02E60001,
+                0x81C, 0x01E80001,
+                0x81C, 0x01EA0001,
+                0x81C, 0x01EC0001,
+                0x81C, 0x01EE0001,
+                0x81C, 0x01F00001,
+                0x81C, 0x01F20001,
+                0x81C, 0x01F40001,
+                0x81C, 0x01F60001,
+                0x81C, 0x01F80001,
+                0x81C, 0x01FA0001,
+                0x81C, 0x01FC0001,
+                0x81C, 0x01FE0001,
+        0xFF0F01C0, 0xCDEF,
+                0x81C, 0xFC800001,
+                0x81C, 0xFB820001,
+                0x81C, 0xFA840001,
+                0x81C, 0xF9860001,
+                0x81C, 0xF8880001,
+                0x81C, 0xF78A0001,
+                0x81C, 0xF68C0001,
+                0x81C, 0xF58E0001,
+                0x81C, 0xF4900001,
+                0x81C, 0xF3920001,
+                0x81C, 0xF2940001,
+                0x81C, 0xF1960001,
+                0x81C, 0xF0980001,
+                0x81C, 0xEF9A0001,
+                0x81C, 0xEE9C0001,
+                0x81C, 0xED9E0001,
+                0x81C, 0xECA00001,
+                0x81C, 0xEBA20001,
+                0x81C, 0xEAA40001,
+                0x81C, 0xE9A60001,
+                0x81C, 0xE8A80001,
+                0x81C, 0xE7AA0001,
+                0x81C, 0xE6AC0001,
+                0x81C, 0xE5AE0001,
+                0x81C, 0xE4B00001,
+                0x81C, 0xE3B20001,
+                0x81C, 0xA8B40001,
+                0x81C, 0xA7B60001,
+                0x81C, 0xA6B80001,
+                0x81C, 0xA5BA0001,
+                0x81C, 0xA4BC0001,
+                0x81C, 0xA3BE0001,
+                0x81C, 0xA2C00001,
+                0x81C, 0xA1C20001,
+                0x81C, 0x68C40001,
+                0x81C, 0x67C60001,
+                0x81C, 0x66C80001,
+                0x81C, 0x65CA0001,
+                0x81C, 0x64CC0001,
+                0x81C, 0x47CE0001,
+                0x81C, 0x46D00001,
+                0x81C, 0x45D20001,
+                0x81C, 0x44D40001,
+                0x81C, 0x43D60001,
+                0x81C, 0x42D80001,
+                0x81C, 0x08DA0001,
+                0x81C, 0x07DC0001,
+                0x81C, 0x06DE0001,
+                0x81C, 0x05E00001,
+                0x81C, 0x04E20001,
+                0x81C, 0x03E40001,
+                0x81C, 0x02E60001,
+                0x81C, 0x01E80001,
+                0x81C, 0x01EA0001,
+                0x81C, 0x01EC0001,
+                0x81C, 0x01EE0001,
+                0x81C, 0x01F00001,
+                0x81C, 0x01F20001,
+                0x81C, 0x01F40001,
+                0x81C, 0x01F60001,
+                0x81C, 0x01F80001,
+                0x81C, 0x01FA0001,
+                0x81C, 0x01FC0001,
+                0x81C, 0x01FE0001,
+        0xFF0F02C0, 0xCDEF,
+                0x81C, 0xFC800001,
+                0x81C, 0xFB820001,
+                0x81C, 0xFA840001,
+                0x81C, 0xF9860001,
+                0x81C, 0xF8880001,
+                0x81C, 0xF78A0001,
+                0x81C, 0xF68C0001,
+                0x81C, 0xF58E0001,
+                0x81C, 0xF4900001,
+                0x81C, 0xF3920001,
+                0x81C, 0xF2940001,
+                0x81C, 0xF1960001,
+                0x81C, 0xF0980001,
+                0x81C, 0xEF9A0001,
+                0x81C, 0xEE9C0001,
+                0x81C, 0xED9E0001,
+                0x81C, 0xECA00001,
+                0x81C, 0xEBA20001,
+                0x81C, 0xEAA40001,
+                0x81C, 0xE9A60001,
+                0x81C, 0xE8A80001,
+                0x81C, 0xE7AA0001,
+                0x81C, 0xE6AC0001,
+                0x81C, 0xE5AE0001,
+                0x81C, 0xE4B00001,
+                0x81C, 0xE3B20001,
+                0x81C, 0xA8B40001,
+                0x81C, 0xA7B60001,
+                0x81C, 0xA6B80001,
+                0x81C, 0xA5BA0001,
+                0x81C, 0xA4BC0001,
+                0x81C, 0xA3BE0001,
+                0x81C, 0xA2C00001,
+                0x81C, 0xA1C20001,
+                0x81C, 0x68C40001,
+                0x81C, 0x67C60001,
+                0x81C, 0x66C80001,
+                0x81C, 0x65CA0001,
+                0x81C, 0x64CC0001,
+                0x81C, 0x47CE0001,
+                0x81C, 0x46D00001,
+                0x81C, 0x45D20001,
+                0x81C, 0x44D40001,
+                0x81C, 0x43D60001,
+                0x81C, 0x42D80001,
+                0x81C, 0x08DA0001,
+                0x81C, 0x07DC0001,
+                0x81C, 0x06DE0001,
+                0x81C, 0x05E00001,
+                0x81C, 0x04E20001,
+                0x81C, 0x03E40001,
+                0x81C, 0x02E60001,
+                0x81C, 0x01E80001,
+                0x81C, 0x01EA0001,
+                0x81C, 0x01EC0001,
+                0x81C, 0x01EE0001,
+                0x81C, 0x01F00001,
+                0x81C, 0x01F20001,
+                0x81C, 0x01F40001,
+                0x81C, 0x01F60001,
+                0x81C, 0x01F80001,
+                0x81C, 0x01FA0001,
+                0x81C, 0x01FC0001,
+                0x81C, 0x01FE0001,
+        0xFF0F07D8, 0xCDEF,
+                0x81C, 0xFC800001,
+                0x81C, 0xFB820001,
+                0x81C, 0xFA840001,
+                0x81C, 0xF9860001,
+                0x81C, 0xF8880001,
+                0x81C, 0xF78A0001,
+                0x81C, 0xF68C0001,
+                0x81C, 0xF58E0001,
+                0x81C, 0xF4900001,
+                0x81C, 0xF3920001,
+                0x81C, 0xF2940001,
+                0x81C, 0xF1960001,
+                0x81C, 0xF0980001,
+                0x81C, 0xEF9A0001,
+                0x81C, 0xEE9C0001,
+                0x81C, 0xED9E0001,
+                0x81C, 0xECA00001,
+                0x81C, 0xEBA20001,
+                0x81C, 0xEAA40001,
+                0x81C, 0xE9A60001,
+                0x81C, 0xE8A80001,
+                0x81C, 0xE7AA0001,
+                0x81C, 0xE6AC0001,
+                0x81C, 0xE5AE0001,
+                0x81C, 0xE4B00001,
+                0x81C, 0xE3B20001,
+                0x81C, 0xA8B40001,
+                0x81C, 0xA7B60001,
+                0x81C, 0xA6B80001,
+                0x81C, 0xA5BA0001,
+                0x81C, 0xA4BC0001,
+                0x81C, 0xA3BE0001,
+                0x81C, 0xA2C00001,
+                0x81C, 0xA1C20001,
+                0x81C, 0x68C40001,
+                0x81C, 0x67C60001,
+                0x81C, 0x66C80001,
+                0x81C, 0x65CA0001,
+                0x81C, 0x64CC0001,
+                0x81C, 0x47CE0001,
+                0x81C, 0x46D00001,
+                0x81C, 0x45D20001,
+                0x81C, 0x44D40001,
+                0x81C, 0x43D60001,
+                0x81C, 0x42D80001,
+                0x81C, 0x08DA0001,
+                0x81C, 0x07DC0001,
+                0x81C, 0x06DE0001,
+                0x81C, 0x05E00001,
+                0x81C, 0x04E20001,
+                0x81C, 0x03E40001,
+                0x81C, 0x02E60001,
+                0x81C, 0x01E80001,
+                0x81C, 0x01EA0001,
+                0x81C, 0x01EC0001,
+                0x81C, 0x01EE0001,
+                0x81C, 0x01F00001,
+                0x81C, 0x01F20001,
+                0x81C, 0x01F40001,
+                0x81C, 0x01F60001,
+                0x81C, 0x01F80001,
+                0x81C, 0x01FA0001,
+                0x81C, 0x01FC0001,
+                0x81C, 0x01FE0001,
+        0xFF0F07D0, 0xCDEF,
+                0x81C, 0xFC800001,
+                0x81C, 0xFB820001,
+                0x81C, 0xFA840001,
+                0x81C, 0xF9860001,
+                0x81C, 0xF8880001,
+                0x81C, 0xF78A0001,
+                0x81C, 0xF68C0001,
+                0x81C, 0xF58E0001,
+                0x81C, 0xF4900001,
+                0x81C, 0xF3920001,
+                0x81C, 0xF2940001,
+                0x81C, 0xF1960001,
+                0x81C, 0xF0980001,
+                0x81C, 0xEF9A0001,
+                0x81C, 0xEE9C0001,
+                0x81C, 0xED9E0001,
+                0x81C, 0xECA00001,
+                0x81C, 0xEBA20001,
+                0x81C, 0xEAA40001,
+                0x81C, 0xE9A60001,
+                0x81C, 0xE8A80001,
+                0x81C, 0xE7AA0001,
+                0x81C, 0xE6AC0001,
+                0x81C, 0xE5AE0001,
+                0x81C, 0xE4B00001,
+                0x81C, 0xE3B20001,
+                0x81C, 0xA8B40001,
+                0x81C, 0xA7B60001,
+                0x81C, 0xA6B80001,
+                0x81C, 0xA5BA0001,
+                0x81C, 0xA4BC0001,
+                0x81C, 0xA3BE0001,
+                0x81C, 0xA2C00001,
+                0x81C, 0xA1C20001,
+                0x81C, 0x68C40001,
+                0x81C, 0x67C60001,
+                0x81C, 0x66C80001,
+                0x81C, 0x65CA0001,
+                0x81C, 0x64CC0001,
+                0x81C, 0x47CE0001,
+                0x81C, 0x46D00001,
+                0x81C, 0x45D20001,
+                0x81C, 0x44D40001,
+                0x81C, 0x43D60001,
+                0x81C, 0x42D80001,
+                0x81C, 0x08DA0001,
+                0x81C, 0x07DC0001,
+                0x81C, 0x06DE0001,
+                0x81C, 0x05E00001,
+                0x81C, 0x04E20001,
+                0x81C, 0x03E40001,
+                0x81C, 0x02E60001,
+                0x81C, 0x01E80001,
+                0x81C, 0x01EA0001,
+                0x81C, 0x01EC0001,
+                0x81C, 0x01EE0001,
+                0x81C, 0x01F00001,
+                0x81C, 0x01F20001,
+                0x81C, 0x01F40001,
+                0x81C, 0x01F60001,
+                0x81C, 0x01F80001,
+                0x81C, 0x01FA0001,
+                0x81C, 0x01FC0001,
+                0x81C, 0x01FE0001,
+        0xCDCDCDCD, 0xCDCD,
+                0x81C, 0xFF800001,
+                0x81C, 0xFF820001,
+                0x81C, 0xFF840001,
+                0x81C, 0xFE860001,
+                0x81C, 0xFD880001,
+                0x81C, 0xFC8A0001,
+                0x81C, 0xFB8C0001,
+                0x81C, 0xFA8E0001,
+                0x81C, 0xF9900001,
+                0x81C, 0xF8920001,
+                0x81C, 0xF7940001,
+                0x81C, 0xF6960001,
+                0x81C, 0xF5980001,
+                0x81C, 0xF49A0001,
+                0x81C, 0xF39C0001,
+                0x81C, 0xF29E0001,
+                0x81C, 0xF1A00001,
+                0x81C, 0xF0A20001,
+                0x81C, 0xEFA40001,
+                0x81C, 0xEEA60001,
+                0x81C, 0xEDA80001,
+                0x81C, 0xECAA0001,
+                0x81C, 0xEBAC0001,
+                0x81C, 0xEAAE0001,
+                0x81C, 0xE9B00001,
+                0x81C, 0xE8B20001,
+                0x81C, 0xE7B40001,
+                0x81C, 0xE6B60001,
+                0x81C, 0xE5B80001,
+                0x81C, 0xE4BA0001,
+                0x81C, 0xE3BC0001,
+                0x81C, 0xA8BE0001,
+                0x81C, 0xA7C00001,
+                0x81C, 0xA6C20001,
+                0x81C, 0xA5C40001,
+                0x81C, 0xA4C60001,
+                0x81C, 0xA3C80001,
+                0x81C, 0xA2CA0001,
+                0x81C, 0xA1CC0001,
+                0x81C, 0x68CE0001,
+                0x81C, 0x67D00001,
+                0x81C, 0x66D20001,
+                0x81C, 0x65D40001,
+                0x81C, 0x64D60001,
+                0x81C, 0x47D80001,
+                0x81C, 0x46DA0001,
+                0x81C, 0x45DC0001,
+                0x81C, 0x44DE0001,
+                0x81C, 0x43E00001,
+                0x81C, 0x42E20001,
+                0x81C, 0x08E40001,
+                0x81C, 0x07E60001,
+                0x81C, 0x06E80001,
+                0x81C, 0x05EA0001,
+                0x81C, 0x04EC0001,
+                0x81C, 0x03EE0001,
+                0x81C, 0x02F00001,
+                0x81C, 0x01F20001,
+                0x81C, 0x01F40001,
+                0x81C, 0x01F60001,
+                0x81C, 0x01F80001,
+                0x81C, 0x01FA0001,
+                0x81C, 0x01FC0001,
+                0x81C, 0x01FE0001,
+        0xFF0F0180, 0xDEAD,
+                0xC50, 0x00000022,
+                0xC50, 0x00000020,
+                0xE50, 0x00000022,
+                0xE50, 0x00000020,
+
+};
+
+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, 0xAF240001,
+                0x81C, 0xAE260001,
+                0x81C, 0xAD280001,
+                0x81C, 0xAC2A0001,
+                0x81C, 0xAB2C0001,
+                0x81C, 0xAA2E0001,
+                0x81C, 0xA9300001,
+                0x81C, 0xA8320001,
+                0x81C, 0xA7340001,
+                0x81C, 0xA6360001,
+                0x81C, 0xA5380001,
+                0x81C, 0xA43A0001,
+                0x81C, 0xA33C0001,
+                0x81C, 0x673E0001,
+                0x81C, 0x66400001,
+                0x81C, 0x65420001,
+                0x81C, 0x64440001,
+                0x81C, 0x63460001,
+                0x81C, 0x62480001,
+                0x81C, 0x614A0001,
+                0x81C, 0x474C0001,
+                0x81C, 0x464E0001,
+                0x81C, 0x45500001,
+                0x81C, 0x44520001,
+                0x81C, 0x43540001,
+                0x81C, 0x42560001,
+                0x81C, 0x41580001,
+                0x81C, 0x285A0001,
+                0x81C, 0x275C0001,
+                0x81C, 0x265E0001,
+                0x81C, 0x25600001,
+                0x81C, 0x24620001,
+                0x81C, 0x0A640001,
+                0x81C, 0x09660001,
+                0x81C, 0x08680001,
+                0x81C, 0x076A0001,
+                0x81C, 0x066C0001,
+                0x81C, 0x056E0001,
+                0x81C, 0x04700001,
+                0x81C, 0x03720001,
+                0x81C, 0x02740001,
+                0x81C, 0x01760001,
+                0x81C, 0x01780001,
+                0x81C, 0x017A0001,
+                0x81C, 0x017C0001,
+                0x81C, 0x017E0001,
+        0xFF0F02C0, 0xABCD,
+                0x81C, 0xFB000101,
+                0x81C, 0xFA020101,
+                0x81C, 0xF9040101,
+                0x81C, 0xF8060101,
+                0x81C, 0xF7080101,
+                0x81C, 0xF60A0101,
+                0x81C, 0xF50C0101,
+                0x81C, 0xF40E0101,
+                0x81C, 0xF3100101,
+                0x81C, 0xF2120101,
+                0x81C, 0xF1140101,
+                0x81C, 0xF0160101,
+                0x81C, 0xEF180101,
+                0x81C, 0xEE1A0101,
+                0x81C, 0xED1C0101,
+                0x81C, 0xEC1E0101,
+                0x81C, 0xEB200101,
+                0x81C, 0xEA220101,
+                0x81C, 0xE9240101,
+                0x81C, 0xE8260101,
+                0x81C, 0xE7280101,
+                0x81C, 0xE62A0101,
+                0x81C, 0xE52C0101,
+                0x81C, 0xE42E0101,
+                0x81C, 0xE3300101,
+                0x81C, 0xA5320101,
+                0x81C, 0xA4340101,
+                0x81C, 0xA3360101,
+                0x81C, 0x87380101,
+                0x81C, 0x863A0101,
+                0x81C, 0x853C0101,
+                0x81C, 0x843E0101,
+                0x81C, 0x69400101,
+                0x81C, 0x68420101,
+                0x81C, 0x67440101,
+                0x81C, 0x66460101,
+                0x81C, 0x49480101,
+                0x81C, 0x484A0101,
+                0x81C, 0x474C0101,
+                0x81C, 0x2A4E0101,
+                0x81C, 0x29500101,
+                0x81C, 0x28520101,
+                0x81C, 0x27540101,
+                0x81C, 0x26560101,
+                0x81C, 0x25580101,
+                0x81C, 0x245A0101,
+                0x81C, 0x235C0101,
+                0x81C, 0x055E0101,
+                0x81C, 0x04600101,
+                0x81C, 0x03620101,
+                0x81C, 0x02640101,
+                0x81C, 0x01660101,
+                0x81C, 0x01680101,
+                0x81C, 0x016A0101,
+                0x81C, 0x016C0101,
+                0x81C, 0x016E0101,
+                0x81C, 0x01700101,
+                0x81C, 0x01720101,
+        0xCDCDCDCD, 0xCDCD,
+                0x81C, 0xFF000101,
+                0x81C, 0xFF020101,
+                0x81C, 0xFE040101,
+                0x81C, 0xFD060101,
+                0x81C, 0xFC080101,
+                0x81C, 0xFD0A0101,
+                0x81C, 0xFC0C0101,
+                0x81C, 0xFB0E0101,
+                0x81C, 0xFA100101,
+                0x81C, 0xF9120101,
+                0x81C, 0xF8140101,
+                0x81C, 0xF7160101,
+                0x81C, 0xF6180101,
+                0x81C, 0xF51A0101,
+                0x81C, 0xF41C0101,
+                0x81C, 0xF31E0101,
+                0x81C, 0xF2200101,
+                0x81C, 0xF1220101,
+                0x81C, 0xF0240101,
+                0x81C, 0xEF260101,
+                0x81C, 0xEE280101,
+                0x81C, 0xED2A0101,
+                0x81C, 0xEC2C0101,
+                0x81C, 0xEB2E0101,
+                0x81C, 0xEA300101,
+                0x81C, 0xE9320101,
+                0x81C, 0xE8340101,
+                0x81C, 0xE7360101,
+                0x81C, 0xE6380101,
+                0x81C, 0xE53A0101,
+                0x81C, 0xE43C0101,
+                0x81C, 0xE33E0101,
+                0x81C, 0xA5400101,
+                0x81C, 0xA4420101,
+                0x81C, 0xA3440101,
+                0x81C, 0x87460101,
+                0x81C, 0x86480101,
+                0x81C, 0x854A0101,
+                0x81C, 0x844C0101,
+                0x81C, 0x694E0101,
+                0x81C, 0x68500101,
+                0x81C, 0x67520101,
+                0x81C, 0x66540101,
+                0x81C, 0x49560101,
+                0x81C, 0x48580101,
+                0x81C, 0x475A0101,
+                0x81C, 0x2A5C0101,
+                0x81C, 0x295E0101,
+                0x81C, 0x28600101,
+                0x81C, 0x27620101,
+                0x81C, 0x26640101,
+                0x81C, 0x25660101,
+                0x81C, 0x24680101,
+                0x81C, 0x236A0101,
+                0x81C, 0x056C0101,
+                0x81C, 0x046E0101,
+                0x81C, 0x03700101,
+                0x81C, 0x02720101,
+        0xFF0F02C0, 0xDEAD,
+                0x81C, 0x01740101,
+                0x81C, 0x01760101,
+                0x81C, 0x01780101,
+                0x81C, 0x017A0101,
+                0x81C, 0x017C0101,
+                0x81C, 0x017E0101,
+                0xC50, 0x00000022,
+                0xC50, 0x00000020,
+
+};
+
+/******************************************************************************
+*                           TXPWR_LMT.TXT
+******************************************************************************/
+
+u8 *RTL8812AE_TXPWR_LMT[] = {
+        "FCC", "2.4G", "20M", "CCK", "1T", "01", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "01", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "01", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "02", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "02", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "02", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "03", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "03", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "03", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "04", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "04", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "04", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "05", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "05", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "05", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "06", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "06", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "06", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "07", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "07", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "07", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "08", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "08", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "08", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "09", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "09", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "09", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "10", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "10", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "10", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "11", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "11", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "11", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "12", "63",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "12", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "12", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "13", "63",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "13", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "13", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "14", "63",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "14", "63",
+        "MKK", "2.4G", "20M", "CCK", "1T", "14", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "01", "34",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "01", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "01", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "02", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "02", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "02", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "03", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "03", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "03", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "04", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "04", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "04", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "05", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "05", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "05", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "06", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "06", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "06", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "07", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "07", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "07", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "08", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "08", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "08", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "09", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "09", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "09", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "10", "36",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "10", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "10", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "11", "32",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "11", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "11", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "12", "63",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "12", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "12", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "13", "63",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "13", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "13", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "14", "63",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "14", "63",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "14", "63",
+        "FCC", "2.4G", "20M", "HT", "1T", "01", "34",
+        "ETSI", "2.4G", "20M", "HT", "1T", "01", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "01", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "02", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "02", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "02", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "03", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "03", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "03", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "04", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "04", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "04", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "05", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "05", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "05", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "06", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "06", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "06", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "07", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "07", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "07", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "08", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "08", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "08", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "09", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "09", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "09", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "10", "36",
+        "ETSI", "2.4G", "20M", "HT", "1T", "10", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "10", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "11", "32",
+        "ETSI", "2.4G", "20M", "HT", "1T", "11", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "11", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "12", "63",
+        "ETSI", "2.4G", "20M", "HT", "1T", "12", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "12", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "13", "63",
+        "ETSI", "2.4G", "20M", "HT", "1T", "13", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "13", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "14", "63",
+        "ETSI", "2.4G", "20M", "HT", "1T", "14", "63",
+        "MKK", "2.4G", "20M", "HT", "1T", "14", "63",
+        "FCC", "2.4G", "20M", "HT", "2T", "01", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "01", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "01", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "02", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "02", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "02", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "03", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "03", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "03", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "04", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "04", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "04", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "05", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "05", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "05", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "06", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "06", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "06", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "07", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "07", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "07", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "08", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "08", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "08", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "09", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "09", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "09", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "10", "34",
+        "ETSI", "2.4G", "20M", "HT", "2T", "10", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "10", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "11", "30",
+        "ETSI", "2.4G", "20M", "HT", "2T", "11", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "11", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "12", "63",
+        "ETSI", "2.4G", "20M", "HT", "2T", "12", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "12", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "13", "63",
+        "ETSI", "2.4G", "20M", "HT", "2T", "13", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "13", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "14", "63",
+        "ETSI", "2.4G", "20M", "HT", "2T", "14", "63",
+        "MKK", "2.4G", "20M", "HT", "2T", "14", "63",
+        "FCC", "2.4G", "40M", "HT", "1T", "01", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "01", "63",
+        "MKK", "2.4G", "40M", "HT", "1T", "01", "63",
+        "FCC", "2.4G", "40M", "HT", "1T", "02", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "02", "63",
+        "MKK", "2.4G", "40M", "HT", "1T", "02", "63",
+        "FCC", "2.4G", "40M", "HT", "1T", "03", "32",
+        "ETSI", "2.4G", "40M", "HT", "1T", "03", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "03", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "04", "36",
+        "ETSI", "2.4G", "40M", "HT", "1T", "04", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "04", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "05", "36",
+        "ETSI", "2.4G", "40M", "HT", "1T", "05", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "05", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "06", "36",
+        "ETSI", "2.4G", "40M", "HT", "1T", "06", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "06", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "07", "36",
+        "ETSI", "2.4G", "40M", "HT", "1T", "07", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "07", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "08", "36",
+        "ETSI", "2.4G", "40M", "HT", "1T", "08", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "08", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "09", "36",
+        "ETSI", "2.4G", "40M", "HT", "1T", "09", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "09", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "10", "36",
+        "ETSI", "2.4G", "40M", "HT", "1T", "10", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "10", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "11", "32",
+        "ETSI", "2.4G", "40M", "HT", "1T", "11", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "11", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "12", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "12", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "12", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "13", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "13", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "13", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "14", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "14", "63",
+        "MKK", "2.4G", "40M", "HT", "1T", "14", "63",
+        "FCC", "2.4G", "40M", "HT", "2T", "01", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "01", "63",
+        "MKK", "2.4G", "40M", "HT", "2T", "01", "63",
+        "FCC", "2.4G", "40M", "HT", "2T", "02", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "02", "63",
+        "MKK", "2.4G", "40M", "HT", "2T", "02", "63",
+        "FCC", "2.4G", "40M", "HT", "2T", "03", "30",
+        "ETSI", "2.4G", "40M", "HT", "2T", "03", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "03", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "04", "34",
+        "ETSI", "2.4G", "40M", "HT", "2T", "04", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "04", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "05", "34",
+        "ETSI", "2.4G", "40M", "HT", "2T", "05", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "05", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "06", "34",
+        "ETSI", "2.4G", "40M", "HT", "2T", "06", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "06", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "07", "34",
+        "ETSI", "2.4G", "40M", "HT", "2T", "07", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "07", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "08", "34",
+        "ETSI", "2.4G", "40M", "HT", "2T", "08", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "08", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "09", "34",
+        "ETSI", "2.4G", "40M", "HT", "2T", "09", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "09", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "10", "34",
+        "ETSI", "2.4G", "40M", "HT", "2T", "10", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "10", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "11", "30",
+        "ETSI", "2.4G", "40M", "HT", "2T", "11", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "11", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "12", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "12", "32",
+        "MKK", "2.4G", "40M", "HT", "2T", "12", "32",
+        "FCC", "2.4G", "40M", "HT", "2T", "13", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "13", "32",
+        "MKK", "2.4G", "40M", "HT", "2T", "13", "32",
+        "FCC", "2.4G", "40M", "HT", "2T", "14", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "14", "63",
+        "MKK", "2.4G", "40M", "HT", "2T", "14", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "36", "30",
+        "ETSI", "5G", "20M", "OFDM", "1T", "36", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "36", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "40", "30",
+        "ETSI", "5G", "20M", "OFDM", "1T", "40", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "40", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "44", "30",
+        "ETSI", "5G", "20M", "OFDM", "1T", "44", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "44", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "48", "30",
+        "ETSI", "5G", "20M", "OFDM", "1T", "48", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "48", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "52", "36",
+        "ETSI", "5G", "20M", "OFDM", "1T", "52", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "52", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "56", "34",
+        "ETSI", "5G", "20M", "OFDM", "1T", "56", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "56", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "60", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "60", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "60", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "64", "28",
+        "ETSI", "5G", "20M", "OFDM", "1T", "64", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "64", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "100", "30",
+        "ETSI", "5G", "20M", "OFDM", "1T", "100", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "100", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "114", "30",
+        "ETSI", "5G", "20M", "OFDM", "1T", "114", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "114", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "108", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "108", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "108", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "112", "34",
+        "ETSI", "5G", "20M", "OFDM", "1T", "112", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "112", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "116", "34",
+        "ETSI", "5G", "20M", "OFDM", "1T", "116", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "116", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "120", "36",
+        "ETSI", "5G", "20M", "OFDM", "1T", "120", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "120", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "124", "34",
+        "ETSI", "5G", "20M", "OFDM", "1T", "124", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "124", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "128", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "128", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "128", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "132", "30",
+        "ETSI", "5G", "20M", "OFDM", "1T", "132", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "132", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "136", "30",
+        "ETSI", "5G", "20M", "OFDM", "1T", "136", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "136", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "140", "28",
+        "ETSI", "5G", "20M", "OFDM", "1T", "140", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "140", "32",
+        "FCC", "5G", "20M", "OFDM", "1T", "149", "36",
+        "ETSI", "5G", "20M", "OFDM", "1T", "149", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "149", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "153", "36",
+        "ETSI", "5G", "20M", "OFDM", "1T", "153", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "153", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "157", "36",
+        "ETSI", "5G", "20M", "OFDM", "1T", "157", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "157", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "161", "36",
+        "ETSI", "5G", "20M", "OFDM", "1T", "161", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "161", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "165", "36",
+        "ETSI", "5G", "20M", "OFDM", "1T", "165", "32",
+        "MKK", "5G", "20M", "OFDM", "1T", "165", "63",
+        "FCC", "5G", "20M", "HT", "1T", "36", "30",
+        "ETSI", "5G", "20M", "HT", "1T", "36", "32",
+        "MKK", "5G", "20M", "HT", "1T", "36", "32",
+        "FCC", "5G", "20M", "HT", "1T", "40", "30",
+        "ETSI", "5G", "20M", "HT", "1T", "40", "32",
+        "MKK", "5G", "20M", "HT", "1T", "40", "32",
+        "FCC", "5G", "20M", "HT", "1T", "44", "30",
+        "ETSI", "5G", "20M", "HT", "1T", "44", "32",
+        "MKK", "5G", "20M", "HT", "1T", "44", "32",
+        "FCC", "5G", "20M", "HT", "1T", "48", "30",
+        "ETSI", "5G", "20M", "HT", "1T", "48", "32",
+        "MKK", "5G", "20M", "HT", "1T", "48", "32",
+        "FCC", "5G", "20M", "HT", "1T", "52", "36",
+        "ETSI", "5G", "20M", "HT", "1T", "52", "32",
+        "MKK", "5G", "20M", "HT", "1T", "52", "32",
+        "FCC", "5G", "20M", "HT", "1T", "56", "34",
+        "ETSI", "5G", "20M", "HT", "1T", "56", "32",
+        "MKK", "5G", "20M", "HT", "1T", "56", "32",
+        "FCC", "5G", "20M", "HT", "1T", "60", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "60", "32",
+        "MKK", "5G", "20M", "HT", "1T", "60", "32",
+        "FCC", "5G", "20M", "HT", "1T", "64", "28",
+        "ETSI", "5G", "20M", "HT", "1T", "64", "32",
+        "MKK", "5G", "20M", "HT", "1T", "64", "32",
+        "FCC", "5G", "20M", "HT", "1T", "100", "30",
+        "ETSI", "5G", "20M", "HT", "1T", "100", "32",
+        "MKK", "5G", "20M", "HT", "1T", "100", "32",
+        "FCC", "5G", "20M", "HT", "1T", "114", "30",
+        "ETSI", "5G", "20M", "HT", "1T", "114", "32",
+        "MKK", "5G", "20M", "HT", "1T", "114", "32",
+        "FCC", "5G", "20M", "HT", "1T", "108", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "108", "32",
+        "MKK", "5G", "20M", "HT", "1T", "108", "32",
+        "FCC", "5G", "20M", "HT", "1T", "112", "34",
+        "ETSI", "5G", "20M", "HT", "1T", "112", "32",
+        "MKK", "5G", "20M", "HT", "1T", "112", "32",
+        "FCC", "5G", "20M", "HT", "1T", "116", "34",
+        "ETSI", "5G", "20M", "HT", "1T", "116", "32",
+        "MKK", "5G", "20M", "HT", "1T", "116", "32",
+        "FCC", "5G", "20M", "HT", "1T", "120", "36",
+        "ETSI", "5G", "20M", "HT", "1T", "120", "32",
+        "MKK", "5G", "20M", "HT", "1T", "120", "32",
+        "FCC", "5G", "20M", "HT", "1T", "124", "34",
+        "ETSI", "5G", "20M", "HT", "1T", "124", "32",
+        "MKK", "5G", "20M", "HT", "1T", "124", "32",
+        "FCC", "5G", "20M", "HT", "1T", "128", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "128", "32",
+        "MKK", "5G", "20M", "HT", "1T", "128", "32",
+        "FCC", "5G", "20M", "HT", "1T", "132", "30",
+        "ETSI", "5G", "20M", "HT", "1T", "132", "32",
+        "MKK", "5G", "20M", "HT", "1T", "132", "32",
+        "FCC", "5G", "20M", "HT", "1T", "136", "30",
+        "ETSI", "5G", "20M", "HT", "1T", "136", "32",
+        "MKK", "5G", "20M", "HT", "1T", "136", "32",
+        "FCC", "5G", "20M", "HT", "1T", "140", "28",
+        "ETSI", "5G", "20M", "HT", "1T", "140", "32",
+        "MKK", "5G", "20M", "HT", "1T", "140", "32",
+        "FCC", "5G", "20M", "HT", "1T", "149", "36",
+        "ETSI", "5G", "20M", "HT", "1T", "149", "32",
+        "MKK", "5G", "20M", "HT", "1T", "149", "63",
+        "FCC", "5G", "20M", "HT", "1T", "153", "36",
+        "ETSI", "5G", "20M", "HT", "1T", "153", "32",
+        "MKK", "5G", "20M", "HT", "1T", "153", "63",
+        "FCC", "5G", "20M", "HT", "1T", "157", "36",
+        "ETSI", "5G", "20M", "HT", "1T", "157", "32",
+        "MKK", "5G", "20M", "HT", "1T", "157", "63",
+        "FCC", "5G", "20M", "HT", "1T", "161", "36",
+        "ETSI", "5G", "20M", "HT", "1T", "161", "32",
+        "MKK", "5G", "20M", "HT", "1T", "161", "63",
+        "FCC", "5G", "20M", "HT", "1T", "165", "36",
+        "ETSI", "5G", "20M", "HT", "1T", "165", "32",
+        "MKK", "5G", "20M", "HT", "1T", "165", "63",
+        "FCC", "5G", "20M", "HT", "2T", "36", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "36", "30",
+        "MKK", "5G", "20M", "HT", "2T", "36", "30",
+        "FCC", "5G", "20M", "HT", "2T", "40", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "40", "30",
+        "MKK", "5G", "20M", "HT", "2T", "40", "30",
+        "FCC", "5G", "20M", "HT", "2T", "44", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "44", "30",
+        "MKK", "5G", "20M", "HT", "2T", "44", "30",
+        "FCC", "5G", "20M", "HT", "2T", "48", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "48", "30",
+        "MKK", "5G", "20M", "HT", "2T", "48", "30",
+        "FCC", "5G", "20M", "HT", "2T", "52", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "52", "30",
+        "MKK", "5G", "20M", "HT", "2T", "52", "30",
+        "FCC", "5G", "20M", "HT", "2T", "56", "32",
+        "ETSI", "5G", "20M", "HT", "2T", "56", "30",
+        "MKK", "5G", "20M", "HT", "2T", "56", "30",
+        "FCC", "5G", "20M", "HT", "2T", "60", "30",
+        "ETSI", "5G", "20M", "HT", "2T", "60", "30",
+        "MKK", "5G", "20M", "HT", "2T", "60", "30",
+        "FCC", "5G", "20M", "HT", "2T", "64", "26",
+        "ETSI", "5G", "20M", "HT", "2T", "64", "30",
+        "MKK", "5G", "20M", "HT", "2T", "64", "30",
+        "FCC", "5G", "20M", "HT", "2T", "100", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "100", "30",
+        "MKK", "5G", "20M", "HT", "2T", "100", "30",
+        "FCC", "5G", "20M", "HT", "2T", "114", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "114", "30",
+        "MKK", "5G", "20M", "HT", "2T", "114", "30",
+        "FCC", "5G", "20M", "HT", "2T", "108", "30",
+        "ETSI", "5G", "20M", "HT", "2T", "108", "30",
+        "MKK", "5G", "20M", "HT", "2T", "108", "30",
+        "FCC", "5G", "20M", "HT", "2T", "112", "32",
+        "ETSI", "5G", "20M", "HT", "2T", "112", "30",
+        "MKK", "5G", "20M", "HT", "2T", "112", "30",
+        "FCC", "5G", "20M", "HT", "2T", "116", "32",
+        "ETSI", "5G", "20M", "HT", "2T", "116", "30",
+        "MKK", "5G", "20M", "HT", "2T", "116", "30",
+        "FCC", "5G", "20M", "HT", "2T", "120", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "120", "30",
+        "MKK", "5G", "20M", "HT", "2T", "120", "30",
+        "FCC", "5G", "20M", "HT", "2T", "124", "32",
+        "ETSI", "5G", "20M", "HT", "2T", "124", "30",
+        "MKK", "5G", "20M", "HT", "2T", "124", "30",
+        "FCC", "5G", "20M", "HT", "2T", "128", "30",
+        "ETSI", "5G", "20M", "HT", "2T", "128", "30",
+        "MKK", "5G", "20M", "HT", "2T", "128", "30",
+        "FCC", "5G", "20M", "HT", "2T", "132", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "132", "30",
+        "MKK", "5G", "20M", "HT", "2T", "132", "30",
+        "FCC", "5G", "20M", "HT", "2T", "136", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "136", "30",
+        "MKK", "5G", "20M", "HT", "2T", "136", "30",
+        "FCC", "5G", "20M", "HT", "2T", "140", "26",
+        "ETSI", "5G", "20M", "HT", "2T", "140", "30",
+        "MKK", "5G", "20M", "HT", "2T", "140", "30",
+        "FCC", "5G", "20M", "HT", "2T", "149", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "149", "30",
+        "MKK", "5G", "20M", "HT", "2T", "149", "63",
+        "FCC", "5G", "20M", "HT", "2T", "153", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "153", "30",
+        "MKK", "5G", "20M", "HT", "2T", "153", "63",
+        "FCC", "5G", "20M", "HT", "2T", "157", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "157", "30",
+        "MKK", "5G", "20M", "HT", "2T", "157", "63",
+        "FCC", "5G", "20M", "HT", "2T", "161", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "161", "30",
+        "MKK", "5G", "20M", "HT", "2T", "161", "63",
+        "FCC", "5G", "20M", "HT", "2T", "165", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "165", "30",
+        "MKK", "5G", "20M", "HT", "2T", "165", "63",
+        "FCC", "5G", "40M", "HT", "1T", "38", "30",
+        "ETSI", "5G", "40M", "HT", "1T", "38", "32",
+        "MKK", "5G", "40M", "HT", "1T", "38", "32",
+        "FCC", "5G", "40M", "HT", "1T", "46", "30",
+        "ETSI", "5G", "40M", "HT", "1T", "46", "32",
+        "MKK", "5G", "40M", "HT", "1T", "46", "32",
+        "FCC", "5G", "40M", "HT", "1T", "54", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "54", "32",
+        "MKK", "5G", "40M", "HT", "1T", "54", "32",
+        "FCC", "5G", "40M", "HT", "1T", "62", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "62", "32",
+        "MKK", "5G", "40M", "HT", "1T", "62", "32",
+        "FCC", "5G", "40M", "HT", "1T", "102", "28",
+        "ETSI", "5G", "40M", "HT", "1T", "102", "32",
+        "MKK", "5G", "40M", "HT", "1T", "102", "32",
+        "FCC", "5G", "40M", "HT", "1T", "110", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "110", "32",
+        "MKK", "5G", "40M", "HT", "1T", "110", "32",
+        "FCC", "5G", "40M", "HT", "1T", "118", "36",
+        "ETSI", "5G", "40M", "HT", "1T", "118", "32",
+        "MKK", "5G", "40M", "HT", "1T", "118", "32",
+        "FCC", "5G", "40M", "HT", "1T", "126", "34",
+        "ETSI", "5G", "40M", "HT", "1T", "126", "32",
+        "MKK", "5G", "40M", "HT", "1T", "126", "32",
+        "FCC", "5G", "40M", "HT", "1T", "134", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "134", "32",
+        "MKK", "5G", "40M", "HT", "1T", "134", "32",
+        "FCC", "5G", "40M", "HT", "1T", "151", "36",
+        "ETSI", "5G", "40M", "HT", "1T", "151", "32",
+        "MKK", "5G", "40M", "HT", "1T", "151", "63",
+        "FCC", "5G", "40M", "HT", "1T", "159", "36",
+        "ETSI", "5G", "40M", "HT", "1T", "159", "32",
+        "MKK", "5G", "40M", "HT", "1T", "159", "63",
+        "FCC", "5G", "40M", "HT", "2T", "38", "28",
+        "ETSI", "5G", "40M", "HT", "2T", "38", "30",
+        "MKK", "5G", "40M", "HT", "2T", "38", "30",
+        "FCC", "5G", "40M", "HT", "2T", "46", "28",
+        "ETSI", "5G", "40M", "HT", "2T", "46", "30",
+        "MKK", "5G", "40M", "HT", "2T", "46", "30",
+        "FCC", "5G", "40M", "HT", "2T", "54", "30",
+        "ETSI", "5G", "40M", "HT", "2T", "54", "30",
+        "MKK", "5G", "40M", "HT", "2T", "54", "30",
+        "FCC", "5G", "40M", "HT", "2T", "62", "30",
+        "ETSI", "5G", "40M", "HT", "2T", "62", "30",
+        "MKK", "5G", "40M", "HT", "2T", "62", "30",
+        "FCC", "5G", "40M", "HT", "2T", "102", "26",
+        "ETSI", "5G", "40M", "HT", "2T", "102", "30",
+        "MKK", "5G", "40M", "HT", "2T", "102", "30",
+        "FCC", "5G", "40M", "HT", "2T", "110", "30",
+        "ETSI", "5G", "40M", "HT", "2T", "110", "30",
+        "MKK", "5G", "40M", "HT", "2T", "110", "30",
+        "FCC", "5G", "40M", "HT", "2T", "118", "34",
+        "ETSI", "5G", "40M", "HT", "2T", "118", "30",
+        "MKK", "5G", "40M", "HT", "2T", "118", "30",
+        "FCC", "5G", "40M", "HT", "2T", "126", "32",
+        "ETSI", "5G", "40M", "HT", "2T", "126", "30",
+        "MKK", "5G", "40M", "HT", "2T", "126", "30",
+        "FCC", "5G", "40M", "HT", "2T", "134", "30",
+        "ETSI", "5G", "40M", "HT", "2T", "134", "30",
+        "MKK", "5G", "40M", "HT", "2T", "134", "30",
+        "FCC", "5G", "40M", "HT", "2T", "151", "34",
+        "ETSI", "5G", "40M", "HT", "2T", "151", "30",
+        "MKK", "5G", "40M", "HT", "2T", "151", "63",
+        "FCC", "5G", "40M", "HT", "2T", "159", "34",
+        "ETSI", "5G", "40M", "HT", "2T", "159", "30",
+        "MKK", "5G", "40M", "HT", "2T", "159", "63",
+        "FCC", "5G", "80M", "VHT", "1T", "42", "30",
+        "ETSI", "5G", "80M", "VHT", "1T", "42", "32",
+        "MKK", "5G", "80M", "VHT", "1T", "42", "32",
+        "FCC", "5G", "80M", "VHT", "1T", "58", "28",
+        "ETSI", "5G", "80M", "VHT", "1T", "58", "32",
+        "MKK", "5G", "80M", "VHT", "1T", "58", "32",
+        "FCC", "5G", "80M", "VHT", "1T", "106", "30",
+        "ETSI", "5G", "80M", "VHT", "1T", "106", "32",
+        "MKK", "5G", "80M", "VHT", "1T", "106", "32",
+        "FCC", "5G", "80M", "VHT", "1T", "122", "34",
+        "ETSI", "5G", "80M", "VHT", "1T", "122", "32",
+        "MKK", "5G", "80M", "VHT", "1T", "122", "32",
+        "FCC", "5G", "80M", "VHT", "1T", "155", "36",
+        "ETSI", "5G", "80M", "VHT", "1T", "155", "32",
+        "MKK", "5G", "80M", "VHT", "1T", "155", "63",
+        "FCC", "5G", "80M", "VHT", "2T", "42", "28",
+        "ETSI", "5G", "80M", "VHT", "2T", "42", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "42", "30",
+        "FCC", "5G", "80M", "VHT", "2T", "58", "26",
+        "ETSI", "5G", "80M", "VHT", "2T", "58", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "58", "30",
+        "FCC", "5G", "80M", "VHT", "2T", "106", "28",
+        "ETSI", "5G", "80M", "VHT", "2T", "106", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "106", "30",
+        "FCC", "5G", "80M", "VHT", "2T", "122", "32",
+        "ETSI", "5G", "80M", "VHT", "2T", "122", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "122", "30",
+        "FCC", "5G", "80M", "VHT", "2T", "155", "34",
+        "ETSI", "5G", "80M", "VHT", "2T", "155", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "155", "63"
+};
+
+u8 *RTL8821AE_TXPWR_LMT[] = {
+        "FCC", "2.4G", "20M", "CCK", "1T", "01", "32",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "01", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "01", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "02", "32",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "02", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "02", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "03", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "03", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "03", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "04", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "04", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "04", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "05", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "05", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "05", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "06", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "06", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "06", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "07", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "07", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "07", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "08", "36",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "08", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "08", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "09", "32",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "09", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "09", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "10", "32",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "10", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "10", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "11", "32",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "11", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "11", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "12", "63",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "12", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "12", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "13", "63",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "13", "32",
+        "MKK", "2.4G", "20M", "CCK", "1T", "13", "32",
+        "FCC", "2.4G", "20M", "CCK", "1T", "14", "63",
+        "ETSI", "2.4G", "20M", "CCK", "1T", "14", "63",
+        "MKK", "2.4G", "20M", "CCK", "1T", "14", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "01", "30",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "01", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "01", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "02", "30",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "02", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "02", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "03", "32",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "03", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "03", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "04", "32",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "04", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "04", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "05", "32",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "05", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "05", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "06", "32",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "06", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "06", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "07", "32",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "07", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "07", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "08", "32",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "08", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "08", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "09", "30",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "09", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "09", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "10", "30",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "10", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "10", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "11", "30",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "11", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "11", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "12", "63",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "12", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "12", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "13", "63",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "13", "32",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "13", "32",
+        "FCC", "2.4G", "20M", "OFDM", "1T", "14", "63",
+        "ETSI", "2.4G", "20M", "OFDM", "1T", "14", "63",
+        "MKK", "2.4G", "20M", "OFDM", "1T", "14", "63",
+        "FCC", "2.4G", "20M", "HT", "1T", "01", "26",
+        "ETSI", "2.4G", "20M", "HT", "1T", "01", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "01", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "02", "26",
+        "ETSI", "2.4G", "20M", "HT", "1T", "02", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "02", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "03", "32",
+        "ETSI", "2.4G", "20M", "HT", "1T", "03", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "03", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "04", "32",
+        "ETSI", "2.4G", "20M", "HT", "1T", "04", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "04", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "05", "32",
+        "ETSI", "2.4G", "20M", "HT", "1T", "05", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "05", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "06", "32",
+        "ETSI", "2.4G", "20M", "HT", "1T", "06", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "06", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "07", "32",
+        "ETSI", "2.4G", "20M", "HT", "1T", "07", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "07", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "08", "32",
+        "ETSI", "2.4G", "20M", "HT", "1T", "08", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "08", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "09", "26",
+        "ETSI", "2.4G", "20M", "HT", "1T", "09", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "09", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "10", "26",
+        "ETSI", "2.4G", "20M", "HT", "1T", "10", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "10", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "11", "26",
+        "ETSI", "2.4G", "20M", "HT", "1T", "11", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "11", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "12", "63",
+        "ETSI", "2.4G", "20M", "HT", "1T", "12", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "12", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "13", "63",
+        "ETSI", "2.4G", "20M", "HT", "1T", "13", "32",
+        "MKK", "2.4G", "20M", "HT", "1T", "13", "32",
+        "FCC", "2.4G", "20M", "HT", "1T", "14", "63",
+        "ETSI", "2.4G", "20M", "HT", "1T", "14", "63",
+        "MKK", "2.4G", "20M", "HT", "1T", "14", "63",
+        "FCC", "2.4G", "20M", "HT", "2T", "01", "30",
+        "ETSI", "2.4G", "20M", "HT", "2T", "01", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "01", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "02", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "02", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "02", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "03", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "03", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "03", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "04", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "04", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "04", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "05", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "05", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "05", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "06", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "06", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "06", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "07", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "07", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "07", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "08", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "08", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "08", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "09", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "09", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "09", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "10", "32",
+        "ETSI", "2.4G", "20M", "HT", "2T", "10", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "10", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "11", "30",
+        "ETSI", "2.4G", "20M", "HT", "2T", "11", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "11", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "12", "63",
+        "ETSI", "2.4G", "20M", "HT", "2T", "12", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "12", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "13", "63",
+        "ETSI", "2.4G", "20M", "HT", "2T", "13", "32",
+        "MKK", "2.4G", "20M", "HT", "2T", "13", "32",
+        "FCC", "2.4G", "20M", "HT", "2T", "14", "63",
+        "ETSI", "2.4G", "20M", "HT", "2T", "14", "63",
+        "MKK", "2.4G", "20M", "HT", "2T", "14", "63",
+        "FCC", "2.4G", "40M", "HT", "1T", "01", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "01", "63",
+        "MKK", "2.4G", "40M", "HT", "1T", "01", "63",
+        "FCC", "2.4G", "40M", "HT", "1T", "02", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "02", "63",
+        "MKK", "2.4G", "40M", "HT", "1T", "02", "63",
+        "FCC", "2.4G", "40M", "HT", "1T", "03", "26",
+        "ETSI", "2.4G", "40M", "HT", "1T", "03", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "03", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "04", "26",
+        "ETSI", "2.4G", "40M", "HT", "1T", "04", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "04", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "05", "26",
+        "ETSI", "2.4G", "40M", "HT", "1T", "05", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "05", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "06", "32",
+        "ETSI", "2.4G", "40M", "HT", "1T", "06", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "06", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "07", "32",
+        "ETSI", "2.4G", "40M", "HT", "1T", "07", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "07", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "08", "32",
+        "ETSI", "2.4G", "40M", "HT", "1T", "08", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "08", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "09", "26",
+        "ETSI", "2.4G", "40M", "HT", "1T", "09", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "09", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "10", "26",
+        "ETSI", "2.4G", "40M", "HT", "1T", "10", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "10", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "11", "26",
+        "ETSI", "2.4G", "40M", "HT", "1T", "11", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "11", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "12", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "12", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "12", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "13", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "13", "32",
+        "MKK", "2.4G", "40M", "HT", "1T", "13", "32",
+        "FCC", "2.4G", "40M", "HT", "1T", "14", "63",
+        "ETSI", "2.4G", "40M", "HT", "1T", "14", "63",
+        "MKK", "2.4G", "40M", "HT", "1T", "14", "63",
+        "FCC", "2.4G", "40M", "HT", "2T", "01", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "01", "63",
+        "MKK", "2.4G", "40M", "HT", "2T", "01", "63",
+        "FCC", "2.4G", "40M", "HT", "2T", "02", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "02", "63",
+        "MKK", "2.4G", "40M", "HT", "2T", "02", "63",
+        "FCC", "2.4G", "40M", "HT", "2T", "03", "30",
+        "ETSI", "2.4G", "40M", "HT", "2T", "03", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "03", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "04", "32",
+        "ETSI", "2.4G", "40M", "HT", "2T", "04", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "04", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "05", "32",
+        "ETSI", "2.4G", "40M", "HT", "2T", "05", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "05", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "06", "32",
+        "ETSI", "2.4G", "40M", "HT", "2T", "06", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "06", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "07", "32",
+        "ETSI", "2.4G", "40M", "HT", "2T", "07", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "07", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "08", "32",
+        "ETSI", "2.4G", "40M", "HT", "2T", "08", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "08", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "09", "32",
+        "ETSI", "2.4G", "40M", "HT", "2T", "09", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "09", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "10", "32",
+        "ETSI", "2.4G", "40M", "HT", "2T", "10", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "10", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "11", "30",
+        "ETSI", "2.4G", "40M", "HT", "2T", "11", "30",
+        "MKK", "2.4G", "40M", "HT", "2T", "11", "30",
+        "FCC", "2.4G", "40M", "HT", "2T", "12", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "12", "32",
+        "MKK", "2.4G", "40M", "HT", "2T", "12", "32",
+        "FCC", "2.4G", "40M", "HT", "2T", "13", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "13", "32",
+        "MKK", "2.4G", "40M", "HT", "2T", "13", "32",
+        "FCC", "2.4G", "40M", "HT", "2T", "14", "63",
+        "ETSI", "2.4G", "40M", "HT", "2T", "14", "63",
+        "MKK", "2.4G", "40M", "HT", "2T", "14", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "36", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "36", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "36", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "40", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "40", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "40", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "44", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "44", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "44", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "48", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "48", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "48", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "52", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "52", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "52", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "56", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "56", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "56", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "60", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "60", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "60", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "64", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "64", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "64", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "100", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "100", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "100", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "114", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "114", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "114", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "108", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "108", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "108", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "112", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "112", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "112", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "116", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "116", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "116", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "120", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "120", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "120", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "124", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "124", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "124", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "128", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "128", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "128", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "132", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "132", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "132", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "136", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "136", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "136", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "140", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "140", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "140", "30",
+        "FCC", "5G", "20M", "OFDM", "1T", "149", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "149", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "149", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "153", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "153", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "153", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "157", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "157", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "157", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "161", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "161", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "161", "63",
+        "FCC", "5G", "20M", "OFDM", "1T", "165", "32",
+        "ETSI", "5G", "20M", "OFDM", "1T", "165", "30",
+        "MKK", "5G", "20M", "OFDM", "1T", "165", "63",
+        "FCC", "5G", "20M", "HT", "1T", "36", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "36", "30",
+        "MKK", "5G", "20M", "HT", "1T", "36", "30",
+        "FCC", "5G", "20M", "HT", "1T", "40", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "40", "30",
+        "MKK", "5G", "20M", "HT", "1T", "40", "30",
+        "FCC", "5G", "20M", "HT", "1T", "44", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "44", "30",
+        "MKK", "5G", "20M", "HT", "1T", "44", "30",
+        "FCC", "5G", "20M", "HT", "1T", "48", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "48", "30",
+        "MKK", "5G", "20M", "HT", "1T", "48", "30",
+        "FCC", "5G", "20M", "HT", "1T", "52", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "52", "30",
+        "MKK", "5G", "20M", "HT", "1T", "52", "30",
+        "FCC", "5G", "20M", "HT", "1T", "56", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "56", "30",
+        "MKK", "5G", "20M", "HT", "1T", "56", "30",
+        "FCC", "5G", "20M", "HT", "1T", "60", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "60", "30",
+        "MKK", "5G", "20M", "HT", "1T", "60", "30",
+        "FCC", "5G", "20M", "HT", "1T", "64", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "64", "30",
+        "MKK", "5G", "20M", "HT", "1T", "64", "30",
+        "FCC", "5G", "20M", "HT", "1T", "100", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "100", "30",
+        "MKK", "5G", "20M", "HT", "1T", "100", "30",
+        "FCC", "5G", "20M", "HT", "1T", "114", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "114", "30",
+        "MKK", "5G", "20M", "HT", "1T", "114", "30",
+        "FCC", "5G", "20M", "HT", "1T", "108", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "108", "30",
+        "MKK", "5G", "20M", "HT", "1T", "108", "30",
+        "FCC", "5G", "20M", "HT", "1T", "112", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "112", "30",
+        "MKK", "5G", "20M", "HT", "1T", "112", "30",
+        "FCC", "5G", "20M", "HT", "1T", "116", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "116", "30",
+        "MKK", "5G", "20M", "HT", "1T", "116", "30",
+        "FCC", "5G", "20M", "HT", "1T", "120", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "120", "30",
+        "MKK", "5G", "20M", "HT", "1T", "120", "30",
+        "FCC", "5G", "20M", "HT", "1T", "124", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "124", "30",
+        "MKK", "5G", "20M", "HT", "1T", "124", "30",
+        "FCC", "5G", "20M", "HT", "1T", "128", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "128", "30",
+        "MKK", "5G", "20M", "HT", "1T", "128", "30",
+        "FCC", "5G", "20M", "HT", "1T", "132", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "132", "30",
+        "MKK", "5G", "20M", "HT", "1T", "132", "30",
+        "FCC", "5G", "20M", "HT", "1T", "136", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "136", "30",
+        "MKK", "5G", "20M", "HT", "1T", "136", "30",
+        "FCC", "5G", "20M", "HT", "1T", "140", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "140", "30",
+        "MKK", "5G", "20M", "HT", "1T", "140", "30",
+        "FCC", "5G", "20M", "HT", "1T", "149", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "149", "30",
+        "MKK", "5G", "20M", "HT", "1T", "149", "63",
+        "FCC", "5G", "20M", "HT", "1T", "153", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "153", "30",
+        "MKK", "5G", "20M", "HT", "1T", "153", "63",
+        "FCC", "5G", "20M", "HT", "1T", "157", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "157", "30",
+        "MKK", "5G", "20M", "HT", "1T", "157", "63",
+        "FCC", "5G", "20M", "HT", "1T", "161", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "161", "30",
+        "MKK", "5G", "20M", "HT", "1T", "161", "63",
+        "FCC", "5G", "20M", "HT", "1T", "165", "32",
+        "ETSI", "5G", "20M", "HT", "1T", "165", "30",
+        "MKK", "5G", "20M", "HT", "1T", "165", "63",
+        "FCC", "5G", "20M", "HT", "2T", "36", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "36", "30",
+        "MKK", "5G", "20M", "HT", "2T", "36", "30",
+        "FCC", "5G", "20M", "HT", "2T", "40", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "40", "30",
+        "MKK", "5G", "20M", "HT", "2T", "40", "30",
+        "FCC", "5G", "20M", "HT", "2T", "44", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "44", "30",
+        "MKK", "5G", "20M", "HT", "2T", "44", "30",
+        "FCC", "5G", "20M", "HT", "2T", "48", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "48", "30",
+        "MKK", "5G", "20M", "HT", "2T", "48", "30",
+        "FCC", "5G", "20M", "HT", "2T", "52", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "52", "30",
+        "MKK", "5G", "20M", "HT", "2T", "52", "30",
+        "FCC", "5G", "20M", "HT", "2T", "56", "32",
+        "ETSI", "5G", "20M", "HT", "2T", "56", "30",
+        "MKK", "5G", "20M", "HT", "2T", "56", "30",
+        "FCC", "5G", "20M", "HT", "2T", "60", "30",
+        "ETSI", "5G", "20M", "HT", "2T", "60", "30",
+        "MKK", "5G", "20M", "HT", "2T", "60", "30",
+        "FCC", "5G", "20M", "HT", "2T", "64", "26",
+        "ETSI", "5G", "20M", "HT", "2T", "64", "30",
+        "MKK", "5G", "20M", "HT", "2T", "64", "30",
+        "FCC", "5G", "20M", "HT", "2T", "100", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "100", "30",
+        "MKK", "5G", "20M", "HT", "2T", "100", "30",
+        "FCC", "5G", "20M", "HT", "2T", "114", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "114", "30",
+        "MKK", "5G", "20M", "HT", "2T", "114", "30",
+        "FCC", "5G", "20M", "HT", "2T", "108", "30",
+        "ETSI", "5G", "20M", "HT", "2T", "108", "30",
+        "MKK", "5G", "20M", "HT", "2T", "108", "30",
+        "FCC", "5G", "20M", "HT", "2T", "112", "32",
+        "ETSI", "5G", "20M", "HT", "2T", "112", "30",
+        "MKK", "5G", "20M", "HT", "2T", "112", "30",
+        "FCC", "5G", "20M", "HT", "2T", "116", "32",
+        "ETSI", "5G", "20M", "HT", "2T", "116", "30",
+        "MKK", "5G", "20M", "HT", "2T", "116", "30",
+        "FCC", "5G", "20M", "HT", "2T", "120", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "120", "30",
+        "MKK", "5G", "20M", "HT", "2T", "120", "30",
+        "FCC", "5G", "20M", "HT", "2T", "124", "32",
+        "ETSI", "5G", "20M", "HT", "2T", "124", "30",
+        "MKK", "5G", "20M", "HT", "2T", "124", "30",
+        "FCC", "5G", "20M", "HT", "2T", "128", "30",
+        "ETSI", "5G", "20M", "HT", "2T", "128", "30",
+        "MKK", "5G", "20M", "HT", "2T", "128", "30",
+        "FCC", "5G", "20M", "HT", "2T", "132", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "132", "30",
+        "MKK", "5G", "20M", "HT", "2T", "132", "30",
+        "FCC", "5G", "20M", "HT", "2T", "136", "28",
+        "ETSI", "5G", "20M", "HT", "2T", "136", "30",
+        "MKK", "5G", "20M", "HT", "2T", "136", "30",
+        "FCC", "5G", "20M", "HT", "2T", "140", "26",
+        "ETSI", "5G", "20M", "HT", "2T", "140", "30",
+        "MKK", "5G", "20M", "HT", "2T", "140", "30",
+        "FCC", "5G", "20M", "HT", "2T", "149", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "149", "30",
+        "MKK", "5G", "20M", "HT", "2T", "149", "63",
+        "FCC", "5G", "20M", "HT", "2T", "153", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "153", "30",
+        "MKK", "5G", "20M", "HT", "2T", "153", "63",
+        "FCC", "5G", "20M", "HT", "2T", "157", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "157", "30",
+        "MKK", "5G", "20M", "HT", "2T", "157", "63",
+        "FCC", "5G", "20M", "HT", "2T", "161", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "161", "30",
+        "MKK", "5G", "20M", "HT", "2T", "161", "63",
+        "FCC", "5G", "20M", "HT", "2T", "165", "34",
+        "ETSI", "5G", "20M", "HT", "2T", "165", "30",
+        "MKK", "5G", "20M", "HT", "2T", "165", "63",
+        "FCC", "5G", "40M", "HT", "1T", "38", "26",
+        "ETSI", "5G", "40M", "HT", "1T", "38", "30",
+        "MKK", "5G", "40M", "HT", "1T", "38", "30",
+        "FCC", "5G", "40M", "HT", "1T", "46", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "46", "30",
+        "MKK", "5G", "40M", "HT", "1T", "46", "30",
+        "FCC", "5G", "40M", "HT", "1T", "54", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "54", "30",
+        "MKK", "5G", "40M", "HT", "1T", "54", "30",
+        "FCC", "5G", "40M", "HT", "1T", "62", "24",
+        "ETSI", "5G", "40M", "HT", "1T", "62", "30",
+        "MKK", "5G", "40M", "HT", "1T", "62", "30",
+        "FCC", "5G", "40M", "HT", "1T", "102", "24",
+        "ETSI", "5G", "40M", "HT", "1T", "102", "30",
+        "MKK", "5G", "40M", "HT", "1T", "102", "30",
+        "FCC", "5G", "40M", "HT", "1T", "110", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "110", "30",
+        "MKK", "5G", "40M", "HT", "1T", "110", "30",
+        "FCC", "5G", "40M", "HT", "1T", "118", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "118", "30",
+        "MKK", "5G", "40M", "HT", "1T", "118", "30",
+        "FCC", "5G", "40M", "HT", "1T", "126", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "126", "30",
+        "MKK", "5G", "40M", "HT", "1T", "126", "30",
+        "FCC", "5G", "40M", "HT", "1T", "134", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "134", "30",
+        "MKK", "5G", "40M", "HT", "1T", "134", "30",
+        "FCC", "5G", "40M", "HT", "1T", "151", "30",
+        "ETSI", "5G", "40M", "HT", "1T", "151", "30",
+        "MKK", "5G", "40M", "HT", "1T", "151", "63",
+        "FCC", "5G", "40M", "HT", "1T", "159", "32",
+        "ETSI", "5G", "40M", "HT", "1T", "159", "30",
+        "MKK", "5G", "40M", "HT", "1T", "159", "63",
+        "FCC", "5G", "40M", "HT", "2T", "38", "28",
+        "ETSI", "5G", "40M", "HT", "2T", "38", "30",
+        "MKK", "5G", "40M", "HT", "2T", "38", "30",
+        "FCC", "5G", "40M", "HT", "2T", "46", "28",
+        "ETSI", "5G", "40M", "HT", "2T", "46", "30",
+        "MKK", "5G", "40M", "HT", "2T", "46", "30",
+        "FCC", "5G", "40M", "HT", "2T", "54", "30",
+        "ETSI", "5G", "40M", "HT", "2T", "54", "30",
+        "MKK", "5G", "40M", "HT", "2T", "54", "30",
+        "FCC", "5G", "40M", "HT", "2T", "62", "30",
+        "ETSI", "5G", "40M", "HT", "2T", "62", "30",
+        "MKK", "5G", "40M", "HT", "2T", "62", "30",
+        "FCC", "5G", "40M", "HT", "2T", "102", "26",
+        "ETSI", "5G", "40M", "HT", "2T", "102", "30",
+        "MKK", "5G", "40M", "HT", "2T", "102", "30",
+        "FCC", "5G", "40M", "HT", "2T", "110", "30",
+        "ETSI", "5G", "40M", "HT", "2T", "110", "30",
+        "MKK", "5G", "40M", "HT", "2T", "110", "30",
+        "FCC", "5G", "40M", "HT", "2T", "118", "34",
+        "ETSI", "5G", "40M", "HT", "2T", "118", "30",
+        "MKK", "5G", "40M", "HT", "2T", "118", "30",
+        "FCC", "5G", "40M", "HT", "2T", "126", "32",
+        "ETSI", "5G", "40M", "HT", "2T", "126", "30",
+        "MKK", "5G", "40M", "HT", "2T", "126", "30",
+        "FCC", "5G", "40M", "HT", "2T", "134", "30",
+        "ETSI", "5G", "40M", "HT", "2T", "134", "30",
+        "MKK", "5G", "40M", "HT", "2T", "134", "30",
+        "FCC", "5G", "40M", "HT", "2T", "151", "34",
+        "ETSI", "5G", "40M", "HT", "2T", "151", "30",
+        "MKK", "5G", "40M", "HT", "2T", "151", "63",
+        "FCC", "5G", "40M", "HT", "2T", "159", "34",
+        "ETSI", "5G", "40M", "HT", "2T", "159", "30",
+        "MKK", "5G", "40M", "HT", "2T", "159", "63",
+        "FCC", "5G", "80M", "VHT", "1T", "42", "22",
+        "ETSI", "5G", "80M", "VHT", "1T", "42", "30",
+        "MKK", "5G", "80M", "VHT", "1T", "42", "30",
+        "FCC", "5G", "80M", "VHT", "1T", "58", "20",
+        "ETSI", "5G", "80M", "VHT", "1T", "58", "30",
+        "MKK", "5G", "80M", "VHT", "1T", "58", "30",
+        "FCC", "5G", "80M", "VHT", "1T", "106", "20",
+        "ETSI", "5G", "80M", "VHT", "1T", "106", "30",
+        "MKK", "5G", "80M", "VHT", "1T", "106", "30",
+        "FCC", "5G", "80M", "VHT", "1T", "122", "20",
+        "ETSI", "5G", "80M", "VHT", "1T", "122", "30",
+        "MKK", "5G", "80M", "VHT", "1T", "122", "30",
+        "FCC", "5G", "80M", "VHT", "1T", "155", "28",
+        "ETSI", "5G", "80M", "VHT", "1T", "155", "30",
+        "MKK", "5G", "80M", "VHT", "1T", "155", "63",
+        "FCC", "5G", "80M", "VHT", "2T", "42", "28",
+        "ETSI", "5G", "80M", "VHT", "2T", "42", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "42", "30",
+        "FCC", "5G", "80M", "VHT", "2T", "58", "26",
+        "ETSI", "5G", "80M", "VHT", "2T", "58", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "58", "30",
+        "FCC", "5G", "80M", "VHT", "2T", "106", "28",
+        "ETSI", "5G", "80M", "VHT", "2T", "106", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "106", "30",
+        "FCC", "5G", "80M", "VHT", "2T", "122", "32",
+        "ETSI", "5G", "80M", "VHT", "2T", "122", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "122", "30",
+        "FCC", "5G", "80M", "VHT", "2T", "155", "34",
+        "ETSI", "5G", "80M", "VHT", "2T", "155", "30",
+        "MKK", "5G", "80M", "VHT", "2T", "155", "63"
+};
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/table.h b/drivers/net/wireless/rtlwifi/rtl8821ae/table.h
new file mode 100644
index 000000000000..24bcff6bc507
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/table.h
@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_TABLE__H_
+#define __RTL8821AE_TABLE__H_
+
+#include <linux/types.h>
+#define  RTL8821AEPHY_REG_1TARRAYLEN    344
+extern u32 RTL8821AE_PHY_REG_ARRAY[];
+#define  RTL8812AEPHY_REG_1TARRAYLEN    490
+extern u32 RTL8812AE_PHY_REG_ARRAY[];
+#define RTL8821AEPHY_REG_ARRAY_PGLEN    90
+extern u32 RTL8821AE_PHY_REG_ARRAY_PG[];
+#define RTL8812AEPHY_REG_ARRAY_PGLEN    276
+extern u32 RTL8812AE_PHY_REG_ARRAY_PG[];
+/* #define      RTL8723BE_RADIOA_1TARRAYLEN     206 */
+/* extern u8 *RTL8821AE_TXPWR_LMT_ARRAY[]; */
+#define RTL8812AE_RADIOA_1TARRAYLEN     1264
+extern u32 RTL8812AE_RADIOA_ARRAY[];
+#define RTL8812AE_RADIOB_1TARRAYLEN     1240
+extern u32 RTL8812AE_RADIOB_ARRAY[];
+#define RTL8821AE_RADIOA_1TARRAYLEN     1176
+extern u32 RTL8821AE_RADIOA_ARRAY[];
+#define RTL8821AEMAC_1T_ARRAYLEN                194
+extern u32 RTL8821AE_MAC_REG_ARRAY[];
+#define RTL8812AEMAC_1T_ARRAYLEN                214
+extern u32 RTL8812AE_MAC_REG_ARRAY[];
+#define RTL8821AEAGCTAB_1TARRAYLEN              382
+extern u32 RTL8821AE_AGC_TAB_ARRAY[];
+#define RTL8812AEAGCTAB_1TARRAYLEN              1312
+extern u32 RTL8812AE_AGC_TAB_ARRAY[];
+#define RTL8812AE_TXPWR_LMT_ARRAY_LEN           3948
+extern u8 *RTL8812AE_TXPWR_LMT[];
+#define RTL8821AE_TXPWR_LMT_ARRAY_LEN           3948
+extern u8 *RTL8821AE_TXPWR_LMT[];
+#endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
new file mode 100644
index 000000000000..383b86b05cba
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
@@ -0,0 +1,1236 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../base.h"
+#include "../stats.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "trx.h"
+#include "led.h"
+#include "dm.h"
+#include "phy.h"
+#include "fw.h"
+
+static u8 _rtl8821ae_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
+{
+        __le16 fc = rtl_get_fc(skb);
+
+        if (unlikely(ieee80211_is_beacon(fc)))
+                return QSLT_BEACON;
+        if (ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))
+                return QSLT_MGNT;
+
+        return skb->priority;
+}
+
+/* mac80211's rate_idx is like this:
+ *
+ * 2.4G band:rx_status->band == IEEE80211_BAND_2GHZ
+ *
+ * B/G rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC_RATE1M-->DESC_RATE54M ==> idx is 0-->11,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC_RATEMCS0-->DESC_RATEMCS15 ==> idx is 0-->15
+ *
+ * 5G band:rx_status->band == IEEE80211_BAND_5GHZ
+ * A rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC_RATE6M-->DESC_RATE54M ==> idx is 0-->7,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC_RATEMCS0-->DESC_RATEMCS15 ==> idx is 0-->15
+ */
+static int _rtl8821ae_rate_mapping(struct ieee80211_hw *hw,
+                                   bool isht, bool isvht, u8 desc_rate)
+{
+        int rate_idx;
+
+        if (!isht) {
+                if (IEEE80211_BAND_2GHZ == hw->conf.chandef.chan->band) {
+                        switch (desc_rate) {
+                        case DESC_RATE1M:
+                                rate_idx = 0;
+                                break;
+                        case DESC_RATE2M:
+                                rate_idx = 1;
+                                break;
+                        case DESC_RATE5_5M:
+                                rate_idx = 2;
+                                break;
+                        case DESC_RATE11M:
+                                rate_idx = 3;
+                                break;
+                        case DESC_RATE6M:
+                                rate_idx = 4;
+                                break;
+                        case DESC_RATE9M:
+                                rate_idx = 5;
+                                break;
+                        case DESC_RATE12M:
+                                rate_idx = 6;
+                                break;
+                        case DESC_RATE18M:
+                                rate_idx = 7;
+                                break;
+                        case DESC_RATE24M:
+                                rate_idx = 8;
+                                break;
+                        case DESC_RATE36M:
+                                rate_idx = 9;
+                                break;
+                        case DESC_RATE48M:
+                                rate_idx = 10;
+                                break;
+                        case DESC_RATE54M:
+                                rate_idx = 11;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                } else {
+                        switch (desc_rate) {
+                        case DESC_RATE6M:
+                                rate_idx = 0;
+                                break;
+                        case DESC_RATE9M:
+                                rate_idx = 1;
+                                break;
+                        case DESC_RATE12M:
+                                rate_idx = 2;
+                                break;
+                        case DESC_RATE18M:
+                                rate_idx = 3;
+                                break;
+                        case DESC_RATE24M:
+                                rate_idx = 4;
+                                break;
+                        case DESC_RATE36M:
+                                rate_idx = 5;
+                                break;
+                        case DESC_RATE48M:
+                                rate_idx = 6;
+                                break;
+                        case DESC_RATE54M:
+                                rate_idx = 7;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                }
+        } else {
+                switch (desc_rate) {
+                case DESC_RATEMCS0:
+                        rate_idx = 0;
+                        break;
+                case DESC_RATEMCS1:
+                        rate_idx = 1;
+                        break;
+                case DESC_RATEMCS2:
+                        rate_idx = 2;
+                        break;
+                case DESC_RATEMCS3:
+                        rate_idx = 3;
+                        break;
+                case DESC_RATEMCS4:
+                        rate_idx = 4;
+                        break;
+                case DESC_RATEMCS5:
+                        rate_idx = 5;
+                        break;
+                case DESC_RATEMCS6:
+                        rate_idx = 6;
+                        break;
+                case DESC_RATEMCS7:
+                        rate_idx = 7;
+                        break;
+                case DESC_RATEMCS8:
+                        rate_idx = 8;
+                        break;
+                case DESC_RATEMCS9:
+                        rate_idx = 9;
+                        break;
+                case DESC_RATEMCS10:
+                        rate_idx = 10;
+                        break;
+                case DESC_RATEMCS11:
+                        rate_idx = 11;
+                        break;
+                case DESC_RATEMCS12:
+                        rate_idx = 12;
+                        break;
+                case DESC_RATEMCS13:
+                        rate_idx = 13;
+                        break;
+                case DESC_RATEMCS14:
+                        rate_idx = 14;
+                        break;
+                case DESC_RATEMCS15:
+                        rate_idx = 15;
+                        break;
+                default:
+                        rate_idx = 0;
+                        break;
+                }
+        }
+
+        if (isvht) {
+                switch (desc_rate) {
+                case DESC_RATEVHT1SS_MCS0:
+                        rate_idx = 0;
+                        break;
+                case DESC_RATEVHT1SS_MCS1:
+                        rate_idx = 1;
+                        break;
+                case DESC_RATEVHT1SS_MCS2:
+                        rate_idx = 2;
+                        break;
+                case DESC_RATEVHT1SS_MCS3:
+                        rate_idx = 3;
+                        break;
+                case DESC_RATEVHT1SS_MCS4:
+                        rate_idx = 4;
+                        break;
+                case DESC_RATEVHT1SS_MCS5:
+                        rate_idx = 5;
+                        break;
+                case DESC_RATEVHT1SS_MCS6:
+                        rate_idx = 6;
+                        break;
+                case DESC_RATEVHT1SS_MCS7:
+                        rate_idx = 7;
+                        break;
+                case DESC_RATEVHT1SS_MCS8:
+                        rate_idx = 8;
+                        break;
+                case DESC_RATEVHT1SS_MCS9:
+                        rate_idx = 9;
+                        break;
+                case DESC_RATEVHT2SS_MCS0:
+                        rate_idx = 0;
+                        break;
+                case DESC_RATEVHT2SS_MCS1:
+                        rate_idx = 1;
+                        break;
+                case DESC_RATEVHT2SS_MCS2:
+                        rate_idx = 2;
+                        break;
+                case DESC_RATEVHT2SS_MCS3:
+                        rate_idx = 3;
+                        break;
+                case DESC_RATEVHT2SS_MCS4:
+                        rate_idx = 4;
+                        break;
+                case DESC_RATEVHT2SS_MCS5:
+                        rate_idx = 5;
+                        break;
+                case DESC_RATEVHT2SS_MCS6:
+                        rate_idx = 6;
+                        break;
+                case DESC_RATEVHT2SS_MCS7:
+                        rate_idx = 7;
+                        break;
+                case DESC_RATEVHT2SS_MCS8:
+                        rate_idx = 8;
+                        break;
+                case DESC_RATEVHT2SS_MCS9:
+                        rate_idx = 9;
+                        break;
+                default:
+                        rate_idx = 0;
+                        break;
+                }
+        }
+        return rate_idx;
+}
+
+static u16 odm_cfo(char value)
+{
+        int ret_val;
+
+        if (value < 0) {
+                ret_val = 0 - value;
+                ret_val = (ret_val << 1) + (ret_val >> 1);
+                /* set bit12 as 1 for negative cfo */
+                ret_val = ret_val | BIT(12);
+        } else {
+                ret_val = value;
+                ret_val = (ret_val << 1) + (ret_val >> 1);
+        }
+        return ret_val;
+}
+
+static void query_rxphystatus(struct ieee80211_hw *hw,
+                              struct rtl_stats *pstatus, u8 *pdesc,
+                              struct rx_fwinfo_8821ae *p_drvinfo,
+                              bool bpacket_match_bssid,
+                              bool bpacket_toself, bool packet_beacon)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct phy_status_rpt *p_phystrpt = (struct phy_status_rpt *)p_drvinfo;
+        struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        char rx_pwr_all = 0, rx_pwr[4];
+        u8 rf_rx_num = 0, evm, evmdbm, pwdb_all;
+        u8 i, max_spatial_stream;
+        u32 rssi, total_rssi = 0;
+        bool is_cck = pstatus->is_cck;
+        u8 lan_idx, vga_idx;
+
+        /* Record it for next packet processing */
+        pstatus->packet_matchbssid = bpacket_match_bssid;
+        pstatus->packet_toself = bpacket_toself;
+        pstatus->packet_beacon = packet_beacon;
+        pstatus->rx_mimo_signalquality[0] = -1;
+        pstatus->rx_mimo_signalquality[1] = -1;
+
+        if (is_cck) {
+                u8 cck_highpwr;
+                u8 cck_agc_rpt;
+
+                cck_agc_rpt = p_phystrpt->cfosho[0];
+
+                /* (1)Hardware does not provide RSSI for CCK
+                 * (2)PWDB, Average PWDB cacluated by
+                 * hardware (for rate adaptive)
+                 */
+                cck_highpwr = (u8)rtlphy->cck_high_power;
+
+                lan_idx = ((cck_agc_rpt & 0xE0) >> 5);
+                vga_idx = (cck_agc_rpt & 0x1f);
+                if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE) {
+                        switch (lan_idx) {
+                        case 7:
+                                if (vga_idx <= 27)
+                                        /*VGA_idx = 27~2*/
+                                        rx_pwr_all = -100 + 2*(27-vga_idx);
+                                else
+                                        rx_pwr_all = -100;
+                                break;
+                        case 6:
+                                /*VGA_idx = 2~0*/
+                                rx_pwr_all = -48 + 2*(2-vga_idx);
+                                break;
+                        case 5:
+                                /*VGA_idx = 7~5*/
+                                rx_pwr_all = -42 + 2*(7-vga_idx);
+                                break;
+                        case 4:
+                                /*VGA_idx = 7~4*/
+                                rx_pwr_all = -36 + 2*(7-vga_idx);
+                                break;
+                        case 3:
+                                /*VGA_idx = 7~0*/
+                                rx_pwr_all = -24 + 2*(7-vga_idx);
+                                break;
+                        case 2:
+                                if (cck_highpwr)
+                                        /*VGA_idx = 5~0*/
+                                        rx_pwr_all = -12 + 2*(5-vga_idx);
+                                else
+                                        rx_pwr_all = -6 + 2*(5-vga_idx);
+                                break;
+                        case 1:
+                                rx_pwr_all = 8-2*vga_idx;
+                                break;
+                        case 0:
+                                rx_pwr_all = 14-2*vga_idx;
+                                break;
+                        default:
+                                break;
+                        }
+                        rx_pwr_all += 6;
+                        pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+                        if (!cck_highpwr) {
+                                if (pwdb_all >= 80)
+                                        pwdb_all =
+                                          ((pwdb_all - 80)<<1) +
+                                         ((pwdb_all - 80)>>1) + 80;
+                                else if ((pwdb_all <= 78) && (pwdb_all >= 20))
+                                        pwdb_all += 3;
+                                if (pwdb_all > 100)
+                                        pwdb_all = 100;
+                        }
+                } else { /* 8821 */
+                        char pout = -6;
+
+                        switch (lan_idx) {
+                        case 5:
+                                rx_pwr_all = pout - 32 - (2*vga_idx);
+                                        break;
+                        case 4:
+                                rx_pwr_all = pout - 24 - (2*vga_idx);
+                                        break;
+                        case 2:
+                                rx_pwr_all = pout - 11 - (2*vga_idx);
+                                        break;
+                        case 1:
+                                rx_pwr_all = pout + 5 - (2*vga_idx);
+                                        break;
+                        case 0:
+                                rx_pwr_all = pout + 21 - (2*vga_idx);
+                                        break;
+                        }
+                        pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+                }
+
+                pstatus->rx_pwdb_all = pwdb_all;
+                pstatus->recvsignalpower = rx_pwr_all;
+
+                /* (3) Get Signal Quality (EVM) */
+                if (bpacket_match_bssid) {
+                        u8 sq;
+
+                        if (pstatus->rx_pwdb_all > 40) {
+                                sq = 100;
+                        } else {
+                                sq = p_phystrpt->pwdb_all;
+                                if (sq > 64)
+                                        sq = 0;
+                                else if (sq < 20)
+                                        sq = 100;
+                                else
+                                        sq = ((64 - sq) * 100) / 44;
+                        }
+
+                        pstatus->signalquality = sq;
+                        pstatus->rx_mimo_signalquality[0] = sq;
+                        pstatus->rx_mimo_signalquality[1] = -1;
+                }
+        } else {
+                /* (1)Get RSSI for HT rate */
+                for (i = RF90_PATH_A; i < RF6052_MAX_PATH; i++) {
+                        /* we will judge RF RX path now. */
+                        if (rtlpriv->dm.rfpath_rxenable[i])
+                                rf_rx_num++;
+
+                        rx_pwr[i] = (p_phystrpt->gain_trsw[i] & 0x7f) - 110;
+
+                        /* Translate DBM to percentage. */
+                        rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
+                        total_rssi += rssi;
+
+                        /* Get Rx snr value in DB */
+                        pstatus->rx_snr[i] = p_phystrpt->rxsnr[i] / 2;
+                        rtlpriv->stats.rx_snr_db[i] = p_phystrpt->rxsnr[i] / 2;
+
+                        pstatus->cfo_short[i] = odm_cfo(p_phystrpt->cfosho[i]);
+                        pstatus->cfo_tail[i] = odm_cfo(p_phystrpt->cfotail[i]);
+                        /* Record Signal Strength for next packet */
+                        pstatus->rx_mimo_signalstrength[i] = (u8)rssi;
+                }
+
+                /* (2)PWDB, Average PWDB cacluated by
+                 * hardware (for rate adaptive)
+                 */
+                rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
+
+                pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
+                pstatus->rx_pwdb_all = pwdb_all;
+                pstatus->rxpower = rx_pwr_all;
+                pstatus->recvsignalpower = rx_pwr_all;
+
+                /* (3)EVM of HT rate */
+                if ((pstatus->is_ht && pstatus->rate >= DESC_RATEMCS8 &&
+                     pstatus->rate <= DESC_RATEMCS15) ||
+                    (pstatus->is_vht &&
+                     pstatus->rate >= DESC_RATEVHT2SS_MCS0 &&
+                     pstatus->rate <= DESC_RATEVHT2SS_MCS9))
+                        max_spatial_stream = 2;
+                else
+                        max_spatial_stream = 1;
+
+                for (i = 0; i < max_spatial_stream; i++) {
+                        evm = rtl_evm_db_to_percentage(p_phystrpt->rxevm[i]);
+                        evmdbm = rtl_evm_dbm_jaguar(p_phystrpt->rxevm[i]);
+
+                        if (bpacket_match_bssid) {
+                                /* Fill value in RFD, Get the first
+                                 * spatial stream only
+                                 */
+                                if (i == 0)
+                                        pstatus->signalquality = evm;
+                                pstatus->rx_mimo_signalquality[i] = evm;
+                                pstatus->rx_mimo_evm_dbm[i] = evmdbm;
+                        }
+                }
+                if (bpacket_match_bssid) {
+                        for (i = RF90_PATH_A; i <= RF90_PATH_B; i++)
+                                rtl_priv(hw)->dm.cfo_tail[i] =
+                                        (char)p_phystrpt->cfotail[i];
+
+                        rtl_priv(hw)->dm.packet_count++;
+                }
+        }
+
+        /* UI BSS List signal strength(in percentage),
+         * make it good looking, from 0~100.
+         */
+        if (is_cck)
+                pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
+                        pwdb_all));
+        else if (rf_rx_num != 0)
+                pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
+                        total_rssi /= rf_rx_num));
+        /*HW antenna diversity*/
+        rtldm->fat_table.antsel_rx_keep_0 = p_phystrpt->antidx_anta;
+        rtldm->fat_table.antsel_rx_keep_1 = p_phystrpt->antidx_antb;
+}
+
+static void translate_rx_signal_stuff(struct ieee80211_hw *hw,
+                                      struct sk_buff *skb,
+                                      struct rtl_stats *pstatus, u8 *pdesc,
+                                      struct rx_fwinfo_8821ae *p_drvinfo)
+{
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+        struct ieee80211_hdr *hdr;
+        u8 *tmp_buf;
+        u8 *praddr;
+        u8 *psaddr;
+        __le16 fc;
+        u16 type;
+        bool packet_matchbssid, packet_toself, packet_beacon;
+
+        tmp_buf = skb->data + pstatus->rx_drvinfo_size + pstatus->rx_bufshift;
+
+        hdr = (struct ieee80211_hdr *)tmp_buf;
+        fc = hdr->frame_control;
+        type = WLAN_FC_GET_TYPE(hdr->frame_control);
+        praddr = hdr->addr1;
+        psaddr = ieee80211_get_SA(hdr);
+        ether_addr_copy(pstatus->psaddr, psaddr);
+
+        packet_matchbssid = (!ieee80211_is_ctl(fc) &&
+                             (ether_addr_equal(mac->bssid,
+                                               ieee80211_has_tods(fc) ?
+                                               hdr->addr1 :
+                                               ieee80211_has_fromds(fc) ?
+                                               hdr->addr2 : hdr->addr3)) &&
+                              (!pstatus->hwerror) &&
+                              (!pstatus->crc) && (!pstatus->icv));
+
+        packet_toself = packet_matchbssid &&
+            (ether_addr_equal(praddr, rtlefuse->dev_addr));
+
+        if (ieee80211_is_beacon(hdr->frame_control))
+                packet_beacon = true;
+        else
+                packet_beacon = false;
+
+        if (packet_beacon && packet_matchbssid)
+                rtl_priv(hw)->dm.dbginfo.num_qry_beacon_pkt++;
+
+        if (packet_matchbssid &&
+            ieee80211_is_data_qos(hdr->frame_control) &&
+            !is_multicast_ether_addr(ieee80211_get_DA(hdr))) {
+                struct ieee80211_qos_hdr *hdr_qos =
+                        (struct ieee80211_qos_hdr *)tmp_buf;
+                u16 tid = le16_to_cpu(hdr_qos->qos_ctrl) & 0xf;
+
+                if (tid != 0 && tid != 3)
+                        rtl_priv(hw)->dm.dbginfo.num_non_be_pkt++;
+        }
+
+        query_rxphystatus(hw, pstatus, pdesc, p_drvinfo,
+                          packet_matchbssid, packet_toself,
+                          packet_beacon);
+        /*_rtl8821ae_smart_antenna(hw, pstatus); */
+        rtl_process_phyinfo(hw, tmp_buf, pstatus);
+}
+
+static void _rtl8821ae_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
+                                        u8 *virtualaddress)
+{
+        u32 dwtmp = 0;
+
+        memset(virtualaddress, 0, 8);
+
+        SET_EARLYMODE_PKTNUM(virtualaddress, ptcb_desc->empkt_num);
+        if (ptcb_desc->empkt_num == 1) {
+                dwtmp = ptcb_desc->empkt_len[0];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[0];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0)+4;
+                dwtmp += ptcb_desc->empkt_len[1];
+        }
+        SET_EARLYMODE_LEN0(virtualaddress, dwtmp);
+
+        if (ptcb_desc->empkt_num <= 3) {
+                dwtmp = ptcb_desc->empkt_len[2];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[2];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0)+4;
+                dwtmp += ptcb_desc->empkt_len[3];
+        }
+        SET_EARLYMODE_LEN1(virtualaddress, dwtmp);
+        if (ptcb_desc->empkt_num <= 5) {
+                dwtmp = ptcb_desc->empkt_len[4];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[4];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0)+4;
+                dwtmp += ptcb_desc->empkt_len[5];
+        }
+        SET_EARLYMODE_LEN2_1(virtualaddress, dwtmp & 0xF);
+        SET_EARLYMODE_LEN2_2(virtualaddress, dwtmp >> 4);
+        if (ptcb_desc->empkt_num <= 7) {
+                dwtmp = ptcb_desc->empkt_len[6];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[6];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0)+4;
+                dwtmp += ptcb_desc->empkt_len[7];
+        }
+        SET_EARLYMODE_LEN3(virtualaddress, dwtmp);
+        if (ptcb_desc->empkt_num <= 9) {
+                dwtmp = ptcb_desc->empkt_len[8];
+        } else {
+                dwtmp = ptcb_desc->empkt_len[8];
+                dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0)+4;
+                dwtmp += ptcb_desc->empkt_len[9];
+        }
+        SET_EARLYMODE_LEN4(virtualaddress, dwtmp);
+}
+
+static bool rtl8821ae_get_rxdesc_is_ht(struct ieee80211_hw *hw, u8 *pdesc)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 rx_rate = 0;
+
+        rx_rate = GET_RX_DESC_RXMCS(pdesc);
+
+        RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD, "rx_rate=0x%02x.\n", rx_rate);
+
+        if ((rx_rate >= DESC_RATEMCS0) && (rx_rate <= DESC_RATEMCS15))
+                return true;
+        return false;
+}
+
+static bool rtl8821ae_get_rxdesc_is_vht(struct ieee80211_hw *hw, u8 *pdesc)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u8 rx_rate = 0;
+
+        rx_rate = GET_RX_DESC_RXMCS(pdesc);
+
+        RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD, "rx_rate=0x%02x.\n", rx_rate);
+
+        if (rx_rate >= DESC_RATEVHT1SS_MCS0)
+                return true;
+        return false;
+}
+
+static u8 rtl8821ae_get_rx_vht_nss(struct ieee80211_hw *hw, u8 *pdesc)
+{
+        u8 rx_rate = 0;
+        u8 vht_nss = 0;
+
+        rx_rate = GET_RX_DESC_RXMCS(pdesc);
+        if ((rx_rate >= DESC_RATEVHT1SS_MCS0) &&
+            (rx_rate <= DESC_RATEVHT1SS_MCS9))
+                vht_nss = 1;
+        else if ((rx_rate >= DESC_RATEVHT2SS_MCS0) &&
+                 (rx_rate <= DESC_RATEVHT2SS_MCS9))
+                vht_nss = 2;
+
+        return vht_nss;
+}
+
+bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw,
+                             struct rtl_stats *status,
+                             struct ieee80211_rx_status *rx_status,
+                             u8 *pdesc, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rx_fwinfo_8821ae *p_drvinfo;
+        struct ieee80211_hdr *hdr;
+
+        u32 phystatus = GET_RX_DESC_PHYST(pdesc);
+
+        status->length = (u16)GET_RX_DESC_PKT_LEN(pdesc);
+        status->rx_drvinfo_size = (u8)GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
+            RX_DRV_INFO_SIZE_UNIT;
+        status->rx_bufshift = (u8)(GET_RX_DESC_SHIFT(pdesc) & 0x03);
+        status->icv = (u16)GET_RX_DESC_ICV(pdesc);
+        status->crc = (u16)GET_RX_DESC_CRC32(pdesc);
+        status->hwerror = (status->crc | status->icv);
+        status->decrypted = !GET_RX_DESC_SWDEC(pdesc);
+        status->rate = (u8)GET_RX_DESC_RXMCS(pdesc);
+        status->shortpreamble = (u16)GET_RX_DESC_SPLCP(pdesc);
+        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_packet_bw = GET_RX_DESC_BW(pdesc);
+        status->macid = GET_RX_DESC_MACID(pdesc);
+        status->is_short_gi = !(bool)GET_RX_DESC_SPLCP(pdesc);
+        status->is_ht = rtl8821ae_get_rxdesc_is_ht(hw, pdesc);
+        status->is_vht = rtl8821ae_get_rxdesc_is_vht(hw, pdesc);
+        status->vht_nss = rtl8821ae_get_rx_vht_nss(hw, pdesc);
+        status->is_cck = RTL8821AE_RX_HAL_IS_CCK_RATE(status->rate);
+
+        RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,
+                 "rx_packet_bw=%s,is_ht %d, is_vht %d, vht_nss=%d,is_short_gi %d.\n",
+                 (status->rx_packet_bw == 2) ? "80M" :
+                 (status->rx_packet_bw == 1) ? "40M" : "20M",
+                 status->is_ht, status->is_vht, status->vht_nss,
+                 status->is_short_gi);
+
+        if (GET_RX_STATUS_DESC_RPT_SEL(pdesc))
+                status->packet_report_type = C2H_PACKET;
+        else
+                status->packet_report_type = NORMAL_RX;
+
+        if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))
+                status->wake_match = BIT(2);
+        else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
+                status->wake_match = BIT(1);
+        else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))
+                status->wake_match = BIT(0);
+        else
+                status->wake_match = 0;
+
+        if (status->wake_match)
+                RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,
+                         "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",
+                         status->wake_match);
+        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = hw->conf.chandef.chan->band;
+
+        hdr = (struct ieee80211_hdr *)(skb->data +
+              status->rx_drvinfo_size + status->rx_bufshift);
+
+        if (status->crc)
+                rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
+
+        if (status->rx_packet_bw == HT_CHANNEL_WIDTH_20_40)
+                rx_status->flag |= RX_FLAG_40MHZ;
+        else if (status->rx_packet_bw == HT_CHANNEL_WIDTH_80)
+                rx_status->vht_flag |= RX_VHT_FLAG_80MHZ;
+        if (status->is_ht)
+                rx_status->flag |= RX_FLAG_HT;
+        if (status->is_vht)
+                rx_status->flag |= RX_FLAG_VHT;
+
+        if (status->is_short_gi)
+                rx_status->flag |= RX_FLAG_SHORT_GI;
+
+        rx_status->vht_nss = status->vht_nss;
+        rx_status->flag |= RX_FLAG_MACTIME_START;
+
+        /* hw will set status->decrypted true, if it finds the
+         * frame is open data frame or mgmt frame.
+         * So hw will not decryption robust managment frame
+         * for IEEE80211w but still set status->decrypted
+         * true, so here we should set it back to undecrypted
+         * for IEEE80211w frame, and mac80211 sw will help
+         * to decrypt it
+         */
+        if (status->decrypted) {
+                if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
+                    (ieee80211_has_protected(hdr->frame_control)))
+                        rx_status->flag |= RX_FLAG_DECRYPTED;
+                else
+                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
+        }
+
+        /* rate_idx: index of data rate into band's
+         * supported rates or MCS index if HT rates
+         * are use (RX_FLAG_HT)
+         */
+        rx_status->rate_idx =
+          _rtl8821ae_rate_mapping(hw, status->is_ht,
+                                  status->is_vht, status->rate);
+
+        rx_status->mactime = status->timestamp_low;
+        if (phystatus) {
+                p_drvinfo = (struct rx_fwinfo_8821ae *)(skb->data +
+                            status->rx_bufshift);
+
+                translate_rx_signal_stuff(hw, skb, status, pdesc, p_drvinfo);
+        }
+        rx_status->signal = status->recvsignalpower + 10;
+        if (status->packet_report_type == TX_REPORT2) {
+                status->macid_valid_entry[0] =
+                  GET_RX_RPT2_DESC_MACID_VALID_1(pdesc);
+                status->macid_valid_entry[1] =
+                  GET_RX_RPT2_DESC_MACID_VALID_2(pdesc);
+        }
+        return true;
+}
+
+static u8 rtl8821ae_bw_mapping(struct ieee80211_hw *hw,
+                               struct rtl_tcb_desc *ptcb_desc)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        u8 bw_setting_of_desc = 0;
+
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                 "rtl8821ae_bw_mapping, current_chan_bw %d, packet_bw %d\n",
+                 rtlphy->current_chan_bw, ptcb_desc->packet_bw);
+
+        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80) {
+                if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_80)
+                        bw_setting_of_desc = 2;
+                else if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40)
+                        bw_setting_of_desc = 1;
+                else
+                        bw_setting_of_desc = 0;
+        } else if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
+                if ((ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) ||
+                    (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_80))
+                        bw_setting_of_desc = 1;
+                else
+                        bw_setting_of_desc = 0;
+        } else {
+                bw_setting_of_desc = 0;
+        }
+        return bw_setting_of_desc;
+}
+
+static u8 rtl8821ae_sc_mapping(struct ieee80211_hw *hw,
+                               struct rtl_tcb_desc *ptcb_desc)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_phy *rtlphy = &rtlpriv->phy;
+        struct rtl_mac *mac = rtl_mac(rtlpriv);
+        u8 sc_setting_of_desc = 0;
+
+        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80) {
+                if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_80) {
+                        sc_setting_of_desc = VHT_DATA_SC_DONOT_CARE;
+                } else if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) {
+                        if (mac->cur_80_prime_sc ==
+                            HAL_PRIME_CHNL_OFFSET_LOWER)
+                                sc_setting_of_desc =
+                                        VHT_DATA_SC_40_LOWER_OF_80MHZ;
+                        else if (mac->cur_80_prime_sc ==
+                                 HAL_PRIME_CHNL_OFFSET_UPPER)
+                                sc_setting_of_desc =
+                                        VHT_DATA_SC_40_UPPER_OF_80MHZ;
+                        else
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_LOUD,
+                                         "rtl8821ae_sc_mapping: Not Correct Primary40MHz Setting\n");
+                } else {
+                        if ((mac->cur_40_prime_sc ==
+                             HAL_PRIME_CHNL_OFFSET_LOWER) &&
+                            (mac->cur_80_prime_sc  ==
+                             HAL_PRIME_CHNL_OFFSET_LOWER))
+                                sc_setting_of_desc =
+                                        VHT_DATA_SC_20_LOWEST_OF_80MHZ;
+                        else if ((mac->cur_40_prime_sc ==
+                                  HAL_PRIME_CHNL_OFFSET_UPPER) &&
+                                 (mac->cur_80_prime_sc ==
+                                  HAL_PRIME_CHNL_OFFSET_LOWER))
+                                sc_setting_of_desc =
+                                        VHT_DATA_SC_20_LOWER_OF_80MHZ;
+                        else if ((mac->cur_40_prime_sc ==
+                                  HAL_PRIME_CHNL_OFFSET_LOWER) &&
+                                 (mac->cur_80_prime_sc ==
+                                  HAL_PRIME_CHNL_OFFSET_UPPER))
+                                sc_setting_of_desc =
+                                        VHT_DATA_SC_20_UPPER_OF_80MHZ;
+                        else if ((mac->cur_40_prime_sc ==
+                                  HAL_PRIME_CHNL_OFFSET_UPPER) &&
+                                 (mac->cur_80_prime_sc ==
+                                  HAL_PRIME_CHNL_OFFSET_UPPER))
+                                sc_setting_of_desc =
+                                        VHT_DATA_SC_20_UPPERST_OF_80MHZ;
+                        else
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_LOUD,
+                                         "rtl8821ae_sc_mapping: Not Correct Primary40MHz Setting\n");
+                }
+        } else if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
+                if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) {
+                        sc_setting_of_desc = VHT_DATA_SC_DONOT_CARE;
+                } else if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20) {
+                        if (mac->cur_40_prime_sc ==
+                                HAL_PRIME_CHNL_OFFSET_UPPER) {
+                                sc_setting_of_desc =
+                                        VHT_DATA_SC_20_UPPER_OF_80MHZ;
+                        } else if (mac->cur_40_prime_sc ==
+                                HAL_PRIME_CHNL_OFFSET_LOWER){
+                                sc_setting_of_desc =
+                                        VHT_DATA_SC_20_LOWER_OF_80MHZ;
+                        } else {
+                                sc_setting_of_desc = VHT_DATA_SC_DONOT_CARE;
+                        }
+                }
+        } else {
+                sc_setting_of_desc = VHT_DATA_SC_DONOT_CARE;
+        }
+
+        return sc_setting_of_desc;
+}
+
+void rtl8821ae_tx_fill_desc(struct ieee80211_hw *hw,
+                            struct ieee80211_hdr *hdr, u8 *pdesc_tx, u8 *txbd,
+                            struct ieee80211_tx_info *info,
+                            struct ieee80211_sta *sta,
+                            struct sk_buff *skb,
+                            u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        u8 *pdesc = (u8 *)pdesc_tx;
+        u16 seq_number;
+        __le16 fc = hdr->frame_control;
+        unsigned int buf_len = 0;
+        unsigned int skb_len = skb->len;
+        u8 fw_qsel = _rtl8821ae_map_hwqueue_to_fwqueue(skb, hw_queue);
+        bool firstseg = ((hdr->seq_ctrl &
+                          cpu_to_le16(IEEE80211_SCTL_FRAG)) == 0);
+        bool lastseg = ((hdr->frame_control &
+                         cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
+        dma_addr_t mapping;
+        u8 short_gi = 0;
+
+        seq_number = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
+        rtl_get_tcb_desc(hw, info, sta, skb, ptcb_desc);
+        /* reserve 8 byte for AMPDU early mode */
+        if (rtlhal->earlymode_enable) {
+                skb_push(skb, EM_HDR_LEN);
+                memset(skb->data, 0, EM_HDR_LEN);
+        }
+        buf_len = skb->len;
+        mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
+                                 PCI_DMA_TODEVICE);
+        if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "DMA mapping error");
+                return;
+        }
+        CLEAR_PCI_TX_DESC_CONTENT(pdesc, sizeof(struct tx_desc_8821ae));
+        if (ieee80211_is_nullfunc(fc) || ieee80211_is_ctl(fc)) {
+                firstseg = true;
+                lastseg = true;
+        }
+        if (firstseg) {
+                if (rtlhal->earlymode_enable) {
+                        SET_TX_DESC_PKT_OFFSET(pdesc, 1);
+                        SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN +
+                                           EM_HDR_LEN);
+                        if (ptcb_desc->empkt_num) {
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                                         "Insert 8 byte.pTcb->EMPktNum:%d\n",
+                                          ptcb_desc->empkt_num);
+                                _rtl8821ae_insert_emcontent(ptcb_desc,
+                                         (u8 *)(skb->data));
+                        }
+                } else {
+                        SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+                }
+
+                /* ptcb_desc->use_driver_rate = true; */
+                SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
+                if (ptcb_desc->hw_rate > DESC_RATEMCS0)
+                        short_gi = (ptcb_desc->use_shortgi) ? 1 : 0;
+                else
+                        short_gi = (ptcb_desc->use_shortpreamble) ? 1 : 0;
+
+                SET_TX_DESC_DATA_SHORTGI(pdesc, short_gi);
+
+                if (info->flags & IEEE80211_TX_CTL_AMPDU) {
+                        SET_TX_DESC_AGG_ENABLE(pdesc, 1);
+                        SET_TX_DESC_MAX_AGG_NUM(pdesc, 0x1f);
+                }
+                SET_TX_DESC_SEQ(pdesc, seq_number);
+                SET_TX_DESC_RTS_ENABLE(pdesc, ((ptcb_desc->rts_enable &&
+                                        !ptcb_desc->cts_enable) ? 1 : 0));
+                SET_TX_DESC_HW_RTS_ENABLE(pdesc, 0);
+                SET_TX_DESC_CTS2SELF(pdesc, ((ptcb_desc->cts_enable) ? 1 : 0));
+
+                SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
+                SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
+                SET_TX_DESC_RTS_SHORT(pdesc,
+                        ((ptcb_desc->rts_rate <= DESC_RATE54M) ?
+                        (ptcb_desc->rts_use_shortpreamble ? 1 : 0) :
+                        (ptcb_desc->rts_use_shortgi ? 1 : 0)));
+
+                if (ptcb_desc->tx_enable_sw_calc_duration)
+                        SET_TX_DESC_NAV_USE_HDR(pdesc, 1);
+
+                SET_TX_DESC_DATA_BW(pdesc,
+                        rtl8821ae_bw_mapping(hw, ptcb_desc));
+
+                SET_TX_DESC_TX_SUB_CARRIER(pdesc,
+                        rtl8821ae_sc_mapping(hw, ptcb_desc));
+
+                SET_TX_DESC_LINIP(pdesc, 0);
+                SET_TX_DESC_PKT_SIZE(pdesc, (u16)skb_len);
+                if (sta) {
+                        u8 ampdu_density = sta->ht_cap.ampdu_density;
+
+                        SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);
+                }
+                if (info->control.hw_key) {
+                        struct ieee80211_key_conf *keyconf =
+                                info->control.hw_key;
+                        switch (keyconf->cipher) {
+                        case WLAN_CIPHER_SUITE_WEP40:
+                        case WLAN_CIPHER_SUITE_WEP104:
+                        case WLAN_CIPHER_SUITE_TKIP:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
+                                break;
+                        case WLAN_CIPHER_SUITE_CCMP:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
+                                break;
+                        default:
+                                SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
+                                break;
+                        }
+                }
+
+                SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
+                SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
+                SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);
+                SET_TX_DESC_DISABLE_FB(pdesc, ptcb_desc->disable_ratefallback ?
+                                       1 : 0);
+                SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
+
+                if (ieee80211_is_data_qos(fc)) {
+                        if (mac->rdg_en) {
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                                         "Enable RDG function.\n");
+                                SET_TX_DESC_RDG_ENABLE(pdesc, 1);
+                                SET_TX_DESC_HTC(pdesc, 1);
+                        }
+                }
+        }
+
+        SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
+        SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
+        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)buf_len);
+        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+        /* if (rtlpriv->dm.useramask) { */
+        if (1) {
+                SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
+        } else {
+                SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcb_desc->ratr_index);
+                SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
+        }
+        if (!ieee80211_is_data_qos(fc))  {
+                SET_TX_DESC_HWSEQ_EN(pdesc, 1);
+                SET_TX_DESC_HWSEQ_SEL(pdesc, 0);
+        }
+        SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
+        if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||
+            is_broadcast_ether_addr(ieee80211_get_DA(hdr))) {
+                SET_TX_DESC_BMC(pdesc, 1);
+        }
+
+        rtl8821ae_dm_set_tx_ant_by_tx_info(hw, pdesc, ptcb_desc->mac_id);
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
+}
+
+void rtl8821ae_tx_fill_cmddesc(struct ieee80211_hw *hw,
+                               u8 *pdesc, bool firstseg,
+                               bool lastseg, struct sk_buff *skb)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        u8 fw_queue = QSLT_BEACON;
+
+        dma_addr_t mapping = pci_map_single(rtlpci->pdev,
+                                            skb->data, skb->len,
+                                            PCI_DMA_TODEVICE);
+
+        if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
+                         "DMA mapping error");
+                return;
+        }
+        CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE);
+
+        SET_TX_DESC_FIRST_SEG(pdesc, 1);
+        SET_TX_DESC_LAST_SEG(pdesc, 1);
+
+        SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
+
+        SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+
+        SET_TX_DESC_USE_RATE(pdesc, 1);
+        SET_TX_DESC_TX_RATE(pdesc, DESC_RATE1M);
+        SET_TX_DESC_DISABLE_FB(pdesc, 1);
+
+        SET_TX_DESC_DATA_BW(pdesc, 0);
+
+        SET_TX_DESC_HWSEQ_EN(pdesc, 1);
+
+        SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
+
+        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)(skb->len));
+
+        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+
+        SET_TX_DESC_MACID(pdesc, 0);
+
+        SET_TX_DESC_OWN(pdesc, 1);
+
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
+                      "H2C Tx Cmd Content\n",
+                      pdesc, TX_DESC_SIZE);
+}
+
+void rtl8821ae_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
+                        bool istx, u8 desc_name, u8 *val)
+{
+        if (istx) {
+                switch (desc_name) {
+                case HW_DESC_OWN:
+                        SET_TX_DESC_OWN(pdesc, 1);
+                        break;
+                case HW_DESC_TX_NEXTDESC_ADDR:
+                        SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *)val);
+                        break;
+                default:
+                        RT_ASSERT(false,
+                                  "ERR txdesc :%d not process\n", desc_name);
+                        break;
+                }
+        } else {
+                switch (desc_name) {
+                case HW_DESC_RXOWN:
+                        SET_RX_DESC_OWN(pdesc, 1);
+                        break;
+                case HW_DESC_RXBUFF_ADDR:
+                        SET_RX_DESC_BUFF_ADDR(pdesc, *(u32 *)val);
+                        break;
+                case HW_DESC_RXPKT_LEN:
+                        SET_RX_DESC_PKT_LEN(pdesc, *(u32 *)val);
+                        break;
+                case HW_DESC_RXERO:
+                        SET_RX_DESC_EOR(pdesc, 1);
+                        break;
+                default:
+                        RT_ASSERT(false,
+                                  "ERR rxdesc :%d not process\n", desc_name);
+                        break;
+                }
+        }
+}
+
+u32 rtl8821ae_get_desc(u8 *pdesc, bool istx, u8 desc_name)
+{
+        u32 ret = 0;
+
+        if (istx) {
+                switch (desc_name) {
+                case HW_DESC_OWN:
+                        ret = GET_TX_DESC_OWN(pdesc);
+                        break;
+                case HW_DESC_TXBUFF_ADDR:
+                        ret = GET_TX_DESC_TX_BUFFER_ADDRESS(pdesc);
+                        break;
+                default:
+                        RT_ASSERT(false,
+                                  "ERR txdesc :%d not process\n", desc_name);
+                        break;
+                }
+        } else {
+                switch (desc_name) {
+                case HW_DESC_OWN:
+                        ret = GET_RX_DESC_OWN(pdesc);
+                        break;
+                case HW_DESC_RXPKT_LEN:
+                        ret = GET_RX_DESC_PKT_LEN(pdesc);
+                        break;
+                case HW_DESC_RXBUFF_ADDR:
+                        ret = GET_RX_DESC_BUFF_ADDR(pdesc);
+                        break;
+                default:
+                        RT_ASSERT(false,
+                                  "ERR rxdesc :%d not process\n", desc_name);
+                        break;
+                }
+        }
+        return ret;
+}
+
+bool rtl8821ae_is_tx_desc_closed(struct ieee80211_hw *hw,
+                                 u8 hw_queue, u16 index)
+{
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue];
+        u8 *entry = (u8 *)(&ring->desc[ring->idx]);
+        u8 own = (u8)rtl8821ae_get_desc(entry, true, HW_DESC_OWN);
+
+        /**
+         *beacon packet will only use the first
+         *descriptor defautly,and the own may not
+         *be cleared by the hardware
+         */
+        if (own)
+                return false;
+        return true;
+}
+
+void rtl8821ae_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        if (hw_queue == BEACON_QUEUE) {
+                rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, BIT(4));
+        } else {
+                rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG,
+                               BIT(0) << (hw_queue));
+        }
+}
+
+u32 rtl8821ae_rx_command_packet(struct ieee80211_hw *hw,
+                                struct rtl_stats status,
+                                struct sk_buff *skb)
+{
+        u32 result = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+
+        switch (status.packet_report_type) {
+        case NORMAL_RX:
+                result = 0;
+                break;
+        case C2H_PACKET:
+                rtl8821ae_c2h_packet_handler(hw, skb->data, (u8)skb->len);
+                result = 1;
+                RT_TRACE(rtlpriv, COMP_RECV, DBG_LOUD,
+                         "skb->len=%d\n\n", skb->len);
+                break;
+        default:
+                RT_TRACE(rtlpriv, COMP_RECV, DBG_LOUD,
+                         "No this packet type!!\n");
+                break;
+        }
+
+        return result;
+}
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.h b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.h
new file mode 100644
index 000000000000..31409042d8dd
--- /dev/null
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.h
@@ -0,0 +1,620 @@
+/******************************************************************************
+ *
+ * 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>
+ *
+ *****************************************************************************/
+
+#ifndef __RTL8821AE_TRX_H__
+#define __RTL8821AE_TRX_H__
+
+#define TX_DESC_SIZE                                    40
+#define TX_DESC_AGGR_SUBFRAME_SIZE              32
+
+#define RX_DESC_SIZE                                    32
+#define RX_DRV_INFO_SIZE_UNIT                   8
+
+#define TX_DESC_NEXT_DESC_OFFSET                40
+#define USB_HWDESC_HEADER_LEN                   40
+#define CRCLENGTH                                               4
+
+#define SET_TX_DESC_PKT_SIZE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 0, 16, __val)
+#define SET_TX_DESC_OFFSET(__pdesc, __val)                      \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 16, 8, __val)
+#define SET_TX_DESC_BMC(__pdesc, __val)                         \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 24, 1, __val)
+#define SET_TX_DESC_HTC(__pdesc, __val)                         \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 25, 1, __val)
+#define SET_TX_DESC_LAST_SEG(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 26, 1, __val)
+#define SET_TX_DESC_FIRST_SEG(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val)
+#define SET_TX_DESC_LINIP(__pdesc, __val)                       \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val)
+#define SET_TX_DESC_NO_ACM(__pdesc, __val)                      \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 29, 1, __val)
+#define SET_TX_DESC_GF(__pdesc, __val)                          \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
+#define SET_TX_DESC_OWN(__pdesc, __val)                         \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
+
+#define GET_TX_DESC_PKT_SIZE(__pdesc)                           \
+        LE_BITS_TO_4BYTE(__pdesc, 0, 16)
+#define GET_TX_DESC_OFFSET(__pdesc)                                     \
+        LE_BITS_TO_4BYTE(__pdesc, 16, 8)
+#define GET_TX_DESC_BMC(__pdesc)                                        \
+        LE_BITS_TO_4BYTE(__pdesc, 24, 1)
+#define GET_TX_DESC_HTC(__pdesc)                                        \
+        LE_BITS_TO_4BYTE(__pdesc, 25, 1)
+#define GET_TX_DESC_LAST_SEG(__pdesc)                           \
+        LE_BITS_TO_4BYTE(__pdesc, 26, 1)
+#define GET_TX_DESC_FIRST_SEG(__pdesc)                          \
+        LE_BITS_TO_4BYTE(__pdesc, 27, 1)
+#define GET_TX_DESC_LINIP(__pdesc)                                      \
+        LE_BITS_TO_4BYTE(__pdesc, 28, 1)
+#define GET_TX_DESC_NO_ACM(__pdesc)                                     \
+        LE_BITS_TO_4BYTE(__pdesc, 29, 1)
+#define GET_TX_DESC_GF(__pdesc)                                         \
+        LE_BITS_TO_4BYTE(__pdesc, 30, 1)
+#define GET_TX_DESC_OWN(__pdesc)                                        \
+        LE_BITS_TO_4BYTE(__pdesc, 31, 1)
+
+#define SET_TX_DESC_MACID(__pdesc, __val)                       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 7, __val)
+#define SET_TX_DESC_QUEUE_SEL(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val)
+#define SET_TX_DESC_RDG_NAV_EXT(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 13, 1, __val)
+#define SET_TX_DESC_LSIG_TXOP_EN(__pdesc, __val)        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 14, 1, __val)
+#define SET_TX_DESC_PIFS(__pdesc, __val)                        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 15, 1, __val)
+#define SET_TX_DESC_RATE_ID(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 5, __val)
+#define SET_TX_DESC_EN_DESC_ID(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 21, 1, __val)
+#define SET_TX_DESC_SEC_TYPE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 22, 2, __val)
+#define SET_TX_DESC_PKT_OFFSET(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+4, 24, 5, __val)
+
+#define SET_TX_DESC_PAID(__pdesc, __val)                        \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 0, 9, __val)
+#define SET_TX_DESC_CCA_RTS(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 10, 2, __val)
+#define SET_TX_DESC_AGG_ENABLE(__pdesc, __val)  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 12, 1, __val)
+#define SET_TX_DESC_RDG_ENABLE(__pdesc, __val)  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 13, 1, __val)
+#define SET_TX_DESC_BAR_RTY_TH(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 14, 2, __val)
+#define SET_TX_DESC_AGG_BREAK(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 16, 1, __val)
+#define SET_TX_DESC_MORE_FRAG(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 17, 1, __val)
+#define SET_TX_DESC_RAW(__pdesc, __val)                         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 18, 1, __val)
+#define SET_TX_DESC_SPE_RPT(__pdesc, __val)                     \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 19, 1, __val)
+#define SET_TX_DESC_AMPDU_DENSITY(__pdesc, __val)       \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 20, 3, __val)
+#define SET_TX_DESC_BT_INT(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 23, 1, __val)
+#define SET_TX_DESC_GID(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+8, 24, 6, __val)
+
+#define SET_TX_DESC_WHEADER_LEN(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 0, 4, __val)
+#define SET_TX_DESC_CHK_EN(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 4, 1, __val)
+#define SET_TX_DESC_EARLY_MODE(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 5, 1, __val)
+#define SET_TX_DESC_HWSEQ_SEL(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 6, 2, __val)
+#define SET_TX_DESC_USE_RATE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 8, 1, __val)
+#define SET_TX_DESC_DISABLE_RTS_FB(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 9, 1, __val)
+#define SET_TX_DESC_DISABLE_FB(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 10, 1, __val)
+#define SET_TX_DESC_CTS2SELF(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 11, 1, __val)
+#define SET_TX_DESC_RTS_ENABLE(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 12, 1, __val)
+#define SET_TX_DESC_HW_RTS_ENABLE(__pdesc, __val)               \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 13, 1, __val)
+#define SET_TX_DESC_NAV_USE_HDR(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 15, 1, __val)
+#define SET_TX_DESC_USE_MAX_LEN(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 16, 1, __val)
+#define SET_TX_DESC_MAX_AGG_NUM(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 17, 5, __val)
+#define SET_TX_DESC_NDPA(__pdesc, __val)                \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 22, 2, __val)
+#define SET_TX_DESC_AMPDU_MAX_TIME(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+12, 24, 8, __val)
+#define SET_TX_DESC_TX_ANT(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 24, 4, __val)
+
+#define SET_TX_DESC_TX_RATE(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 7, __val)
+#define SET_TX_DESC_DATA_RATE_FB_LIMIT(__pdesc, __val)          \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 8, 5, __val)
+#define SET_TX_DESC_RTS_RATE_FB_LIMIT(__pdesc, __val)           \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 13, 4, __val)
+#define SET_TX_DESC_RETRY_LIMIT_ENABLE(__pdesc, __val)                  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 17, 1, __val)
+#define SET_TX_DESC_DATA_RETRY_LIMIT(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 18, 6, __val)
+#define SET_TX_DESC_RTS_RATE(__pdesc, __val)            \
+        SET_BITS_TO_LE_4BYTE(__pdesc+16, 24, 5, __val)
+
+#define SET_TX_DESC_TX_SUB_CARRIER(__pdesc, __val)              \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 4, __val)
+#define SET_TX_DESC_DATA_SHORTGI(__pdesc, __val)        \
+        SET_BITS_TO_LE_1BYTE(__pdesc+20, 4, 1, __val)
+#define SET_TX_DESC_DATA_BW(__pdesc, __val)             \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 5, 2, __val)
+#define SET_TX_DESC_DATA_LDPC(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 7, 1, __val)
+#define SET_TX_DESC_DATA_STBC(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 8, 2, __val)
+#define SET_TX_DESC_CTROL_STBC(__pdesc, __val)  \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 10, 2, __val)
+#define SET_TX_DESC_RTS_SHORT(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 12, 1, __val)
+#define SET_TX_DESC_RTS_SC(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val)
+
+#define SET_TX_DESC_TX_BUFFER_SIZE(__pdesc, __val)      \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val)
+
+#define GET_TX_DESC_TX_BUFFER_SIZE(__pdesc)             \
+        LE_BITS_TO_4BYTE(__pdesc+28, 0, 16)
+
+#define SET_TX_DESC_HWSEQ_EN(__pdesc, __val)    \
+        SET_BITS_TO_LE_4BYTE(__pdesc+32, 15, 1, __val)
+
+#define SET_TX_DESC_SEQ(__pdesc, __val)         \
+        SET_BITS_TO_LE_4BYTE(__pdesc+36, 12, 12, __val)
+
+#define SET_TX_DESC_TX_BUFFER_ADDRESS(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+40, 0, 32, __val)
+
+#define GET_TX_DESC_TX_BUFFER_ADDRESS(__pdesc)          \
+        LE_BITS_TO_4BYTE(__pdesc+40, 0, 32)
+
+#define SET_TX_DESC_NEXT_DESC_ADDRESS(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+48, 0, 32, __val)
+
+#define GET_TX_DESC_NEXT_DESC_ADDRESS(__pdesc)          \
+        LE_BITS_TO_4BYTE(__pdesc+48, 0, 32)
+
+#define GET_RX_DESC_PKT_LEN(__pdesc)                    \
+        LE_BITS_TO_4BYTE(__pdesc, 0, 14)
+#define GET_RX_DESC_CRC32(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc, 14, 1)
+#define GET_RX_DESC_ICV(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc, 15, 1)
+#define GET_RX_DESC_DRV_INFO_SIZE(__pdesc)              \
+        LE_BITS_TO_4BYTE(__pdesc, 16, 4)
+#define GET_RX_DESC_SECURITY(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc, 20, 3)
+#define GET_RX_DESC_QOS(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc, 23, 1)
+#define GET_RX_DESC_SHIFT(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc, 24, 2)
+#define GET_RX_DESC_PHYST(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc, 26, 1)
+#define GET_RX_DESC_SWDEC(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc, 27, 1)
+#define GET_RX_DESC_LS(__pdesc)                                 \
+        LE_BITS_TO_4BYTE(__pdesc, 28, 1)
+#define GET_RX_DESC_FS(__pdesc)                                 \
+        LE_BITS_TO_4BYTE(__pdesc, 29, 1)
+#define GET_RX_DESC_EOR(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc, 30, 1)
+#define GET_RX_DESC_OWN(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc, 31, 1)
+
+#define SET_RX_DESC_PKT_LEN(__pdesc, __val)     \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 0, 14, __val)
+#define SET_RX_DESC_EOR(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)
+#define SET_RX_DESC_OWN(__pdesc, __val)                 \
+        SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val)
+
+#define GET_RX_DESC_MACID(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc+4, 0, 7)
+#define GET_RX_DESC_TID(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+4, 8, 4)
+#define GET_RX_DESC_AMSDU(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc+4, 13, 1)
+#define GET_RX_STATUS_DESC_RXID_MATCH(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
+#define GET_RX_DESC_PAGGR(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc+4, 15, 1)
+#define GET_RX_DESC_A1_FIT(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+4, 16, 4)
+#define GET_RX_DESC_CHKERR(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+4, 20, 1)
+#define GET_RX_DESC_IPVER(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc+4, 21, 1)
+#define GET_RX_STATUS_DESC_IS_TCPUDP(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc+4, 22, 1)
+#define GET_RX_STATUS_DESC_CHK_VLD(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+4, 23, 1)
+#define GET_RX_DESC_PAM(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+4, 24, 1)
+#define GET_RX_DESC_PWR(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+4, 25, 1)
+#define GET_RX_DESC_MD(__pdesc)                                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 26, 1)
+#define GET_RX_DESC_MF(__pdesc)                                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 27, 1)
+#define GET_RX_DESC_TYPE(__pdesc)                               \
+        LE_BITS_TO_4BYTE(__pdesc+4, 28, 2)
+#define GET_RX_DESC_MC(__pdesc)                                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 30, 1)
+#define GET_RX_DESC_BC(__pdesc)                                 \
+        LE_BITS_TO_4BYTE(__pdesc+4, 31, 1)
+
+#define GET_RX_DESC_SEQ(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+8, 0, 12)
+#define GET_RX_DESC_FRAG(__pdesc)                               \
+        LE_BITS_TO_4BYTE(__pdesc+8, 12, 4)
+#define GET_RX_STATUS_DESC_RX_IS_QOS(__pdesc)                   \
+        LE_BITS_TO_4BYTE(__pdesc+8, 16, 1)
+#define GET_RX_STATUS_DESC_WLANHD_IV_LEN(__pdesc)               \
+        LE_BITS_TO_4BYTE(__pdesc+8, 18, 6)
+#define GET_RX_STATUS_DESC_RPT_SEL(__pdesc)                     \
+        LE_BITS_TO_4BYTE(__pdesc+8, 28, 1)
+
+#define GET_RX_DESC_RXMCS(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc+12, 0, 7)
+#define GET_RX_DESC_HTC(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+12, 10, 1)
+#define GET_RX_STATUS_DESC_EOSP(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+12, 11, 1)
+#define GET_RX_STATUS_DESC_BSSID_FIT(__pdesc)           \
+        LE_BITS_TO_4BYTE(__pdesc+12, 12, 2)
+
+#define GET_RX_STATUS_DESC_PATTERN_MATCH(__pdesc)       \
+        LE_BITS_TO_4BYTE(__pdesc+12, 29, 1)
+#define GET_RX_STATUS_DESC_UNICAST_MATCH(__pdesc)       \
+        LE_BITS_TO_4BYTE(__pdesc+12, 30, 1)
+#define GET_RX_STATUS_DESC_MAGIC_MATCH(__pdesc) \
+        LE_BITS_TO_4BYTE(__pdesc+12, 31, 1)
+
+#define GET_RX_DESC_SPLCP(__pdesc)                              \
+        LE_BITS_TO_4BYTE(__pdesc+16, 0, 1)
+#define GET_RX_STATUS_DESC_LDPC(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+16, 1, 1)
+#define GET_RX_STATUS_DESC_STBC(__pdesc)                                \
+        LE_BITS_TO_4BYTE(__pdesc+16, 2, 1)
+#define GET_RX_DESC_BW(__pdesc)                                 \
+        LE_BITS_TO_4BYTE(__pdesc+16, 4, 2)
+
+#define GET_RX_DESC_TSFL(__pdesc)                               \
+        LE_BITS_TO_4BYTE(__pdesc+20, 0, 32)
+
+#define GET_RX_DESC_BUFF_ADDR(__pdesc)                  \
+        LE_BITS_TO_4BYTE(__pdesc+24, 0, 32)
+#define GET_RX_DESC_BUFF_ADDR64(__pdesc)                \
+        LE_BITS_TO_4BYTE(__pdesc+28, 0, 32)
+
+#define SET_RX_DESC_BUFF_ADDR(__pdesc, __val)   \
+        SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val)
+#define SET_RX_DESC_BUFF_ADDR64(__pdesc, __val) \
+        SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 32, __val)
+
+/* TX report 2 format in Rx desc*/
+
+#define GET_RX_RPT2_DESC_PKT_LEN(__status)      \
+        LE_BITS_TO_4BYTE(__status, 0, 9)
+#define GET_RX_RPT2_DESC_MACID_VALID_1(__status)        \
+        LE_BITS_TO_4BYTE(__status+16, 0, 32)
+#define GET_RX_RPT2_DESC_MACID_VALID_2(__status)        \
+        LE_BITS_TO_4BYTE(__status+20, 0, 32)
+
+#define SET_EARLYMODE_PKTNUM(__paddr, __value)  \
+        SET_BITS_TO_LE_4BYTE(__paddr, 0, 4, __value)
+#define SET_EARLYMODE_LEN0(__paddr, __value)    \
+        SET_BITS_TO_LE_4BYTE(__paddr, 4, 12, __value)
+#define SET_EARLYMODE_LEN1(__paddr, __value)    \
+        SET_BITS_TO_LE_4BYTE(__paddr, 16, 12, __value)
+#define SET_EARLYMODE_LEN2_1(__paddr, __value)  \
+        SET_BITS_TO_LE_4BYTE(__paddr, 28, 4, __value)
+#define SET_EARLYMODE_LEN2_2(__paddr, __value)  \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 0, 8, __value)
+#define SET_EARLYMODE_LEN3(__paddr, __value)    \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 8, 12, __value)
+#define SET_EARLYMODE_LEN4(__paddr, __value)    \
+        SET_BITS_TO_LE_4BYTE(__paddr+4, 20, 12, __value)
+
+#define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)               \
+do {                                                            \
+        if (_size > TX_DESC_NEXT_DESC_OFFSET)                   \
+                memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
+        else                                                    \
+                memset(__pdesc, 0, _size);                      \
+} while (0)
+
+#define RTL8821AE_RX_HAL_IS_CCK_RATE(rxmcs)\
+        (rxmcs == DESC_RATE1M ||\
+         rxmcs == DESC_RATE2M ||\
+         rxmcs == DESC_RATE5_5M ||\
+         rxmcs == DESC_RATE11M)
+
+struct phy_rx_agc_info_t {
+        #ifdef __LITTLE_ENDIAN
+                u8      gain:7, trsw:1;
+        #else
+                u8      trsw:1, gain:7;
+        #endif
+};
+
+struct phy_status_rpt {
+        /* DWORD 0 */
+        u8 gain_trsw[2];
+#ifdef __LITTLE_ENDIAN
+        u16 chl_num:10;
+        u16 sub_chnl:4;
+        u16 r_rfmod:2;
+#else   /* _BIG_ENDIAN_ */
+        u16 r_rfmod:2;
+        u16 sub_chnl:4;
+        u16 chl_num:10;
+#endif
+        /* DWORD 1 */
+        u8 pwdb_all;
+        u8 cfosho[4];   /* DW 1 byte 1 DW 2 byte 0 */
+
+        /* DWORD 2 */
+        char cfotail[4];        /* DW 2 byte 1 DW 3 byte 0 */
+
+        /* DWORD 3 */
+        char rxevm[2];  /* DW 3 byte 1 DW 3 byte 2 */
+        char rxsnr[2];  /* DW 3 byte 3 DW 4 byte 0 */
+
+        /* DWORD 4 */
+        u8 pcts_msk_rpt[2];
+        u8 pdsnr[2];    /* DW 4 byte 3 DW 5 Byte 0 */
+
+        /* DWORD 5 */
+        u8 csi_current[2];
+        u8 rx_gain_c;
+
+        /* DWORD 6 */
+        u8 rx_gain_d;
+        u8 sigevm;
+        u8 resvd_0;
+        u8 antidx_anta:3;
+        u8 antidx_antb:3;
+        u8 resvd_1:2;
+} __packed;
+
+struct rx_fwinfo_8821ae {
+        u8 gain_trsw[4];
+        u8 pwdb_all;
+        u8 cfosho[4];
+        u8 cfotail[4];
+        char rxevm[2];
+        char rxsnr[4];
+        u8 pdsnr[2];
+        u8 csi_current[2];
+        u8 csi_target[2];
+        u8 sigevm;
+        u8 max_ex_pwr;
+        u8 ex_intf_flag:1;
+        u8 sgi_en:1;
+        u8 rxsc:2;
+        u8 reserve:4;
+} __packed;
+
+struct tx_desc_8821ae {
+        u32 pktsize:16;
+        u32 offset:8;
+        u32 bmc:1;
+        u32 htc:1;
+        u32 lastseg:1;
+        u32 firstseg:1;
+        u32 linip:1;
+        u32 noacm:1;
+        u32 gf:1;
+        u32 own:1;
+
+        u32 macid:6;
+        u32 rsvd0:2;
+        u32 queuesel:5;
+        u32 rd_nav_ext:1;
+        u32 lsig_txop_en:1;
+        u32 pifs:1;
+        u32 rateid:4;
+        u32 nav_usehdr:1;
+        u32 en_descid:1;
+        u32 sectype:2;
+        u32 pktoffset:8;
+
+        u32 rts_rc:6;
+        u32 data_rc:6;
+        u32 agg_en:1;
+        u32 rdg_en:1;
+        u32 bar_retryht:2;
+        u32 agg_break:1;
+        u32 morefrag:1;
+        u32 raw:1;
+        u32 ccx:1;
+        u32 ampdudensity:3;
+        u32 bt_int:1;
+        u32 ant_sela:1;
+        u32 ant_selb:1;
+        u32 txant_cck:2;
+        u32 txant_l:2;
+        u32 txant_ht:2;
+
+        u32 nextheadpage:8;
+        u32 tailpage:8;
+        u32 seq:12;
+        u32 cpu_handle:1;
+        u32 tag1:1;
+        u32 trigger_int:1;
+        u32 hwseq_en:1;
+
+        u32 rtsrate:5;
+        u32 apdcfe:1;
+        u32 qos:1;
+        u32 hwseq_ssn:1;
+        u32 userrate:1;
+        u32 dis_rtsfb:1;
+        u32 dis_datafb:1;
+        u32 cts2self:1;
+        u32 rts_en:1;
+        u32 hwrts_en:1;
+        u32 portid:1;
+        u32 pwr_status:3;
+        u32 waitdcts:1;
+        u32 cts2ap_en:1;
+        u32 txsc:2;
+        u32 stbc:2;
+        u32 txshort:1;
+        u32 txbw:1;
+        u32 rtsshort:1;
+        u32 rtsbw:1;
+        u32 rtssc:2;
+        u32 rtsstbc:2;
+
+        u32 txrate:6;
+        u32 shortgi:1;
+        u32 ccxt:1;
+        u32 txrate_fb_lmt:5;
+        u32 rtsrate_fb_lmt:4;
+        u32 retrylmt_en:1;
+        u32 txretrylmt:6;
+        u32 usb_txaggnum:8;
+
+        u32 txagca:5;
+        u32 txagcb:5;
+        u32 usemaxlen:1;
+        u32 maxaggnum:5;
+        u32 mcsg1maxlen:4;
+        u32 mcsg2maxlen:4;
+        u32 mcsg3maxlen:4;
+        u32 mcs7sgimaxlen:4;
+
+        u32 txbuffersize:16;
+        u32 sw_offset30:8;
+        u32 sw_offset31:4;
+        u32 rsvd1:1;
+        u32 antsel_c:1;
+        u32 null_0:1;
+        u32 null_1:1;
+
+        u32 txbuffaddr;
+        u32 txbufferaddr64;
+        u32 nextdescaddress;
+        u32 nextdescaddress64;
+
+        u32 reserve_pass_pcie_mm_limit[4];
+} __packed;
+
+struct rx_desc_8821ae {
+        u32 length:14;
+        u32 crc32:1;
+        u32 icverror:1;
+        u32 drv_infosize:4;
+        u32 security:3;
+        u32 qos:1;
+        u32 shift:2;
+        u32 phystatus:1;
+        u32 swdec:1;
+        u32 lastseg:1;
+        u32 firstseg:1;
+        u32 eor:1;
+        u32 own:1;
+
+        u32 macid:6;
+        u32 tid:4;
+        u32 hwrsvd:5;
+        u32 paggr:1;
+        u32 faggr:1;
+        u32 a1_fit:4;
+        u32 a2_fit:4;
+        u32 pam:1;
+        u32 pwr:1;
+        u32 moredata:1;
+        u32 morefrag:1;
+        u32 type:2;
+        u32 mc:1;
+        u32 bc:1;
+
+        u32 seq:12;
+        u32 frag:4;
+        u32 nextpktlen:14;
+        u32 nextind:1;
+        u32 rsvd:1;
+
+        u32 rxmcs:6;
+        u32 rxht:1;
+        u32 amsdu:1;
+        u32 splcp:1;
+        u32 bandwidth:1;
+        u32 htc:1;
+        u32 tcpchk_rpt:1;
+        u32 ipcchk_rpt:1;
+        u32 tcpchk_valid:1;
+        u32 hwpcerr:1;
+        u32 hwpcind:1;
+        u32 iv0:16;
+
+        u32 iv1;
+
+        u32 tsfl;
+
+        u32 bufferaddress;
+        u32 bufferaddress64;
+
+} __packed;
+
+void rtl8821ae_tx_fill_desc(struct ieee80211_hw *hw,
+                            struct ieee80211_hdr *hdr, u8 *pdesc_tx, u8 *txbd,
+                            struct ieee80211_tx_info *info,
+                            struct ieee80211_sta *sta,
+                            struct sk_buff *skb,
+                            u8 hw_queue, struct rtl_tcb_desc *ptcb_desc);
+bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw,
+                             struct rtl_stats *status,
+                             struct ieee80211_rx_status *rx_status,
+                             u8 *pdesc, struct sk_buff *skb);
+void rtl8821ae_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
+                        bool istx, u8 desc_name, u8 *val);
+u32 rtl8821ae_get_desc(u8 *pdesc, bool istx, u8 desc_name);
+bool rtl8821ae_is_tx_desc_closed(struct ieee80211_hw *hw,
+                                 u8 hw_queue, u16 index);
+void rtl8821ae_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
+void rtl8821ae_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
+                               bool firstseg, bool lastseg,
+                               struct sk_buff *skb);
+u32 rtl8821ae_rx_command_packet(struct ieee80211_hw *hw,
+                                struct rtl_stats status,
+                                struct sk_buff *skb);
+#endif
diff --git a/drivers/net/wireless/rtlwifi/stats.c b/drivers/net/wireless/rtlwifi/stats.c
index 4f083fc1d360..2d0736a09fc0 100644
--- a/drivers/net/wireless/rtlwifi/stats.c
+++ b/drivers/net/wireless/rtlwifi/stats.c
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -59,8 +55,23 @@ u8 rtl_evm_db_to_percentage(char value)
 }
 EXPORT_SYMBOL(rtl_evm_db_to_percentage);
 
+u8 rtl_evm_dbm_jaguar(char value)
+{
+        char ret_val = value;
+
+        /* -33dB~0dB to 33dB ~ 0dB*/
+        if (ret_val == -128)
+                ret_val = 127;
+        else if (ret_val < 0)
+                ret_val = 0 - ret_val;
+
+        ret_val  = ret_val >> 1;
+        return ret_val;
+}
+EXPORT_SYMBOL(rtl_evm_dbm_jaguar);
+
 static long rtl_translate_todbm(struct ieee80211_hw *hw,
-                                u8 signal_strength_index)
+                         u8 signal_strength_index)
 {
         long signal_power;
 
@@ -106,6 +117,10 @@ static void rtl_process_ui_rssi(struct ieee80211_hw *hw,
         u8 rfpath;
         u32 last_rssi, tmpval;
 
+        if (!pstatus->packet_toself && !pstatus->packet_beacon)
+                return;
+
+        rtlpriv->stats.pwdb_all_cnt += pstatus->rx_pwdb_all;
         rtlpriv->stats.rssi_calculate_cnt++;
 
         if (rtlpriv->stats.ui_rssi.total_num++ >= PHY_RSSI_SLID_WIN_MAX) {
@@ -151,6 +166,12 @@ static void rtl_process_ui_rssi(struct ieee80211_hw *hw,
                              (pstatus->rx_mimo_signalstrength[rfpath])) /
                             (RX_SMOOTH_FACTOR);
                 }
+                rtlpriv->stats.rx_snr_db[rfpath] = pstatus->rx_snr[rfpath];
+                rtlpriv->stats.rx_evm_dbm[rfpath] =
+                                        pstatus->rx_mimo_evm_dbm[rfpath];
+                rtlpriv->stats.rx_cfo_short[rfpath] =
+                                        pstatus->cfo_short[rfpath];
+                rtlpriv->stats.rx_cfo_tail[rfpath] = pstatus->cfo_tail[rfpath];
         }
 }
 
@@ -176,7 +197,6 @@ static void rtl_process_pwdb(struct ieee80211_hw *hw, struct rtl_stats *pstatus)
         struct rtl_sta_info *drv_priv = NULL;
         struct ieee80211_sta *sta = NULL;
         long undec_sm_pwdb;
-        long undec_sm_cck;
 
         rcu_read_lock();
         if (rtlpriv->mac80211.opmode != NL80211_IFTYPE_STATION)
@@ -186,33 +206,21 @@ static void rtl_process_pwdb(struct ieee80211_hw *hw, struct rtl_stats *pstatus)
         if (sta) {
                 drv_priv = (struct rtl_sta_info *) sta->drv_priv;
                 undec_sm_pwdb = drv_priv->rssi_stat.undec_sm_pwdb;
-                undec_sm_cck = drv_priv->rssi_stat.undec_sm_cck;
         } else {
                 undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;
-                undec_sm_cck = rtlpriv->dm.undec_sm_cck;
         }
 
         if (undec_sm_pwdb < 0)
                 undec_sm_pwdb = pstatus->rx_pwdb_all;
-        if (undec_sm_cck < 0)
-                undec_sm_cck = pstatus->rx_pwdb_all;
         if (pstatus->rx_pwdb_all > (u32) undec_sm_pwdb) {
                 undec_sm_pwdb = (((undec_sm_pwdb) *
                       (RX_SMOOTH_FACTOR - 1)) +
                      (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
                 undec_sm_pwdb = undec_sm_pwdb + 1;
         } else {
-                undec_sm_pwdb = (((undec_sm_pwdb) * (RX_SMOOTH_FACTOR - 1)) +
-                     (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
-        }
-        if (pstatus->rx_pwdb_all > (u32) undec_sm_cck) {
-                undec_sm_cck = (((undec_sm_pwdb) *
+                undec_sm_pwdb = (((undec_sm_pwdb) *
                       (RX_SMOOTH_FACTOR - 1)) +
                      (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
-                undec_sm_cck = undec_sm_cck + 1;
-        } else {
-                undec_sm_pwdb = (((undec_sm_cck) * (RX_SMOOTH_FACTOR - 1)) +
-                     (pstatus->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
         }
 
         if (sta) {
@@ -245,7 +253,7 @@ static void rtl_process_ui_link_quality(struct ieee80211_hw *hw,
         rtlpriv->stats.ui_link_quality.total_val += pstatus->signalquality;
         rtlpriv->stats.ui_link_quality.elements[
                 rtlpriv->stats.ui_link_quality.index++] =
-                                                 pstatus->signalquality;
+                                                        pstatus->signalquality;
         if (rtlpriv->stats.ui_link_quality.index >=
             PHY_LINKQUALITY_SLID_WIN_MAX)
                 rtlpriv->stats.ui_link_quality.index = 0;
@@ -269,7 +277,7 @@ static void rtl_process_ui_link_quality(struct ieee80211_hw *hw,
 }
 
 void rtl_process_phyinfo(struct ieee80211_hw *hw, u8 *buffer,
-        struct rtl_stats *pstatus)
+                         struct rtl_stats *pstatus)
 {
 
         if (!pstatus->packet_matchbssid)
diff --git a/drivers/net/wireless/rtlwifi/stats.h b/drivers/net/wireless/rtlwifi/stats.h
index 0dbdc5203830..aa4eec80ccf7 100644
--- a/drivers/net/wireless/rtlwifi/stats.h
+++ b/drivers/net/wireless/rtlwifi/stats.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -39,8 +35,9 @@
 
 u8 rtl_query_rxpwrpercentage(char antpower);
 u8 rtl_evm_db_to_percentage(char value);
+u8 rtl_evm_dbm_jaguar(char value);
 long rtl_signal_scale_mapping(struct ieee80211_hw *hw, long currsig);
 void rtl_process_phyinfo(struct ieee80211_hw *hw, u8 *buffer,
-        struct rtl_stats *pstatus);
+                         struct rtl_stats *pstatus);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index 0398d3ea15b0..10cf69c4bc42 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -75,11 +75,11 @@ static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,
         pipe = usb_sndctrlpipe(udev, 0); /* write_out */
         reqtype =  REALTEK_USB_VENQT_WRITE;
 
-        dr = kmalloc(sizeof(*dr), GFP_ATOMIC);
+        dr = kzalloc(sizeof(*dr), GFP_ATOMIC);
         if (!dr)
                 return -ENOMEM;
 
-        databuf = kmalloc(databuf_maxlen, GFP_ATOMIC);
+        databuf = kzalloc(databuf_maxlen, GFP_ATOMIC);
         if (!databuf) {
                 kfree(dr);
                 return -ENOMEM;
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 541b077ae867..976667ae8549 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -147,7 +143,27 @@
 #define FCS_LEN                         4
 #define EM_HDR_LEN                      8
 
+enum rtl8192c_h2c_cmd {
+        H2C_AP_OFFLOAD = 0,
+        H2C_SETPWRMODE = 1,
+        H2C_JOINBSSRPT = 2,
+        H2C_RSVDPAGE = 3,
+        H2C_RSSI_REPORT = 5,
+        H2C_RA_MASK = 6,
+        H2C_MACID_PS_MODE = 7,
+        H2C_P2P_PS_OFFLOAD = 8,
+        H2C_MAC_MODE_SEL = 9,
+        H2C_PWRM = 15,
+        H2C_P2P_PS_CTW_CMD = 24,
+        MAX_H2CCMD
+};
+
 #define MAX_TX_COUNT                    4
+#define MAX_REGULATION_NUM              4
+#define MAX_RF_PATH_NUM                 4
+#define MAX_RATE_SECTION_NUM            6
+#define MAX_2_4G_BANDWITH_NUM           4
+#define MAX_5G_BANDWITH_NUM             4
 #define MAX_RF_PATH                     4
 #define MAX_CHNL_GROUP_24G              6
 #define MAX_CHNL_GROUP_5G               14
@@ -163,6 +179,12 @@
 #define DEL_SW_IDX_SZ           30
 #define BAND_NUM                        3
 
+/* For now, it's just for 8192ee
+ * but not OK yet, keep it 0
+ */
+#define DMA_IS_64BIT 0
+#define RTL8192EE_SEG_NUM               1 /* 0:2 seg, 1: 4 seg, 2: 8 seg */
+
 enum rf_tx_num {
         RF_1TX = 0,
         RF_2TX,
@@ -175,6 +197,31 @@ enum rf_tx_num {
 #define PACKET_ARP                      2
 #define PACKET_EAPOL                    3
 
+#define MAX_SUPPORT_WOL_PATTERN_NUM     16
+#define RSVD_WOL_PATTERN_NUM            1
+#define WKFMCAM_ADDR_NUM                6
+#define WKFMCAM_SIZE                    24
+
+#define MAX_WOL_BIT_MASK_SIZE           16
+/* MIN LEN keeps 13 here */
+#define MIN_WOL_PATTERN_SIZE            13
+#define MAX_WOL_PATTERN_SIZE            128
+
+#define WAKE_ON_MAGIC_PACKET            BIT(0)
+#define WAKE_ON_PATTERN_MATCH           BIT(1)
+
+#define WOL_REASON_PTK_UPDATE           BIT(0)
+#define WOL_REASON_GTK_UPDATE           BIT(1)
+#define WOL_REASON_DISASSOC             BIT(2)
+#define WOL_REASON_DEAUTH               BIT(3)
+#define WOL_REASON_AP_LOST              BIT(4)
+#define WOL_REASON_MAGIC_PKT            BIT(5)
+#define WOL_REASON_UNICAST_PKT          BIT(6)
+#define WOL_REASON_PATTERN_PKT          BIT(7)
+#define WOL_REASON_RTD3_SSID_MATCH      BIT(8)
+#define WOL_REASON_REALWOW_V2_WAKEUPPKT BIT(9)
+#define WOL_REASON_REALWOW_V2_ACKLOST   BIT(10)
+
 struct txpower_info_2g {
         u8 index_cck_base[MAX_RF_PATH][MAX_CHNL_GROUP_24G];
         u8 index_bw40_base[MAX_RF_PATH][MAX_CHNL_GROUP_24G];
@@ -218,6 +265,15 @@ enum radio_path {
         RF90_PATH_D = 3,
 };
 
+enum regulation_txpwr_lmt {
+        TXPWR_LMT_FCC = 0,
+        TXPWR_LMT_MKK = 1,
+        TXPWR_LMT_ETSI = 2,
+        TXPWR_LMT_WW = 3,
+
+        TXPWR_LMT_MAX_REGULATION_NUM = 4
+};
+
 enum rt_eeprom_type {
         EEPROM_93C46,
         EEPROM_93C56,
@@ -274,13 +330,7 @@ enum hardware_type {
 #define IS_HARDWARE_TYPE_8723(rtlhal)                   \
 (IS_HARDWARE_TYPE_8723E(rtlhal) || IS_HARDWARE_TYPE_8723U(rtlhal))
 
-#define RX_HAL_IS_CCK_RATE(_pdesc)\
-        (_pdesc->rxmcs == DESC92_RATE1M ||              \
-         _pdesc->rxmcs == DESC92_RATE2M ||              \
-         _pdesc->rxmcs == DESC92_RATE5_5M ||            \
-         _pdesc->rxmcs == DESC92_RATE11M)
-
-#define RTL8723E_RX_HAL_IS_CCK_RATE(rxmcs)              \
+#define RX_HAL_IS_CCK_RATE(rxmcs)                       \
         ((rxmcs) == DESC92_RATE1M ||                    \
          (rxmcs) == DESC92_RATE2M ||                    \
          (rxmcs) == DESC92_RATE5_5M ||                  \
@@ -345,6 +395,7 @@ enum hw_variables {
         HW_VAR_DEFAULTKEY2,
         HW_VAR_DEFAULTKEY3,
         HW_VAR_SIFS,
+        HW_VAR_R2T_SIFS,
         HW_VAR_DIFS,
         HW_VAR_EIFS,
         HW_VAR_SLOT_TIME,
@@ -396,6 +447,7 @@ enum hw_variables {
         HW_VAR_H2C_FW_MEDIASTATUSRPT,
         HW_VAR_H2C_FW_P2P_PS_OFFLOAD,
         HW_VAR_FW_PSMODE_STATUS,
+        HW_VAR_INIT_RTS_RATE,
         HW_VAR_RESUME_CLK_ON,
         HW_VAR_FW_LPS_ACTION,
         HW_VAR_1X1_RECV_COMBINE,
@@ -636,6 +688,7 @@ enum rtl_var_map {
         RTL_IMR_VIDOK,          /*AC_VI DMA OK Interrupt */
         RTL_IMR_VODOK,          /*AC_VO DMA Interrupt */
         RTL_IMR_ROK,            /*Receive DMA OK Interrupt */
+        RTL_IMR_HSISR_IND,      /*HSISR Interrupt*/
         RTL_IBSS_INT_MASKS,     /*(RTL_IMR_BCNINT | RTL_IMR_TBDOK |
                                  * RTL_IMR_TBDER) */
         RTL_IMR_C2HCMD,         /*fw interrupt*/
@@ -659,6 +712,13 @@ enum rtl_var_map {
         RTL_RC_HT_RATEMCS7,
         RTL_RC_HT_RATEMCS15,
 
+        RTL_RC_VHT_RATE_1SS_MCS7,
+        RTL_RC_VHT_RATE_1SS_MCS8,
+        RTL_RC_VHT_RATE_1SS_MCS9,
+        RTL_RC_VHT_RATE_2SS_MCS7,
+        RTL_RC_VHT_RATE_2SS_MCS8,
+        RTL_RC_VHT_RATE_2SS_MCS9,
+
         /*keep it last */
         RTL_VAR_MAP_MAX,
 };
@@ -750,7 +810,9 @@ enum wireless_mode {
         WIRELESS_MODE_N_24G = 0x10,
         WIRELESS_MODE_N_5G = 0x20,
         WIRELESS_MODE_AC_5G = 0x40,
-        WIRELESS_MODE_AC_24G  = 0x80
+        WIRELESS_MODE_AC_24G  = 0x80,
+        WIRELESS_MODE_AC_ONLY = 0x100,
+        WIRELESS_MODE_MAX = 0x800
 };
 
 #define IS_WIRELESS_MODE_A(wirelessmode)        \
@@ -804,6 +866,30 @@ enum rt_polarity_ctl {
         RT_POLARITY_HIGH_ACT = 1,
 };
 
+/* After 8188E, we use V2 reason define. 88C/8723A use V1 reason. */
+enum fw_wow_reason_v2 {
+        FW_WOW_V2_PTK_UPDATE_EVENT = 0x01,
+        FW_WOW_V2_GTK_UPDATE_EVENT = 0x02,
+        FW_WOW_V2_DISASSOC_EVENT = 0x04,
+        FW_WOW_V2_DEAUTH_EVENT = 0x08,
+        FW_WOW_V2_FW_DISCONNECT_EVENT = 0x10,
+        FW_WOW_V2_MAGIC_PKT_EVENT = 0x21,
+        FW_WOW_V2_UNICAST_PKT_EVENT = 0x22,
+        FW_WOW_V2_PATTERN_PKT_EVENT = 0x23,
+        FW_WOW_V2_RTD3_SSID_MATCH_EVENT = 0x24,
+        FW_WOW_V2_REALWOW_V2_WAKEUPPKT = 0x30,
+        FW_WOW_V2_REALWOW_V2_ACKLOST = 0x31,
+        FW_WOW_V2_REASON_MAX = 0xff,
+};
+
+enum wolpattern_type {
+        UNICAST_PATTERN = 0,
+        MULTICAST_PATTERN = 1,
+        BROADCAST_PATTERN = 2,
+        DONT_CARE_DA = 3,
+        UNKNOWN_TYPE = 4,
+};
+
 struct octet_string {
         u8 *octet;
         u16 length;
@@ -904,6 +990,7 @@ struct wireless_stats {
         long last_sigstrength_inpercent;
 
         u32 rssi_calculate_cnt;
+        u32 pwdb_all_cnt;
 
         /*Transformed, in dbm. Beautified signal
            strength for UI, not correct. */
@@ -1112,6 +1199,8 @@ struct rtl_phy {
 
         u8 pwrgroup_cnt;
         u8 cck_high_power;
+        /* this is for 88E & 8723A */
+        u32 mcs_txpwrlevel_origoffset[MAX_PG_GROUP][16];
         /* MAX_PG_GROUP groups of pwr diff by rates */
         u32 mcs_offset[MAX_PG_GROUP][16];
         u32 tx_power_by_rate_offset[TX_PWR_BY_RATE_NUM_BAND]
@@ -1132,6 +1221,17 @@ struct rtl_phy {
         u8 cur_bw20_txpwridx;
         u8 cur_bw40_txpwridx;
 
+        char txpwr_limit_2_4g[MAX_REGULATION_NUM]
+                             [MAX_2_4G_BANDWITH_NUM]
+                             [MAX_RATE_SECTION_NUM]
+                             [CHANNEL_MAX_NUMBER_2G]
+                             [MAX_RF_PATH_NUM];
+        char txpwr_limit_5g[MAX_REGULATION_NUM]
+                           [MAX_5G_BANDWITH_NUM]
+                           [MAX_RATE_SECTION_NUM]
+                           [CHANNEL_MAX_NUMBER_5G]
+                           [MAX_RF_PATH_NUM];
+
         u32 rfreg_chnlval[2];
         bool apk_done;
         u32 reg_rf3c[2];        /* pathA / pathB  */
@@ -1255,6 +1355,17 @@ struct rtl_mac {
         /* skb wait queue */
         struct sk_buff_head skb_waitq[MAX_TID_COUNT];
 
+        u8 ht_stbc_cap;
+        u8 ht_cur_stbc;
+
+        /*vht support*/
+        u8 vht_enable;
+        u8 bw_80;
+        u8 vht_cur_ldpc;
+        u8 vht_cur_stbc;
+        u8 vht_stbc_cap;
+        u8 vht_ldpc_cap;
+
         /*RDG*/
         bool rdg_en;
 
@@ -1267,7 +1378,7 @@ struct rtl_mac {
         u8 sgi_40;
         u8 sgi_20;
         u8 bw_40;
-        u8 mode;                /* wireless mode */
+        u16 mode;               /* wireless mode */
         u8 slot_time;
         u8 short_preamble;
         u8 use_cts_protect;
@@ -1364,6 +1475,18 @@ struct rtl_hal {
         u32 version;            /*version of chip */
         u8 state;               /*stop 0, start 1 */
         u8 board_type;
+        u8 external_pa;
+
+        u8 pa_mode;
+        u8 pa_type_2g;
+        u8 pa_type_5g;
+        u8 lna_type_2g;
+        u8 lna_type_5g;
+        u8 external_pa_2g;
+        u8 external_lna_2g;
+        u8 external_pa_5g;
+        u8 external_lna_5g;
+        u8 rfe_type;
 
         /*firmware */
         u32 fwsize;
@@ -1419,6 +1542,20 @@ struct rtl_hal {
 
         u16 rx_tag;/*for 92ee*/
         u8 rts_en;
+
+        /*for wowlan*/
+        bool wow_enable;
+        bool enter_pnp_sleep;
+        bool wake_from_pnp_sleep;
+        bool wow_enabled;
+        __kernel_time_t last_suspend_sec;
+        u32 wowlan_fwsize;
+        u8 *wowlan_firmware;
+
+        u8 hw_rof_enable; /*Enable GPIO[9] as WL RF HW PDn source*/
+
+        bool real_wow_v2_enable;
+        bool re_init_llt_table;
 };
 
 struct rtl_security {
@@ -1765,6 +1902,15 @@ struct rtl_ps_ctl {
         struct rtl_p2p_ps_info p2p_ps_info;
         u8 pwr_mode;
         u8 smart_ps;
+
+        /* wake up on line */
+        u8 wo_wlan_mode;
+        u8 arp_offload_enable;
+        u8 gtk_offload_enable;
+        /* Used for WOL, indicates the reason for waking event.*/
+        u32 wakeup_reason;
+        /* Record the last waking time for comparison with setting key. */
+        u64 last_wakeup_time;
 };
 
 struct rtl_stats {
@@ -1800,17 +1946,26 @@ struct rtl_stats {
         u16 wakeup:1;
         u32 timestamp_low;
         u32 timestamp_high;
+        bool shift;
 
         u8 rx_drvinfo_size;
         u8 rx_bufshift;
         bool isampdu;
         bool isfirst_ampdu;
         bool rx_is40Mhzpacket;
+        u8 rx_packet_bw;
         u32 rx_pwdb_all;
         u8 rx_mimo_signalstrength[4];   /*in 0~100 index */
+        s8 rx_mimo_signalquality[4];
+        u8 rx_mimo_evm_dbm[4];
+        u16 cfo_short[4];               /* per-path's Cfo_short */
+        u16 cfo_tail[4];
+
         s8 rx_mimo_sig_qual[4];
         u8 rx_pwr[4]; /* per-path's pwdb */
         u8 rx_snr[4]; /* per-path's SNR */
+        u8 bandwidth;
+        u8 bt_coex_pwr_adjust;
         bool packet_matchbssid;
         bool is_cck;
         bool is_ht;
@@ -1818,6 +1973,10 @@ struct rtl_stats {
         bool packet_beacon;     /*for rssi */
         char cck_adc_pwdb[4];   /*for rx path selection */
 
+        bool is_vht;
+        bool is_short_gi;
+        u8 vht_nss;
+
         u8 packet_report_type;
 
         u32 macid;
@@ -1850,7 +2009,7 @@ struct rt_link_detect {
 };
 
 struct rtl_tcb_desc {
-        u8 packet_bw:1;
+        u8 packet_bw:2;
         u8 multicast:1;
         u8 broadcast:1;
 
@@ -1880,11 +2039,19 @@ struct rtl_tcb_desc {
         u8 empkt_num;
         /* The max value by HW */
         u32 empkt_len[10];
-        bool btx_enable_sw_calc_duration;
+        bool tx_enable_sw_calc_duration;
 };
 
 struct rtl92c_firmware_header;
 
+struct rtl_wow_pattern {
+        u8 type;
+        u16 crc;
+        u32 mask[4];
+};
+
+struct rtl8723e_firmware_header;
+
 struct rtl_hal_ops {
         int (*init_sw_vars) (struct ieee80211_hw *hw);
         void (*deinit_sw_vars) (struct ieee80211_hw *hw);
@@ -1934,7 +2101,6 @@ struct rtl_hal_ops {
         void (*fill_tx_cmddesc) (struct ieee80211_hw *hw, u8 *pdesc,
                                  bool firstseg, bool lastseg,
                                  struct sk_buff *skb);
-        bool (*cmd_send_packet)(struct ieee80211_hw *hw, struct sk_buff *skb);
         bool (*query_rx_desc) (struct ieee80211_hw *hw,
                                struct rtl_stats *stats,
                                struct ieee80211_rx_status *rx_status,
@@ -1989,9 +2155,12 @@ struct rtl_hal_ops {
         void (*fill_h2c_cmd) (struct ieee80211_hw *hw, u8 element_id,
                               u32 cmd_len, u8 *p_cmdbuffer);
         bool (*get_btc_status) (void);
-        bool (*is_fw_header) (struct rtl92c_firmware_header *hdr);
+        bool (*is_fw_header)(struct rtl8723e_firmware_header *hdr);
         u32 (*rx_command_packet)(struct ieee80211_hw *hw,
                                  struct rtl_stats status, struct sk_buff *skb);
+        void (*add_wowlan_pattern)(struct ieee80211_hw *hw,
+                                   struct rtl_wow_pattern *rtl_pattern,
+                                   u8 index);
 };
 
 struct rtl_intf_ops {
@@ -2006,7 +2175,7 @@ struct rtl_intf_ops {
                            struct ieee80211_sta *sta,
                            struct sk_buff *skb,
                            struct rtl_tcb_desc *ptcb_desc);
-        void (*flush)(struct ieee80211_hw *hw, bool drop);
+        void (*flush)(struct ieee80211_hw *hw, u32 queues, bool drop);
         int (*reset_trx_ring) (struct ieee80211_hw *hw);
         bool (*waitq_insert) (struct ieee80211_hw *hw,
                               struct ieee80211_sta *sta,
@@ -2035,9 +2204,13 @@ struct rtl_mod_params {
         /* default: 1 = using linked fw power save */
         bool fwctrl_lps;
 
-        /* default: 0 = not using MSI interrupts mode */
-        /* submodules should set their own defalut value */
+        /* default: 0 = not using MSI interrupts mode
+         * submodules should set their own default value
+         */
         bool msi_support;
+
+        /* default 0: 1 means disable */
+        bool disable_watchdog;
 };
 
 struct rtl_hal_usbint_cfg {
@@ -2345,6 +2518,8 @@ struct proxim {
 
 struct rtl_priv {
         struct ieee80211_hw *hw;
+        /* Used to load a second firmware */
+        void (*rtl_fw_second_cb)(struct rtl_priv *rtlpriv);
         struct completion firmware_loading_complete;
         struct list_head list;
         struct rtl_priv *buddy_priv;
@@ -2420,6 +2595,9 @@ struct rtl_priv {
          */
         bool use_new_trx_flow;
 
+#ifdef CONFIG_PM
+        struct wiphy_wowlan_support wowlan;
+#endif
         /*This must be the last item so
            that it points to the data allocated
            beyond  this structure like:
@@ -2668,6 +2846,26 @@ value to host byte ordering.*/
         (des)[2] = (src)[2], (des)[3] = (src)[3],\
         (des)[4] = (src)[4], (des)[5] = (src)[5])
 
+#define LDPC_HT_ENABLE_RX                       BIT(0)
+#define LDPC_HT_ENABLE_TX                       BIT(1)
+#define LDPC_HT_TEST_TX_ENABLE                  BIT(2)
+#define LDPC_HT_CAP_TX                          BIT(3)
+
+#define STBC_HT_ENABLE_RX                       BIT(0)
+#define STBC_HT_ENABLE_TX                       BIT(1)
+#define STBC_HT_TEST_TX_ENABLE                  BIT(2)
+#define STBC_HT_CAP_TX                          BIT(3)
+
+#define LDPC_VHT_ENABLE_RX                      BIT(0)
+#define LDPC_VHT_ENABLE_TX                      BIT(1)
+#define LDPC_VHT_TEST_TX_ENABLE                 BIT(2)
+#define LDPC_VHT_CAP_TX                         BIT(3)
+
+#define STBC_VHT_ENABLE_RX                      BIT(0)
+#define STBC_VHT_ENABLE_TX                      BIT(1)
+#define STBC_VHT_TEST_TX_ENABLE                 BIT(2)
+#define STBC_VHT_CAP_TX                         BIT(3)
+
 static inline u8 rtl_read_byte(struct rtl_priv *rtlpriv, u32 addr)
 {
         return rtlpriv->io.read8_sync(rtlpriv, addr);
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
index ff31939978ae..0ea756b77519 100644
--- a/drivers/nfc/st21nfca/i2c.c
+++ b/drivers/nfc/st21nfca/i2c.c
@@ -271,6 +271,7 @@ static int st21nfca_hci_i2c_write(void *phy_id, struct sk_buff *skb)
 static int get_frame_size(u8 *buf, int buflen)
 {
         int len = 0;
+
         if (buf[len + 1] == ST21NFCA_SOF_EOF)
                 return 0;
 
@@ -311,6 +312,7 @@ static int check_crc(u8 *buf, int buflen)
 static int st21nfca_hci_i2c_repack(struct sk_buff *skb)
 {
         int i, j, r, size;
+
         if (skb->len < 1 || (skb->len > 1 && skb->data[1] != 0))
                 return -EBADMSG;
 
@@ -525,24 +527,19 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
         }
 
         /* GPIO request and configuration */
-        r = devm_gpio_request(&client->dev, gpio, "clf_enable");
+        r = devm_gpio_request_one(&client->dev, gpio, GPIOF_OUT_INIT_HIGH,
+                                  "clf_enable");
         if (r) {
                 nfc_err(&client->dev, "Failed to request enable pin\n");
                 return -ENODEV;
         }
 
-        r = gpio_direction_output(gpio, 1);
-        if (r) {
-                nfc_err(&client->dev, "Failed to set enable pin direction as output\n");
-                return -ENODEV;
-        }
         phy->gpio_ena = gpio;
 
         /* IRQ */
         r = irq_of_parse_and_map(pp, 0);
         if (r < 0) {
-                nfc_err(&client->dev,
-                                "Unable to get irq, error: %d\n", r);
+                nfc_err(&client->dev, "Unable to get irq, error: %d\n", r);
                 return r;
         }
 
@@ -576,32 +573,20 @@ static int st21nfca_hci_i2c_request_resources(struct i2c_client *client)
         phy->gpio_ena = pdata->gpio_ena;
         phy->irq_polarity = pdata->irq_polarity;
 
-        r = devm_gpio_request(&client->dev, phy->gpio_irq, "wake_up");
+        r = devm_gpio_request_one(&client->dev, phy->gpio_irq, GPIOF_IN,
+                                  "wake_up");
         if (r) {
                 pr_err("%s : gpio_request failed\n", __FILE__);
                 return -ENODEV;
         }
 
-        r = gpio_direction_input(phy->gpio_irq);
-        if (r) {
-                pr_err("%s : gpio_direction_input failed\n", __FILE__);
-                return -ENODEV;
-        }
-
         if (phy->gpio_ena > 0) {
-                r = devm_gpio_request(&client->dev,
-                                        phy->gpio_ena, "clf_enable");
+                r = devm_gpio_request_one(&client->dev, phy->gpio_ena,
+                                          GPIOF_OUT_INIT_HIGH, "clf_enable");
                 if (r) {
                         pr_err("%s : ena gpio_request failed\n", __FILE__);
                         return -ENODEV;
                 }
-                r = gpio_direction_output(phy->gpio_ena, 1);
-
-                if (r) {
-                        pr_err("%s : ena gpio_direction_output failed\n",
-                               __FILE__);
-                        return -ENODEV;
-                }
         }
 
         /* IRQ */
@@ -711,7 +696,6 @@ static struct i2c_driver st21nfca_hci_i2c_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = ST21NFCA_HCI_I2C_DRIVER_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(of_st21nfca_i2c_match),
         },
         .probe = st21nfca_hci_i2c_probe,
diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
index a902b0551c86..a89e56c2c749 100644
--- a/drivers/nfc/st21nfca/st21nfca.c
+++ b/drivers/nfc/st21nfca/st21nfca.c
@@ -34,7 +34,7 @@
 #define ST21NFCA_RF_READER_CMD_PRESENCE_CHECK   0x30
 
 #define ST21NFCA_RF_READER_ISO15693_GATE        0x12
-#define ST21NFCA_RF_READER_ISO15693_INVENTORY 0x01
+#define ST21NFCA_RF_READER_ISO15693_INVENTORY   0x01
 
 /*
  * Reader gate for communication with contact-less cards using Type A
@@ -45,21 +45,42 @@
 #define ST21NFCA_RF_READER_14443_3_A_ATQA       0x03
 #define ST21NFCA_RF_READER_14443_3_A_SAK        0x04
 
+#define ST21NFCA_RF_READER_F_DATARATE           0x01
+#define ST21NFCA_RF_READER_F_DATARATE_106       0x01
+#define ST21NFCA_RF_READER_F_DATARATE_212       0x02
+#define ST21NFCA_RF_READER_F_DATARATE_424       0x04
+#define ST21NFCA_RF_READER_F_POL_REQ            0x02
+#define ST21NFCA_RF_READER_F_POL_REQ_DEFAULT    0xffff0000
+#define ST21NFCA_RF_READER_F_NFCID2             0x03
+#define ST21NFCA_RF_READER_F_NFCID1             0x04
+
+#define ST21NFCA_RF_CARD_F_MODE                 0x01
+#define ST21NFCA_RF_CARD_F_NFCID2_LIST          0x04
+#define ST21NFCA_RF_CARD_F_NFCID1               0x05
+#define ST21NFCA_RF_CARD_F_SENS_RES             0x06
+#define ST21NFCA_RF_CARD_F_SEL_RES              0x07
+#define ST21NFCA_RF_CARD_F_DATARATE             0x08
+#define ST21NFCA_RF_CARD_F_DATARATE_212_424     0x01
+
 #define ST21NFCA_DEVICE_MGNT_GATE               0x01
 #define ST21NFCA_DEVICE_MGNT_PIPE               0x02
 
-#define ST21NFCA_DM_GETINFO         0x13
-#define ST21NFCA_DM_GETINFO_PIPE_LIST       0x02
-#define ST21NFCA_DM_GETINFO_PIPE_INFO       0x01
-#define ST21NFCA_DM_PIPE_CREATED        0x02
-#define ST21NFCA_DM_PIPE_OPEN           0x04
-#define ST21NFCA_DM_RF_ACTIVE           0x80
-#define ST21NFCA_DM_DISCONNECT          0x30
+#define ST21NFCA_DM_GETINFO                     0x13
+#define ST21NFCA_DM_GETINFO_PIPE_LIST           0x02
+#define ST21NFCA_DM_GETINFO_PIPE_INFO           0x01
+#define ST21NFCA_DM_PIPE_CREATED                0x02
+#define ST21NFCA_DM_PIPE_OPEN                   0x04
+#define ST21NFCA_DM_RF_ACTIVE                   0x80
+#define ST21NFCA_DM_DISCONNECT                  0x30
 
 #define ST21NFCA_DM_IS_PIPE_OPEN(p) \
         ((p & 0x0f) == (ST21NFCA_DM_PIPE_CREATED | ST21NFCA_DM_PIPE_OPEN))
 
-#define ST21NFCA_NFC_MODE       0x03    /* NFC_MODE parameter*/
+#define ST21NFCA_NFC_MODE                       0x03    /* NFC_MODE parameter*/
+#define ST21NFCA_EVT_FIELD_ON                   0x11
+#define ST21NFCA_EVT_CARD_DEACTIVATED           0x12
+#define ST21NFCA_EVT_CARD_ACTIVATED             0x13
+#define ST21NFCA_EVT_FIELD_OFF                  0x14
 
 static DECLARE_BITMAP(dev_mask, ST21NFCA_NUM_DEVICES);
 
@@ -355,8 +376,8 @@ static int st21nfca_hci_start_poll(struct nfc_hci_dev *hdev,
                         if (r < 0)
                                 return r;
 
-                        pol_req =
-                            be32_to_cpu(ST21NFCA_RF_READER_F_POL_REQ_DEFAULT);
+                        pol_req = be32_to_cpu((__force __be32)
+                                        ST21NFCA_RF_READER_F_POL_REQ_DEFAULT);
                         r = nfc_hci_set_param(hdev, ST21NFCA_RF_READER_F_GATE,
                                               ST21NFCA_RF_READER_F_POL_REQ,
                                               (u8 *) &pol_req, 4);
@@ -790,6 +811,7 @@ static int st21nfca_hci_check_presence(struct nfc_hci_dev *hdev,
                                        struct nfc_target *target)
 {
         u8 fwi = 0x11;
+
         switch (target->hci_reader_gate) {
         case NFC_HCI_RF_READER_A_GATE:
         case NFC_HCI_RF_READER_B_GATE:
@@ -839,20 +861,16 @@ static int st21nfca_hci_event_received(struct nfc_hci_dev *hdev, u8 gate,
                 if (gate == ST21NFCA_RF_CARD_F_GATE) {
                         r = st21nfca_tm_event_send_data(hdev, skb, gate);
                         if (r < 0)
-                                goto exit;
+                                return r;
                         return 0;
-                } else {
-                        info->dep_info.curr_nfc_dep_pni = 0;
-                        return 1;
                 }
-                break;
+                info->dep_info.curr_nfc_dep_pni = 0;
+                return 1;
         default:
                 return 1;
         }
         kfree_skb(skb);
         return 0;
-exit:
-        return r;
 }
 
 static struct nfc_hci_ops st21nfca_hci_ops = {
@@ -904,8 +922,11 @@ int st21nfca_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops,
          * persistent info to discriminate 2 identical chips
          */
         dev_num = find_first_zero_bit(dev_mask, ST21NFCA_NUM_DEVICES);
+
         if (dev_num >= ST21NFCA_NUM_DEVICES)
-                goto err_alloc_hdev;
+                return -ENODEV;
+
+        set_bit(dev_num, dev_mask);
 
         scnprintf(init_data.session_id, sizeof(init_data.session_id), "%s%2x",
                   "ST21AH", dev_num);
diff --git a/drivers/nfc/st21nfca/st21nfca.h b/drivers/nfc/st21nfca/st21nfca.h
index 96fe5a62dc0d..a0b77f1ba6d9 100644
--- a/drivers/nfc/st21nfca/st21nfca.h
+++ b/drivers/nfc/st21nfca/st21nfca.h
@@ -82,30 +82,9 @@ struct st21nfca_hci_info {
 #define ST21NFCA_WR_XCHG_DATA            0x10
 
 #define ST21NFCA_RF_READER_F_GATE               0x14
-#define ST21NFCA_RF_READER_F_DATARATE 0x01
-#define ST21NFCA_RF_READER_F_DATARATE_106 0x01
-#define ST21NFCA_RF_READER_F_DATARATE_212 0x02
-#define ST21NFCA_RF_READER_F_DATARATE_424 0x04
-#define ST21NFCA_RF_READER_F_POL_REQ    0x02
-#define ST21NFCA_RF_READER_F_POL_REQ_DEFAULT    0xffff0000
-#define ST21NFCA_RF_READER_F_NFCID2 0x03
-#define ST21NFCA_RF_READER_F_NFCID1 0x04
-#define ST21NFCA_RF_READER_F_SENS_RES 0x05
 
 #define ST21NFCA_RF_CARD_F_GATE 0x24
-#define ST21NFCA_RF_CARD_F_MODE 0x01
-#define ST21NFCA_RF_CARD_F_NFCID2_LIST 0x04
-#define ST21NFCA_RF_CARD_F_NFCID1 0x05
-#define ST21NFCA_RF_CARD_F_SENS_RES 0x06
-#define ST21NFCA_RF_CARD_F_SEL_RES 0x07
-#define ST21NFCA_RF_CARD_F_DATARATE 0x08
-#define ST21NFCA_RF_CARD_F_DATARATE_106 0x00
-#define ST21NFCA_RF_CARD_F_DATARATE_212_424 0x01
 
 #define ST21NFCA_EVT_SEND_DATA 0x10
-#define ST21NFCA_EVT_FIELD_ON 0x11
-#define ST21NFCA_EVT_CARD_DEACTIVATED 0x12
-#define ST21NFCA_EVT_CARD_ACTIVATED 0x13
-#define ST21NFCA_EVT_FIELD_OFF 0x14
 
 #endif /* __LOCAL_ST21NFCA_H_ */
diff --git a/drivers/nfc/st21nfca/st21nfca_dep.c b/drivers/nfc/st21nfca/st21nfca_dep.c
index b2d9957b57f8..bfb6df56c505 100644
--- a/drivers/nfc/st21nfca/st21nfca_dep.c
+++ b/drivers/nfc/st21nfca/st21nfca_dep.c
@@ -121,6 +121,7 @@ static void st21nfca_tx_work(struct work_struct *work)
 
         struct nfc_dev *dev;
         struct sk_buff *skb;
+
         if (info) {
                 dev = info->hdev->ndev;
                 skb = info->dep_info.tx_pending;
@@ -128,9 +129,8 @@ static void st21nfca_tx_work(struct work_struct *work)
                 device_lock(&dev->dev);
 
                 nfc_hci_send_cmd_async(info->hdev, ST21NFCA_RF_READER_F_GATE,
-                                                        ST21NFCA_WR_XCHG_DATA,
-                                                        skb->data, skb->len,
-                                                        info->async_cb, info);
+                                ST21NFCA_WR_XCHG_DATA, skb->data, skb->len,
+                                info->async_cb, info);
                 device_unlock(&dev->dev);
                 kfree_skb(skb);
         }
@@ -185,8 +185,10 @@ static int st21nfca_tm_send_atr_res(struct nfc_hci_dev *hdev,
 
         info->dep_info.curr_nfc_dep_pni = 0;
 
-        return nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,
+        r = nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,
                                 ST21NFCA_EVT_SEND_DATA, skb->data, skb->len);
+        kfree_skb(skb);
+        return r;
 }
 
 static int st21nfca_tm_recv_atr_req(struct nfc_hci_dev *hdev,
@@ -197,10 +199,6 @@ static int st21nfca_tm_recv_atr_req(struct nfc_hci_dev *hdev,
         int r;
 
         skb_trim(skb, skb->len - 1);
-        if (IS_ERR(skb)) {
-                r = PTR_ERR(skb);
-                goto exit;
-        }
 
         if (!skb->len) {
                 r = -EIO;
@@ -214,6 +212,11 @@ static int st21nfca_tm_recv_atr_req(struct nfc_hci_dev *hdev,
 
         atr_req = (struct st21nfca_atr_req *)skb->data;
 
+        if (atr_req->length < sizeof(struct st21nfca_atr_req)) {
+                r = -EPROTO;
+                goto exit;
+        }
+
         r = st21nfca_tm_send_atr_res(hdev, atr_req);
         if (r)
                 goto exit;
@@ -237,7 +240,6 @@ static int st21nfca_tm_send_psl_res(struct nfc_hci_dev *hdev,
         struct st21nfca_psl_res *psl_res;
         struct sk_buff *skb;
         u8 bitrate[2] = {0, 0};
-
         int r;
 
         skb = alloc_skb(sizeof(struct st21nfca_psl_res), GFP_KERNEL);
@@ -254,6 +256,8 @@ static int st21nfca_tm_send_psl_res(struct nfc_hci_dev *hdev,
 
         r = nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,
                                 ST21NFCA_EVT_SEND_DATA, skb->data, skb->len);
+        if (r < 0)
+                goto error;
 
         /*
          * ST21NFCA only support P2P passive.
@@ -269,8 +273,11 @@ static int st21nfca_tm_send_psl_res(struct nfc_hci_dev *hdev,
         }
 
         /* Send an event to change bitrate change event to card f */
-        return nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,
+        r = nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,
                         ST21NFCA_EVT_CARD_F_BITRATE, bitrate, 2);
+error:
+        kfree_skb(skb);
+        return r;
 }
 
 static int st21nfca_tm_recv_psl_req(struct nfc_hci_dev *hdev,
@@ -280,11 +287,6 @@ static int st21nfca_tm_recv_psl_req(struct nfc_hci_dev *hdev,
         int r;
 
         skb_trim(skb, skb->len - 1);
-        if (IS_ERR(skb)) {
-                r = PTR_ERR(skb);
-                skb = NULL;
-                goto exit;
-        }
 
         if (!skb->len) {
                 r = -EIO;
@@ -314,7 +316,7 @@ int st21nfca_tm_send_dep_res(struct nfc_hci_dev *hdev, struct sk_buff *skb)
         *skb_push(skb, 1) = skb->len;
 
         r = nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,
-                                ST21NFCA_EVT_SEND_DATA, skb->data, skb->len);
+                        ST21NFCA_EVT_SEND_DATA, skb->data, skb->len);
         kfree_skb(skb);
 
         return r;
@@ -330,11 +332,6 @@ static int st21nfca_tm_recv_dep_req(struct nfc_hci_dev *hdev,
         struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev);
 
         skb_trim(skb, skb->len - 1);
-        if (IS_ERR(skb)) {
-                r = PTR_ERR(skb);
-                skb = NULL;
-                goto exit;
-        }
 
         size = 4;
 
@@ -368,12 +365,6 @@ static int st21nfca_tm_recv_dep_req(struct nfc_hci_dev *hdev,
                 break;
         }
 
-        if (IS_ERR(skb)) {
-                r = PTR_ERR(skb);
-                skb = NULL;
-                goto exit;
-        }
-
         skb_pull(skb, size);
 
         return nfc_tm_data_received(hdev->ndev, skb);
@@ -437,8 +428,6 @@ static void st21nfca_im_send_psl_req(struct nfc_hci_dev *hdev, u8 did, u8 bsi,
         *skb_push(skb, 1) = info->dep_info.to | 0x10;
 
         st21nfca_im_send_pdu(info, skb);
-
-        kfree_skb(skb);
 }
 
 #define ST21NFCA_CB_TYPE_READER_F 1
@@ -452,7 +441,7 @@ static void st21nfca_im_recv_atr_res_cb(void *context, struct sk_buff *skb,
         if (err != 0)
                 return;
 
-        if (IS_ERR(skb))
+        if (!skb)
                 return;
 
         switch (info->async_cb_type) {
@@ -484,8 +473,7 @@ static void st21nfca_im_recv_atr_res_cb(void *context, struct sk_buff *skb,
                                                 ST21NFCA_PP2LRI(atr_res->ppi));
                 break;
         default:
-                if (err == 0)
-                        kfree_skb(skb);
+                kfree_skb(skb);
                 break;
         }
 }
@@ -522,7 +510,7 @@ int st21nfca_im_send_atr_req(struct nfc_hci_dev *hdev, u8 *gb, size_t gb_len)
         memset(atr_req->nfcid3, 0, NFC_NFCID3_MAXSIZE);
         target = hdev->ndev->targets;
 
-        if (target->sensf_res)
+        if (target->sensf_res_len > 0)
                 memcpy(atr_req->nfcid3, target->sensf_res,
                                 target->sensf_res_len);
         else
@@ -565,7 +553,7 @@ static void st21nfca_im_recv_dep_res_cb(void *context, struct sk_buff *skb,
         if (err != 0)
                 return;
 
-        if (IS_ERR(skb))
+        if (!skb)
                 return;
 
         switch (info->async_cb_type) {
@@ -615,8 +603,7 @@ static void st21nfca_im_recv_dep_res_cb(void *context, struct sk_buff *skb,
         }
 
 exit:
-        if (err == 0)
-                kfree_skb(skb);
+        kfree_skb(skb);
 }
 
 int st21nfca_im_send_dep_req(struct nfc_hci_dev *hdev, struct sk_buff *skb)
diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c
index 8af880ead5db..c5d2427a3db2 100644
--- a/drivers/nfc/st21nfcb/i2c.c
+++ b/drivers/nfc/st21nfcb/i2c.c
@@ -17,24 +17,16 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/crc-ccitt.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/of_irq.h>
 #include <linux/of_gpio.h>
-#include <linux/miscdevice.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/nfc.h>
-#include <linux/firmware.h>
-#include <linux/unaligned/access_ok.h>
 #include <linux/platform_data/st21nfcb.h>
 
-#include <net/nfc/nci.h>
-#include <net/nfc/llc.h>
-#include <net/nfc/nfc.h>
-
 #include "ndlc.h"
 
 #define DRIVER_DESC "NCI NFC driver for ST21NFCB"
@@ -63,12 +55,6 @@ struct st21nfcb_i2c_phy {
         unsigned int irq_polarity;
 
         int powered;
-
-        /*
-         * < 0 if hardware error occured (e.g. i2c err)
-         * and prevents normal operation.
-         */
-        int hard_fault;
 };
 
 #define I2C_DUMP_SKB(info, skb)                                 \
@@ -122,8 +108,8 @@ static int st21nfcb_nci_i2c_write(void *phy_id, struct sk_buff *skb)
 
         I2C_DUMP_SKB("st21nfcb_nci_i2c_write", skb);
 
-        if (phy->hard_fault != 0)
-                return phy->hard_fault;
+        if (phy->ndlc->hard_fault != 0)
+                return phy->ndlc->hard_fault;
 
         r = i2c_master_send(client, skb->data, skb->len);
         if (r == -EREMOTEIO) {  /* Retry, chip was in standby */
@@ -168,11 +154,11 @@ static int st21nfcb_nci_i2c_read(struct st21nfcb_i2c_phy *phy,
         if (r == -EREMOTEIO) {  /* Retry, chip was in standby */
                 usleep_range(1000, 4000);
                 r = i2c_master_recv(client, buf, ST21NFCB_NCI_I2C_MIN_SIZE);
-        } else if (r != ST21NFCB_NCI_I2C_MIN_SIZE) {
-                nfc_err(&client->dev, "cannot read ndlc & nci header\n");
-                return -EREMOTEIO;
         }
 
+        if (r != ST21NFCB_NCI_I2C_MIN_SIZE)
+                return -EREMOTEIO;
+
         len = be16_to_cpu(*(__be16 *) (buf + 2));
         if (len > ST21NFCB_NCI_I2C_MAX_SIZE) {
                 nfc_err(&client->dev, "invalid frame len\n");
@@ -224,7 +210,7 @@ static irqreturn_t st21nfcb_nci_irq_thread_fn(int irq, void *phy_id)
         client = phy->i2c_dev;
         dev_dbg(&client->dev, "IRQ\n");
 
-        if (phy->hard_fault)
+        if (phy->ndlc->hard_fault)
                 return IRQ_HANDLED;
 
         if (!phy->powered) {
@@ -233,13 +219,8 @@ static irqreturn_t st21nfcb_nci_irq_thread_fn(int irq, void *phy_id)
         }
 
         r = st21nfcb_nci_i2c_read(phy, &skb);
-        if (r == -EREMOTEIO) {
-                phy->hard_fault = r;
-                ndlc_recv(phy->ndlc, NULL);
-                return IRQ_HANDLED;
-        } else if (r == -ENOMEM || r == -EBADMSG) {
+        if (r == -EREMOTEIO || r == -ENOMEM || r == -EBADMSG)
                 return IRQ_HANDLED;
-        }
 
         ndlc_recv(phy->ndlc, skb);
 
@@ -273,25 +254,18 @@ static int st21nfcb_nci_i2c_of_request_resources(struct i2c_client *client)
         }
 
         /* GPIO request and configuration */
-        r = devm_gpio_request(&client->dev, gpio, "clf_reset");
+        r = devm_gpio_request_one(&client->dev, gpio,
+                                GPIOF_OUT_INIT_HIGH, "clf_reset");
         if (r) {
                 nfc_err(&client->dev, "Failed to request reset pin\n");
                 return -ENODEV;
         }
-
-        r = gpio_direction_output(gpio, 1);
-        if (r) {
-                nfc_err(&client->dev,
-                        "Failed to set reset pin direction as output\n");
-                return -ENODEV;
-        }
         phy->gpio_reset = gpio;
 
         /* IRQ */
         r = irq_of_parse_and_map(pp, 0);
         if (r < 0) {
-                nfc_err(&client->dev,
-                                "Unable to get irq, error: %d\n", r);
+                nfc_err(&client->dev, "Unable to get irq, error: %d\n", r);
                 return r;
         }
 
@@ -325,32 +299,20 @@ static int st21nfcb_nci_i2c_request_resources(struct i2c_client *client)
         phy->gpio_reset = pdata->gpio_reset;
         phy->irq_polarity = pdata->irq_polarity;
 
-        r = devm_gpio_request(&client->dev, phy->gpio_irq, "wake_up");
+        r = devm_gpio_request_one(&client->dev, phy->gpio_irq,
+                                GPIOF_IN, "clf_irq");
         if (r) {
                 pr_err("%s : gpio_request failed\n", __FILE__);
                 return -ENODEV;
         }
 
-        r = gpio_direction_input(phy->gpio_irq);
-        if (r) {
-                pr_err("%s : gpio_direction_input failed\n", __FILE__);
-                return -ENODEV;
-        }
-
-        r = devm_gpio_request(&client->dev,
-                              phy->gpio_reset, "clf_reset");
+        r = devm_gpio_request_one(&client->dev,
+                        phy->gpio_reset, GPIOF_OUT_INIT_HIGH, "clf_reset");
         if (r) {
                 pr_err("%s : reset gpio_request failed\n", __FILE__);
                 return -ENODEV;
         }
 
-        r = gpio_direction_output(phy->gpio_reset, 1);
-        if (r) {
-                pr_err("%s : reset gpio_direction_output failed\n",
-                        __FILE__);
-                return -ENODEV;
-        }
-
         /* IRQ */
         irq = gpio_to_irq(phy->gpio_irq);
         if (irq < 0) {
@@ -448,7 +410,6 @@ static struct i2c_driver st21nfcb_nci_i2c_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = ST21NFCB_NCI_I2C_DRIVER_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(of_st21nfcb_i2c_match),
         },
         .probe = st21nfcb_nci_i2c_probe,
diff --git a/drivers/nfc/st21nfcb/ndlc.c b/drivers/nfc/st21nfcb/ndlc.c
index 83c97c36112b..e7bff8921d11 100644
--- a/drivers/nfc/st21nfcb/ndlc.c
+++ b/drivers/nfc/st21nfcb/ndlc.c
@@ -112,6 +112,10 @@ static void llt_ndlc_send_queue(struct llt_ndlc *ndlc)
                 ndlc->t1_active = true;
                 mod_timer(&ndlc->t1_timer, time_sent +
                         msecs_to_jiffies(NDLC_TIMER_T1));
+                /* start timer t2 for chip availability */
+                ndlc->t2_active = true;
+                mod_timer(&ndlc->t2_timer, time_sent +
+                        msecs_to_jiffies(NDLC_TIMER_T2));
         }
 }
 
@@ -207,7 +211,7 @@ static void llt_ndlc_sm_work(struct work_struct *work)
                 ndlc->t2_active = false;
                 ndlc->t1_active = false;
                 del_timer_sync(&ndlc->t1_timer);
-
+                del_timer_sync(&ndlc->t2_timer);
                 ndlc_close(ndlc);
                 ndlc->hard_fault = -EREMOTEIO;
         }
diff --git a/drivers/nfc/st21nfcb/ndlc.h b/drivers/nfc/st21nfcb/ndlc.h
index c30a2f0faa5f..b28140e0cd78 100644
--- a/drivers/nfc/st21nfcb/ndlc.h
+++ b/drivers/nfc/st21nfcb/ndlc.h
@@ -42,6 +42,10 @@ struct llt_ndlc {
 
         struct device *dev;
 
+        /*
+         * < 0 if hardware error occured
+         * and prevents normal operation.
+         */
         int hard_fault;
 };
 
diff --git a/drivers/nfc/st21nfcb/st21nfcb.c b/drivers/nfc/st21nfcb/st21nfcb.c
index 4d95863e3063..ea63d5877831 100644
--- a/drivers/nfc/st21nfcb/st21nfcb.c
+++ b/drivers/nfc/st21nfcb/st21nfcb.c
@@ -22,10 +22,11 @@
 #include <net/nfc/nci_core.h>
 
 #include "st21nfcb.h"
-#include "ndlc.h"
 
 #define DRIVER_DESC "NCI NFC driver for ST21NFCB"
 
+#define ST21NFCB_NCI1_X_PROPRIETARY_ISO15693 0x83
+
 static int st21nfcb_nci_open(struct nci_dev *ndev)
 {
         struct st21nfcb_nci_info *info = nci_get_drvdata(ndev);
@@ -65,10 +66,18 @@ static int st21nfcb_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
         return ndlc_send(info->ndlc, skb);
 }
 
+static __u32 st21nfcb_nci_get_rfprotocol(struct nci_dev *ndev,
+                                         __u8 rf_protocol)
+{
+        return rf_protocol == ST21NFCB_NCI1_X_PROPRIETARY_ISO15693 ?
+                NFC_PROTO_ISO15693_MASK : 0;
+}
+
 static struct nci_ops st21nfcb_nci_ops = {
         .open = st21nfcb_nci_open,
         .close = st21nfcb_nci_close,
         .send = st21nfcb_nci_send,
+        .get_rfprotocol = st21nfcb_nci_get_rfprotocol,
 };
 
 int st21nfcb_nci_probe(struct llt_ndlc *ndlc, int phy_headroom,
@@ -88,29 +97,25 @@ int st21nfcb_nci_probe(struct llt_ndlc *ndlc, int phy_headroom,
                 | NFC_PROTO_FELICA_MASK
                 | NFC_PROTO_ISO14443_MASK
                 | NFC_PROTO_ISO14443_B_MASK
+                | NFC_PROTO_ISO15693_MASK
                 | NFC_PROTO_NFC_DEP_MASK;
 
         ndlc->ndev = nci_allocate_device(&st21nfcb_nci_ops, protocols,
                                         phy_headroom, phy_tailroom);
         if (!ndlc->ndev) {
                 pr_err("Cannot allocate nfc ndev\n");
-                r = -ENOMEM;
-                goto err_alloc_ndev;
+                return -ENOMEM;
         }
         info->ndlc = ndlc;
 
         nci_set_drvdata(ndlc->ndev, info);
 
         r = nci_register_device(ndlc->ndev);
-        if (r)
-                goto err_regdev;
-
-        return r;
-err_regdev:
-        nci_free_device(ndlc->ndev);
+        if (r) {
+                pr_err("Cannot register nfc device to nci core\n");
+                nci_free_device(ndlc->ndev);
+        }
 
-err_alloc_ndev:
-        kfree(info);
         return r;
 }
 EXPORT_SYMBOL_GPL(st21nfcb_nci_probe);
diff --git a/drivers/nfc/st21nfcb/st21nfcb.h b/drivers/nfc/st21nfcb/st21nfcb.h
index 4bbbebb9f34d..ea58a56ad794 100644
--- a/drivers/nfc/st21nfcb/st21nfcb.h
+++ b/drivers/nfc/st21nfcb/st21nfcb.h
@@ -19,8 +19,6 @@
 #ifndef __LOCAL_ST21NFCB_H_
 #define __LOCAL_ST21NFCB_H_
 
-#include <net/nfc/nci_core.h>
-
 #include "ndlc.h"
 
 /* Define private flags: */
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index 3b78b031e617..d2ccd2890647 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -36,7 +36,13 @@
  * The trf7970a is very timing sensitive and the VIN, EN2, and EN
  * pins must asserted in that order and with specific delays in between.
  * The delays used in the driver were provided by TI and have been
- * confirmed to work with this driver.
+ * confirmed to work with this driver.  There is a bug with the current
+ * version of the trf7970a that requires that EN2 remain low no matter
+ * what.  If it goes high, it will generate an RF field even when in
+ * passive target mode.  TI has indicated that the chip will work okay
+ * when EN2 is left low.  The 'en2-rf-quirk' device tree property
+ * indicates that trf7970a currently being used has the erratum and
+ * that EN2 must be kept low.
  *
  * Timeouts are implemented using the delayed workqueue kernel facility.
  * Timeouts are required so things don't hang when there is no response
@@ -56,7 +62,7 @@
  * way to abort a command that's already been sent to the tag is so turn
  * off power to the tag.  If we do that, though, we'd have to go through
  * the entire anticollision procedure again but the digital layer doesn't
- * support that.  So, if an abort is received before trf7970a_in_send_cmd()
+ * support that.  So, if an abort is received before trf7970a_send_cmd()
  * has sent the command to the tag, it simply returns -ECANCELED.  If the
  * command has already been sent to the tag, then the driver continues
  * normally and recieves the response data (or error) but just before
@@ -77,6 +83,13 @@
  * been received and there isn't an error).  The delay is 20 ms since delays
  * of ~16 ms have been observed during testing.
  *
+ * When transmitting a frame larger than the FIFO size (127 bytes), the
+ * driver will wait 20 ms for the FIFO to drain past the low-watermark
+ * and generate an interrupt.  The low-watermark set to 32 bytes so the
+ * interrupt should fire after 127 - 32 = 95 bytes have been sent.  At
+ * the lowest possible bit rate (6.62 kbps for 15693), it will take up
+ * to ~14.35 ms so 20 ms is used for the timeout.
+ *
  * Type 2 write and sector select commands respond with a 4-bit ACK or NACK.
  * Having only 4 bits in the FIFO won't normally generate an interrupt so
  * driver enables the '4_bit_RX' bit of the Special Functions register 1
@@ -99,40 +112,43 @@
  * Note under Table 1-1 in section 1.6 of
  * http://www.ti.com/lit/ug/scbu011/scbu011.pdf, that wait should be at least
  * 10 ms for TI Tag-it HF-I tags; however testing has shown that is not long
- * enough.  For this reason, the driver waits 20 ms which seems to work
+ * enough so 20 ms is used.  So the timer is set to 40 ms - 20 ms to drain
+ * up to 127 bytes in the FIFO at the lowest bit rate plus another 20 ms to
+ * ensure the wait is long enough before sending the EOF.  This seems to work
  * reliably.
  */
 
 #define TRF7970A_SUPPORTED_PROTOCOLS \
                 (NFC_PROTO_MIFARE_MASK | NFC_PROTO_ISO14443_MASK |      \
                  NFC_PROTO_ISO14443_B_MASK | NFC_PROTO_FELICA_MASK | \
-                 NFC_PROTO_ISO15693_MASK)
+                 NFC_PROTO_ISO15693_MASK | NFC_PROTO_NFC_DEP_MASK)
 
 #define TRF7970A_AUTOSUSPEND_DELAY              30000 /* 30 seconds */
 
-/* TX data must be prefixed with a FIFO reset cmd, a cmd that depends
- * on what the current framing is, the address of the TX length byte 1
- * register (0x1d), and the 2 byte length of the data to be transmitted.
- * That totals 5 bytes.
- */
-#define TRF7970A_TX_SKB_HEADROOM                5
-
 #define TRF7970A_RX_SKB_ALLOC_SIZE              256
 
-#define TRF7970A_FIFO_SIZE                      128
+#define TRF7970A_FIFO_SIZE                      127
 
 /* TX length is 3 nibbles long ==> 4KB - 1 bytes max */
 #define TRF7970A_TX_MAX                         (4096 - 1)
 
+#define TRF7970A_WAIT_FOR_TX_IRQ                20
 #define TRF7970A_WAIT_FOR_RX_DATA_TIMEOUT       20
-#define TRF7970A_WAIT_FOR_FIFO_DRAIN_TIMEOUT    3
-#define TRF7970A_WAIT_TO_ISSUE_ISO15693_EOF     20
+#define TRF7970A_WAIT_FOR_FIFO_DRAIN_TIMEOUT    20
+#define TRF7970A_WAIT_TO_ISSUE_ISO15693_EOF     40
+
+/* Guard times for various RF technologies (in us) */
+#define TRF7970A_GUARD_TIME_NFCA                5000
+#define TRF7970A_GUARD_TIME_NFCB                5000
+#define TRF7970A_GUARD_TIME_NFCF                20000
+#define TRF7970A_GUARD_TIME_15693               1000
 
 /* Quirks */
 /* Erratum: When reading IRQ Status register on trf7970a, we must issue a
  * read continuous command for IRQ Status and Collision Position registers.
  */
-#define TRF7970A_QUIRK_IRQ_STATUS_READ_ERRATA   BIT(0)
+#define TRF7970A_QUIRK_IRQ_STATUS_READ          BIT(0)
+#define TRF7970A_QUIRK_EN2_MUST_STAY_LOW        BIT(1)
 
 /* Direct commands */
 #define TRF7970A_CMD_IDLE                       0x00
@@ -149,8 +165,8 @@
 #define TRF7970A_CMD_CLOSE_SLOT                 0x15
 #define TRF7970A_CMD_BLOCK_RX                   0x16
 #define TRF7970A_CMD_ENABLE_RX                  0x17
-#define TRF7970A_CMD_TEST_EXT_RF                0x18
-#define TRF7970A_CMD_TEST_INT_RF                0x19
+#define TRF7970A_CMD_TEST_INT_RF                0x18
+#define TRF7970A_CMD_TEST_EXT_RF                0x19
 #define TRF7970A_CMD_RX_GAIN_ADJUST             0x1a
 
 /* Bits determining whether its a direct command or register R/W,
@@ -224,6 +240,15 @@
 #define TRF7970A_ISO_CTRL_14443B_848            0x0f
 #define TRF7970A_ISO_CTRL_FELICA_212            0x1a
 #define TRF7970A_ISO_CTRL_FELICA_424            0x1b
+#define TRF7970A_ISO_CTRL_NFC_NFCA_106          0x01
+#define TRF7970A_ISO_CTRL_NFC_NFCF_212          0x02
+#define TRF7970A_ISO_CTRL_NFC_NFCF_424          0x03
+#define TRF7970A_ISO_CTRL_NFC_CE_14443A         0x00
+#define TRF7970A_ISO_CTRL_NFC_CE_14443B         0x01
+#define TRF7970A_ISO_CTRL_NFC_CE                BIT(2)
+#define TRF7970A_ISO_CTRL_NFC_ACTIVE            BIT(3)
+#define TRF7970A_ISO_CTRL_NFC_INITIATOR         BIT(4)
+#define TRF7970A_ISO_CTRL_NFC_NFC_CE_MODE       BIT(5)
 #define TRF7970A_ISO_CTRL_RFID                  BIT(5)
 #define TRF7970A_ISO_CTRL_DIR_MODE              BIT(6)
 #define TRF7970A_ISO_CTRL_RX_CRC_N              BIT(7)  /* true == No CRC */
@@ -249,12 +274,32 @@
 #define TRF7970A_MODULATOR_EN_OOK               BIT(6)
 #define TRF7970A_MODULATOR_27MHZ                BIT(7)
 
+#define TRF7970A_RX_SPECIAL_SETTINGS_NO_LIM     BIT(0)
+#define TRF7970A_RX_SPECIAL_SETTINGS_AGCR       BIT(1)
+#define TRF7970A_RX_SPECIAL_SETTINGS_GD_0DB     (0x0 << 2)
+#define TRF7970A_RX_SPECIAL_SETTINGS_GD_5DB     (0x1 << 2)
+#define TRF7970A_RX_SPECIAL_SETTINGS_GD_10DB    (0x2 << 2)
+#define TRF7970A_RX_SPECIAL_SETTINGS_GD_15DB    (0x3 << 2)
+#define TRF7970A_RX_SPECIAL_SETTINGS_HBT        BIT(4)
+#define TRF7970A_RX_SPECIAL_SETTINGS_M848       BIT(5)
+#define TRF7970A_RX_SPECIAL_SETTINGS_C424       BIT(6)
+#define TRF7970A_RX_SPECIAL_SETTINGS_C212       BIT(7)
+
+#define TRF7970A_REG_IO_CTRL_VRS(v)             ((v) & 0x07)
+#define TRF7970A_REG_IO_CTRL_IO_LOW             BIT(5)
+#define TRF7970A_REG_IO_CTRL_EN_EXT_PA          BIT(6)
+#define TRF7970A_REG_IO_CTRL_AUTO_REG           BIT(7)
+
 /* IRQ Status Register Bits */
 #define TRF7970A_IRQ_STATUS_NORESP              BIT(0) /* ISO15693 only */
+#define TRF7970A_IRQ_STATUS_NFC_COL_ERROR       BIT(0)
 #define TRF7970A_IRQ_STATUS_COL                 BIT(1)
 #define TRF7970A_IRQ_STATUS_FRAMING_EOF_ERROR   BIT(2)
+#define TRF7970A_IRQ_STATUS_NFC_RF              BIT(2)
 #define TRF7970A_IRQ_STATUS_PARITY_ERROR        BIT(3)
+#define TRF7970A_IRQ_STATUS_NFC_SDD             BIT(3)
 #define TRF7970A_IRQ_STATUS_CRC_ERROR           BIT(4)
+#define TRF7970A_IRQ_STATUS_NFC_PROTO_ERROR     BIT(4)
 #define TRF7970A_IRQ_STATUS_FIFO                BIT(5)
 #define TRF7970A_IRQ_STATUS_SRX                 BIT(6)
 #define TRF7970A_IRQ_STATUS_TX                  BIT(7)
@@ -265,6 +310,10 @@
                  TRF7970A_IRQ_STATUS_PARITY_ERROR |             \
                  TRF7970A_IRQ_STATUS_CRC_ERROR)
 
+#define TRF7970A_RSSI_OSC_STATUS_RSSI_MASK      (BIT(2) | BIT(1) | BIT(0))
+#define TRF7970A_RSSI_OSC_STATUS_RSSI_X_MASK    (BIT(5) | BIT(4) | BIT(3))
+#define TRF7970A_RSSI_OSC_STATUS_RSSI_OSC_OK    BIT(6)
+
 #define TRF7970A_SPECIAL_FCN_REG1_COL_7_6               BIT(0)
 #define TRF7970A_SPECIAL_FCN_REG1_14_ANTICOLL           BIT(1)
 #define TRF7970A_SPECIAL_FCN_REG1_4_BIT_RX              BIT(2)
@@ -281,6 +330,49 @@
 #define TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS_WLL_16       0x2
 #define TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS_WLL_32       0x3
 
+#define TRF7970A_NFC_LOW_FIELD_LEVEL_RFDET(v)   ((v) & 0x07)
+#define TRF7970A_NFC_LOW_FIELD_LEVEL_CLEX_DIS   BIT(7)
+
+#define TRF7970A_NFC_TARGET_LEVEL_RFDET(v)      ((v) & 0x07)
+#define TRF7970A_NFC_TARGET_LEVEL_HI_RF         BIT(3)
+#define TRF7970A_NFC_TARGET_LEVEL_SDD_EN        BIT(3)
+#define TRF7970A_NFC_TARGET_LEVEL_LD_S_4BYTES   (0x0 << 6)
+#define TRF7970A_NFC_TARGET_LEVEL_LD_S_7BYTES   (0x1 << 6)
+#define TRF7970A_NFC_TARGET_LEVEL_LD_S_10BYTES  (0x2 << 6)
+
+#define TRF79070A_NFC_TARGET_PROTOCOL_NFCBR_106         BIT(0)
+#define TRF79070A_NFC_TARGET_PROTOCOL_NFCBR_212         BIT(1)
+#define TRF79070A_NFC_TARGET_PROTOCOL_NFCBR_424         (BIT(0) | BIT(1))
+#define TRF79070A_NFC_TARGET_PROTOCOL_PAS_14443B        BIT(2)
+#define TRF79070A_NFC_TARGET_PROTOCOL_PAS_106           BIT(3)
+#define TRF79070A_NFC_TARGET_PROTOCOL_FELICA            BIT(4)
+#define TRF79070A_NFC_TARGET_PROTOCOL_RF_L              BIT(6)
+#define TRF79070A_NFC_TARGET_PROTOCOL_RF_H              BIT(7)
+
+#define TRF79070A_NFC_TARGET_PROTOCOL_106A              \
+         (TRF79070A_NFC_TARGET_PROTOCOL_RF_H |          \
+          TRF79070A_NFC_TARGET_PROTOCOL_RF_L |          \
+          TRF79070A_NFC_TARGET_PROTOCOL_PAS_106 |       \
+          TRF79070A_NFC_TARGET_PROTOCOL_NFCBR_106)
+
+#define TRF79070A_NFC_TARGET_PROTOCOL_106B              \
+         (TRF79070A_NFC_TARGET_PROTOCOL_RF_H |          \
+          TRF79070A_NFC_TARGET_PROTOCOL_RF_L |          \
+          TRF79070A_NFC_TARGET_PROTOCOL_PAS_14443B |    \
+          TRF79070A_NFC_TARGET_PROTOCOL_NFCBR_106)
+
+#define TRF79070A_NFC_TARGET_PROTOCOL_212F              \
+         (TRF79070A_NFC_TARGET_PROTOCOL_RF_H |          \
+          TRF79070A_NFC_TARGET_PROTOCOL_RF_L |          \
+          TRF79070A_NFC_TARGET_PROTOCOL_FELICA |        \
+          TRF79070A_NFC_TARGET_PROTOCOL_NFCBR_212)
+
+#define TRF79070A_NFC_TARGET_PROTOCOL_424F              \
+         (TRF79070A_NFC_TARGET_PROTOCOL_RF_H |          \
+          TRF79070A_NFC_TARGET_PROTOCOL_RF_L |          \
+          TRF79070A_NFC_TARGET_PROTOCOL_FELICA |        \
+          TRF79070A_NFC_TARGET_PROTOCOL_NFCBR_424)
+
 #define TRF7970A_FIFO_STATUS_OVERFLOW           BIT(7)
 
 /* NFC (ISO/IEC 14443A) Type 2 Tag commands */
@@ -317,13 +409,16 @@
                 (ISO15693_REQ_FLAG_SUB_CARRIER | ISO15693_REQ_FLAG_DATA_RATE)
 
 enum trf7970a_state {
-        TRF7970A_ST_OFF,
+        TRF7970A_ST_PWR_OFF,
+        TRF7970A_ST_RF_OFF,
         TRF7970A_ST_IDLE,
         TRF7970A_ST_IDLE_RX_BLOCKED,
         TRF7970A_ST_WAIT_FOR_TX_FIFO,
         TRF7970A_ST_WAIT_FOR_RX_DATA,
         TRF7970A_ST_WAIT_FOR_RX_DATA_CONT,
         TRF7970A_ST_WAIT_TO_ISSUE_EOF,
+        TRF7970A_ST_LISTENING,
+        TRF7970A_ST_LISTENING_MD,
         TRF7970A_ST_MAX
 };
 
@@ -334,6 +429,7 @@ struct trf7970a {
         struct regulator                *regulator;
         struct nfc_digital_dev          *ddev;
         u32                             quirks;
+        bool                            is_initiator;
         bool                            aborting;
         struct sk_buff                  *tx_skb;
         struct sk_buff                  *rx_skb;
@@ -344,8 +440,10 @@ struct trf7970a {
         u8                              iso_ctrl_tech;
         u8                              modulator_sys_clk_ctrl;
         u8                              special_fcn_reg1;
+        unsigned int                    guard_time;
         int                             technology;
         int                             framing;
+        u8                              md_rf_tech;
         u8                              tx_cmd;
         bool                            issue_eof;
         int                             en2_gpio;
@@ -386,15 +484,28 @@ static int trf7970a_read(struct trf7970a *trf, u8 reg, u8 *val)
         return ret;
 }
 
-static int trf7970a_read_cont(struct trf7970a *trf, u8 reg,
-                u8 *buf, size_t len)
+static int trf7970a_read_cont(struct trf7970a *trf, u8 reg, u8 *buf, size_t len)
 {
         u8 addr = reg | TRF7970A_CMD_BIT_RW | TRF7970A_CMD_BIT_CONTINUOUS;
+        struct spi_transfer t[2];
+        struct spi_message m;
         int ret;
 
         dev_dbg(trf->dev, "read_cont(0x%x, %zd)\n", addr, len);
 
-        ret = spi_write_then_read(trf->spi, &addr, 1, buf, len);
+        spi_message_init(&m);
+
+        memset(&t, 0, sizeof(t));
+
+        t[0].tx_buf = &addr;
+        t[0].len = sizeof(addr);
+        spi_message_add_tail(&t[0], &m);
+
+        t[1].rx_buf = buf;
+        t[1].len = len;
+        spi_message_add_tail(&t[1], &m);
+
+        ret = spi_sync(trf->spi, &m);
         if (ret)
                 dev_err(trf->dev, "%s - addr: 0x%x, ret: %d\n", __func__, addr,
                                 ret);
@@ -424,7 +535,7 @@ static int trf7970a_read_irqstatus(struct trf7970a *trf, u8 *status)
 
         addr = TRF7970A_IRQ_STATUS | TRF7970A_CMD_BIT_RW;
 
-        if (trf->quirks & TRF7970A_QUIRK_IRQ_STATUS_READ_ERRATA) {
+        if (trf->quirks & TRF7970A_QUIRK_IRQ_STATUS_READ) {
                 addr |= TRF7970A_CMD_BIT_CONTINUOUS;
                 ret = spi_write_then_read(trf->spi, &addr, 1, buf, 2);
         } else {
@@ -440,10 +551,60 @@ static int trf7970a_read_irqstatus(struct trf7970a *trf, u8 *status)
         return ret;
 }
 
-static void trf7970a_send_upstream(struct trf7970a *trf)
+static int trf7970a_read_target_proto(struct trf7970a *trf, u8 *target_proto)
 {
-        u8 rssi;
+        int ret;
+        u8 buf[2];
+        u8 addr;
 
+        addr = TRF79070A_NFC_TARGET_PROTOCOL | TRF7970A_CMD_BIT_RW |
+                TRF7970A_CMD_BIT_CONTINUOUS;
+
+        ret = spi_write_then_read(trf->spi, &addr, 1, buf, 2);
+        if (ret)
+                dev_err(trf->dev, "%s - target_proto: Read failed: %d\n",
+                                __func__, ret);
+        else
+                *target_proto = buf[0];
+
+        return ret;
+}
+
+static int trf7970a_mode_detect(struct trf7970a *trf, u8 *rf_tech)
+{
+        int ret;
+        u8 target_proto, tech;
+
+        ret = trf7970a_read_target_proto(trf, &target_proto);
+        if (ret)
+                return ret;
+
+        switch (target_proto) {
+        case TRF79070A_NFC_TARGET_PROTOCOL_106A:
+                tech = NFC_DIGITAL_RF_TECH_106A;
+                break;
+        case TRF79070A_NFC_TARGET_PROTOCOL_106B:
+                tech = NFC_DIGITAL_RF_TECH_106B;
+                break;
+        case TRF79070A_NFC_TARGET_PROTOCOL_212F:
+                tech = NFC_DIGITAL_RF_TECH_212F;
+                break;
+        case TRF79070A_NFC_TARGET_PROTOCOL_424F:
+                tech = NFC_DIGITAL_RF_TECH_424F;
+                break;
+        default:
+                dev_dbg(trf->dev, "%s - mode_detect: target_proto: 0x%x\n",
+                                __func__, target_proto);
+                return -EIO;
+        }
+
+        *rf_tech = tech;
+
+        return ret;
+}
+
+static void trf7970a_send_upstream(struct trf7970a *trf)
+{
         dev_kfree_skb_any(trf->tx_skb);
         trf->tx_skb = NULL;
 
@@ -452,13 +613,6 @@ static void trf7970a_send_upstream(struct trf7970a *trf)
                                 16, 1, trf->rx_skb->data, trf->rx_skb->len,
                                 false);
 
-        /* According to the manual it is "good form" to reset the fifo and
-         * read the RSSI levels & oscillator status register here.  It doesn't
-         * explain why.
-         */
-        trf7970a_cmd(trf, TRF7970A_CMD_FIFO_RESET);
-        trf7970a_read(trf, TRF7970A_RSSI_OSC_STATUS, &rssi);
-
         trf->state = TRF7970A_ST_IDLE;
 
         if (trf->aborting) {
@@ -481,6 +635,8 @@ static void trf7970a_send_err_upstream(struct trf7970a *trf, int errno)
 {
         dev_dbg(trf->dev, "Error - state: %d, errno: %d\n", trf->state, errno);
 
+        cancel_delayed_work(&trf->timeout_work);
+
         kfree_skb(trf->rx_skb);
         trf->rx_skb = ERR_PTR(errno);
 
@@ -488,15 +644,29 @@ static void trf7970a_send_err_upstream(struct trf7970a *trf, int errno)
 }
 
 static int trf7970a_transmit(struct trf7970a *trf, struct sk_buff *skb,
-                unsigned int len)
+                unsigned int len, u8 *prefix, unsigned int prefix_len)
 {
+        struct spi_transfer t[2];
+        struct spi_message m;
         unsigned int timeout;
         int ret;
 
         print_hex_dump_debug("trf7970a tx data: ", DUMP_PREFIX_NONE,
                         16, 1, skb->data, len, false);
 
-        ret = spi_write(trf->spi, skb->data, len);
+        spi_message_init(&m);
+
+        memset(&t, 0, sizeof(t));
+
+        t[0].tx_buf = prefix;
+        t[0].len = prefix_len;
+        spi_message_add_tail(&t[0], &m);
+
+        t[1].tx_buf = skb->data;
+        t[1].len = len;
+        spi_message_add_tail(&t[1], &m);
+
+        ret = spi_sync(trf->spi, &m);
         if (ret) {
                 dev_err(trf->dev, "%s - Can't send tx data: %d\n", __func__,
                                 ret);
@@ -514,7 +684,11 @@ static int trf7970a_transmit(struct trf7970a *trf, struct sk_buff *skb,
                         timeout = TRF7970A_WAIT_TO_ISSUE_ISO15693_EOF;
                 } else {
                         trf->state = TRF7970A_ST_WAIT_FOR_RX_DATA;
-                        timeout = trf->timeout;
+
+                        if (!trf->timeout)
+                                timeout = TRF7970A_WAIT_FOR_TX_IRQ;
+                        else
+                                timeout = trf->timeout;
                 }
         }
 
@@ -532,6 +706,7 @@ static void trf7970a_fill_fifo(struct trf7970a *trf)
         unsigned int len;
         int ret;
         u8 fifo_bytes;
+        u8 prefix;
 
         ret = trf7970a_read(trf, TRF7970A_FIFO_STATUS, &fifo_bytes);
         if (ret) {
@@ -541,18 +716,21 @@ static void trf7970a_fill_fifo(struct trf7970a *trf)
 
         dev_dbg(trf->dev, "Filling FIFO - fifo_bytes: 0x%x\n", fifo_bytes);
 
-        if (fifo_bytes & TRF7970A_FIFO_STATUS_OVERFLOW) {
-                dev_err(trf->dev, "%s - fifo overflow: 0x%x\n", __func__,
-                                fifo_bytes);
-                trf7970a_send_err_upstream(trf, -EIO);
-                return;
-        }
+        fifo_bytes &= ~TRF7970A_FIFO_STATUS_OVERFLOW;
 
         /* Calculate how much more data can be written to the fifo */
         len = TRF7970A_FIFO_SIZE - fifo_bytes;
+        if (!len) {
+                schedule_delayed_work(&trf->timeout_work,
+                        msecs_to_jiffies(TRF7970A_WAIT_FOR_FIFO_DRAIN_TIMEOUT));
+                return;
+        }
+
         len = min(skb->len, len);
 
-        ret = trf7970a_transmit(trf, skb, len);
+        prefix = TRF7970A_CMD_BIT_CONTINUOUS | TRF7970A_FIFO_IO_REGISTER;
+
+        ret = trf7970a_transmit(trf, skb, len, &prefix, sizeof(prefix));
         if (ret)
                 trf7970a_send_err_upstream(trf, ret);
 }
@@ -576,16 +754,11 @@ static void trf7970a_drain_fifo(struct trf7970a *trf, u8 status)
 
         dev_dbg(trf->dev, "Draining FIFO - fifo_bytes: 0x%x\n", fifo_bytes);
 
+        fifo_bytes &= ~TRF7970A_FIFO_STATUS_OVERFLOW;
+
         if (!fifo_bytes)
                 goto no_rx_data;
 
-        if (fifo_bytes & TRF7970A_FIFO_STATUS_OVERFLOW) {
-                dev_err(trf->dev, "%s - fifo overflow: 0x%x\n", __func__,
-                                fifo_bytes);
-                trf7970a_send_err_upstream(trf, -EIO);
-                return;
-        }
-
         if (fifo_bytes > skb_tailroom(skb)) {
                 skb = skb_copy_expand(skb, skb_headroom(skb),
                                 max_t(int, fifo_bytes,
@@ -615,6 +788,21 @@ static void trf7970a_drain_fifo(struct trf7970a *trf, u8 status)
                 status = TRF7970A_IRQ_STATUS_SRX;
         } else {
                 trf->state = TRF7970A_ST_WAIT_FOR_RX_DATA_CONT;
+
+                ret = trf7970a_read(trf, TRF7970A_FIFO_STATUS, &fifo_bytes);
+                if (ret) {
+                        trf7970a_send_err_upstream(trf, ret);
+                        return;
+                }
+
+                fifo_bytes &= ~TRF7970A_FIFO_STATUS_OVERFLOW;
+
+                /* If there are bytes in the FIFO, set status to '0' so
+                 * the if stmt below doesn't fire and the driver will wait
+                 * for the trf7970a to generate another RX interrupt.
+                 */
+                if (fifo_bytes)
+                        status = 0;
         }
 
 no_rx_data:
@@ -634,11 +822,11 @@ static irqreturn_t trf7970a_irq(int irq, void *dev_id)
 {
         struct trf7970a *trf = dev_id;
         int ret;
-        u8 status;
+        u8 status, fifo_bytes, iso_ctrl;
 
         mutex_lock(&trf->lock);
 
-        if (trf->state == TRF7970A_ST_OFF) {
+        if (trf->state == TRF7970A_ST_RF_OFF) {
                 mutex_unlock(&trf->lock);
                 return IRQ_NONE;
         }
@@ -660,12 +848,12 @@ static irqreturn_t trf7970a_irq(int irq, void *dev_id)
         switch (trf->state) {
         case TRF7970A_ST_IDLE:
         case TRF7970A_ST_IDLE_RX_BLOCKED:
-                /* If getting interrupts caused by RF noise, turn off the
-                 * receiver to avoid unnecessary interrupts.  It will be
-                 * turned back on in trf7970a_in_send_cmd() when the next
-                 * command is issued.
+                /* If initiator and getting interrupts caused by RF noise,
+                 * turn off the receiver to avoid unnecessary interrupts.
+                 * It will be turned back on in trf7970a_send_cmd() when
+                 * the next command is issued.
                  */
-                if (status & TRF7970A_IRQ_STATUS_ERROR) {
+                if (trf->is_initiator && (status & TRF7970A_IRQ_STATUS_ERROR)) {
                         trf7970a_cmd(trf, TRF7970A_CMD_BLOCK_RX);
                         trf->state = TRF7970A_ST_IDLE_RX_BLOCKED;
                 }
@@ -687,8 +875,68 @@ static irqreturn_t trf7970a_irq(int irq, void *dev_id)
                         trf->ignore_timeout =
                                 !cancel_delayed_work(&trf->timeout_work);
                         trf7970a_drain_fifo(trf, status);
-                } else if (status == TRF7970A_IRQ_STATUS_TX) {
+                } else if (status & TRF7970A_IRQ_STATUS_FIFO) {
+                        ret = trf7970a_read(trf, TRF7970A_FIFO_STATUS,
+                                        &fifo_bytes);
+
+                        fifo_bytes &= ~TRF7970A_FIFO_STATUS_OVERFLOW;
+
+                        if (ret)
+                                trf7970a_send_err_upstream(trf, ret);
+                        else if (!fifo_bytes)
+                                trf7970a_cmd(trf, TRF7970A_CMD_FIFO_RESET);
+                } else if ((status == TRF7970A_IRQ_STATUS_TX) ||
+                                (!trf->is_initiator &&
+                                 (status == (TRF7970A_IRQ_STATUS_TX |
+                                             TRF7970A_IRQ_STATUS_NFC_RF)))) {
                         trf7970a_cmd(trf, TRF7970A_CMD_FIFO_RESET);
+
+                        if (!trf->timeout) {
+                                trf->ignore_timeout = !cancel_delayed_work(
+                                                &trf->timeout_work);
+                                trf->rx_skb = ERR_PTR(0);
+                                trf7970a_send_upstream(trf);
+                                break;
+                        }
+
+                        if (trf->is_initiator)
+                                break;
+
+                        iso_ctrl = trf->iso_ctrl;
+
+                        switch (trf->framing) {
+                        case NFC_DIGITAL_FRAMING_NFCA_STANDARD:
+                                trf->tx_cmd = TRF7970A_CMD_TRANSMIT_NO_CRC;
+                                iso_ctrl |= TRF7970A_ISO_CTRL_RX_CRC_N;
+                                trf->iso_ctrl = 0xff; /* Force ISO_CTRL write */
+                                break;
+                        case NFC_DIGITAL_FRAMING_NFCA_STANDARD_WITH_CRC_A:
+                                trf->tx_cmd = TRF7970A_CMD_TRANSMIT;
+                                iso_ctrl &= ~TRF7970A_ISO_CTRL_RX_CRC_N;
+                                trf->iso_ctrl = 0xff; /* Force ISO_CTRL write */
+                                break;
+                        case NFC_DIGITAL_FRAMING_NFCA_ANTICOL_COMPLETE:
+                                ret = trf7970a_write(trf,
+                                        TRF7970A_SPECIAL_FCN_REG1,
+                                        TRF7970A_SPECIAL_FCN_REG1_14_ANTICOLL);
+                                if (ret)
+                                        goto err_unlock_exit;
+
+                                trf->special_fcn_reg1 =
+                                        TRF7970A_SPECIAL_FCN_REG1_14_ANTICOLL;
+                                break;
+                        default:
+                                break;
+                        }
+
+                        if (iso_ctrl != trf->iso_ctrl) {
+                                ret = trf7970a_write(trf, TRF7970A_ISO_CTRL,
+                                                iso_ctrl);
+                                if (ret)
+                                        goto err_unlock_exit;
+
+                                trf->iso_ctrl = iso_ctrl;
+                        }
                 } else {
                         trf7970a_send_err_upstream(trf, -EIO);
                 }
@@ -697,11 +945,37 @@ static irqreturn_t trf7970a_irq(int irq, void *dev_id)
                 if (status != TRF7970A_IRQ_STATUS_TX)
                         trf7970a_send_err_upstream(trf, -EIO);
                 break;
+        case TRF7970A_ST_LISTENING:
+                if (status & TRF7970A_IRQ_STATUS_SRX) {
+                        trf->ignore_timeout =
+                                !cancel_delayed_work(&trf->timeout_work);
+                        trf7970a_drain_fifo(trf, status);
+                } else if (!(status & TRF7970A_IRQ_STATUS_NFC_RF)) {
+                        trf7970a_send_err_upstream(trf, -EIO);
+                }
+                break;
+        case TRF7970A_ST_LISTENING_MD:
+                if (status & TRF7970A_IRQ_STATUS_SRX) {
+                        trf->ignore_timeout =
+                                !cancel_delayed_work(&trf->timeout_work);
+
+                        ret = trf7970a_mode_detect(trf, &trf->md_rf_tech);
+                        if (ret) {
+                                trf7970a_send_err_upstream(trf, ret);
+                        } else {
+                                trf->state = TRF7970A_ST_LISTENING;
+                                trf7970a_drain_fifo(trf, status);
+                        }
+                } else if (!(status & TRF7970A_IRQ_STATUS_NFC_RF)) {
+                        trf7970a_send_err_upstream(trf, -EIO);
+                }
+                break;
         default:
                 dev_err(trf->dev, "%s - Driver in invalid state: %d\n",
                                 __func__, trf->state);
         }
 
+err_unlock_exit:
         mutex_unlock(&trf->lock);
         return IRQ_HANDLED;
 }
@@ -742,7 +1016,7 @@ static void trf7970a_timeout_work_handler(struct work_struct *work)
         if (trf->ignore_timeout)
                 trf->ignore_timeout = false;
         else if (trf->state == TRF7970A_ST_WAIT_FOR_RX_DATA_CONT)
-                trf7970a_send_upstream(trf); /* No more rx data so send up */
+                trf7970a_drain_fifo(trf, TRF7970A_IRQ_STATUS_SRX);
         else if (trf->state == TRF7970A_ST_WAIT_TO_ISSUE_EOF)
                 trf7970a_issue_eof(trf);
         else
@@ -765,11 +1039,16 @@ static int trf7970a_init(struct trf7970a *trf)
         if (ret)
                 goto err_out;
 
-        /* Must clear NFC Target Detection Level reg due to erratum */
-        ret = trf7970a_write(trf, TRF7970A_NFC_TARGET_LEVEL, 0);
+        usleep_range(1000, 2000);
+
+        trf->chip_status_ctrl &= ~TRF7970A_CHIP_STATUS_RF_ON;
+
+        ret = trf7970a_write(trf, TRF7970A_MODULATOR_SYS_CLK_CTRL, 0);
         if (ret)
                 goto err_out;
 
+        trf->modulator_sys_clk_ctrl = 0;
+
         ret = trf7970a_write(trf, TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS,
                         TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS_WLH_96 |
                         TRF7970A_ADJUTABLE_FIFO_IRQ_LEVELS_WLL_32);
@@ -792,6 +1071,10 @@ err_out:
 
 static void trf7970a_switch_rf_off(struct trf7970a *trf)
 {
+        if ((trf->state == TRF7970A_ST_PWR_OFF) ||
+                        (trf->state == TRF7970A_ST_RF_OFF))
+                return;
+
         dev_dbg(trf->dev, "Switching rf off\n");
 
         trf->chip_status_ctrl &= ~TRF7970A_CHIP_STATUS_RF_ON;
@@ -799,24 +1082,41 @@ static void trf7970a_switch_rf_off(struct trf7970a *trf)
         trf7970a_write(trf, TRF7970A_CHIP_STATUS_CTRL, trf->chip_status_ctrl);
 
         trf->aborting = false;
-        trf->state = TRF7970A_ST_OFF;
+        trf->state = TRF7970A_ST_RF_OFF;
 
         pm_runtime_mark_last_busy(trf->dev);
         pm_runtime_put_autosuspend(trf->dev);
 }
 
-static void trf7970a_switch_rf_on(struct trf7970a *trf)
+static int trf7970a_switch_rf_on(struct trf7970a *trf)
 {
+        int ret;
+
         dev_dbg(trf->dev, "Switching rf on\n");
 
         pm_runtime_get_sync(trf->dev);
 
+        if (trf->state != TRF7970A_ST_RF_OFF) { /* Power on, RF off */
+                dev_err(trf->dev, "%s - Incorrect state: %d\n", __func__,
+                                trf->state);
+                return -EINVAL;
+        }
+
+        ret = trf7970a_init(trf);
+        if (ret) {
+                dev_err(trf->dev, "%s - Can't initialize: %d\n", __func__, ret);
+                return ret;
+        }
+
         trf->state = TRF7970A_ST_IDLE;
+
+        return 0;
 }
 
 static int trf7970a_switch_rf(struct nfc_digital_dev *ddev, bool on)
 {
         struct trf7970a *trf = nfc_digital_get_drvdata(ddev);
+        int ret = 0;
 
         dev_dbg(trf->dev, "Switching RF - state: %d, on: %d\n", trf->state, on);
 
@@ -824,8 +1124,9 @@ static int trf7970a_switch_rf(struct nfc_digital_dev *ddev, bool on)
 
         if (on) {
                 switch (trf->state) {
-                case TRF7970A_ST_OFF:
-                        trf7970a_switch_rf_on(trf);
+                case TRF7970A_ST_PWR_OFF:
+                case TRF7970A_ST_RF_OFF:
+                        ret = trf7970a_switch_rf_on(trf);
                         break;
                 case TRF7970A_ST_IDLE:
                 case TRF7970A_ST_IDLE_RX_BLOCKED:
@@ -834,26 +1135,31 @@ static int trf7970a_switch_rf(struct nfc_digital_dev *ddev, bool on)
                         dev_err(trf->dev, "%s - Invalid request: %d %d\n",
                                         __func__, trf->state, on);
                         trf7970a_switch_rf_off(trf);
+                        ret = -EINVAL;
                 }
         } else {
                 switch (trf->state) {
-                case TRF7970A_ST_OFF:
+                case TRF7970A_ST_PWR_OFF:
+                case TRF7970A_ST_RF_OFF:
                         break;
                 default:
                         dev_err(trf->dev, "%s - Invalid request: %d %d\n",
                                         __func__, trf->state, on);
+                        ret = -EINVAL;
                         /* FALLTHROUGH */
                 case TRF7970A_ST_IDLE:
                 case TRF7970A_ST_IDLE_RX_BLOCKED:
+                case TRF7970A_ST_WAIT_FOR_RX_DATA:
+                case TRF7970A_ST_WAIT_FOR_RX_DATA_CONT:
                         trf7970a_switch_rf_off(trf);
                 }
         }
 
         mutex_unlock(&trf->lock);
-        return 0;
+        return ret;
 }
 
-static int trf7970a_config_rf_tech(struct trf7970a *trf, int tech)
+static int trf7970a_in_config_rf_tech(struct trf7970a *trf, int tech)
 {
         int ret = 0;
 
@@ -863,22 +1169,27 @@ static int trf7970a_config_rf_tech(struct trf7970a *trf, int tech)
         case NFC_DIGITAL_RF_TECH_106A:
                 trf->iso_ctrl_tech = TRF7970A_ISO_CTRL_14443A_106;
                 trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_DEPTH_OOK;
+                trf->guard_time = TRF7970A_GUARD_TIME_NFCA;
                 break;
         case NFC_DIGITAL_RF_TECH_106B:
                 trf->iso_ctrl_tech = TRF7970A_ISO_CTRL_14443B_106;
                 trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_DEPTH_ASK10;
+                trf->guard_time = TRF7970A_GUARD_TIME_NFCB;
                 break;
         case NFC_DIGITAL_RF_TECH_212F:
                 trf->iso_ctrl_tech = TRF7970A_ISO_CTRL_FELICA_212;
                 trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_DEPTH_ASK10;
+                trf->guard_time = TRF7970A_GUARD_TIME_NFCF;
                 break;
         case NFC_DIGITAL_RF_TECH_424F:
                 trf->iso_ctrl_tech = TRF7970A_ISO_CTRL_FELICA_424;
                 trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_DEPTH_ASK10;
+                trf->guard_time = TRF7970A_GUARD_TIME_NFCF;
                 break;
         case NFC_DIGITAL_RF_TECH_ISO15693:
                 trf->iso_ctrl_tech = TRF7970A_ISO_CTRL_15693_SGL_1OF4_2648;
                 trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_DEPTH_OOK;
+                trf->guard_time = TRF7970A_GUARD_TIME_15693;
                 break;
         default:
                 dev_dbg(trf->dev, "Unsupported rf technology: %d\n", tech);
@@ -887,12 +1198,54 @@ static int trf7970a_config_rf_tech(struct trf7970a *trf, int tech)
 
         trf->technology = tech;
 
+        /* If in initiator mode and not changing the RF tech due to a
+         * PSL sequence (indicated by 'trf->iso_ctrl == 0xff' from
+         * trf7970a_init()), clear the NFC Target Detection Level register
+         * due to erratum.
+         */
+        if (trf->iso_ctrl == 0xff)
+                ret = trf7970a_write(trf, TRF7970A_NFC_TARGET_LEVEL, 0);
+
         return ret;
 }
 
-static int trf7970a_config_framing(struct trf7970a *trf, int framing)
+static int trf7970a_is_rf_field(struct trf7970a *trf, bool *is_rf_field)
+{
+        int ret;
+        u8 rssi;
+
+        ret = trf7970a_write(trf, TRF7970A_CHIP_STATUS_CTRL,
+                        trf->chip_status_ctrl | TRF7970A_CHIP_STATUS_REC_ON);
+        if (ret)
+                return ret;
+
+        ret = trf7970a_cmd(trf, TRF7970A_CMD_TEST_EXT_RF);
+        if (ret)
+                return ret;
+
+        usleep_range(50, 60);
+
+        ret = trf7970a_read(trf, TRF7970A_RSSI_OSC_STATUS, &rssi);
+        if (ret)
+                return ret;
+
+        ret = trf7970a_write(trf, TRF7970A_CHIP_STATUS_CTRL,
+                        trf->chip_status_ctrl);
+        if (ret)
+                return ret;
+
+        if (rssi & TRF7970A_RSSI_OSC_STATUS_RSSI_MASK)
+                *is_rf_field = true;
+        else
+                *is_rf_field = false;
+
+        return 0;
+}
+
+static int trf7970a_in_config_framing(struct trf7970a *trf, int framing)
 {
         u8 iso_ctrl = trf->iso_ctrl_tech;
+        bool is_rf_field = false;
         int ret;
 
         dev_dbg(trf->dev, "framing: %d\n", framing);
@@ -911,6 +1264,8 @@ static int trf7970a_config_framing(struct trf7970a *trf, int framing)
         case NFC_DIGITAL_FRAMING_NFCF_T3T:
         case NFC_DIGITAL_FRAMING_ISO15693_INVENTORY:
         case NFC_DIGITAL_FRAMING_ISO15693_T5T:
+        case NFC_DIGITAL_FRAMING_NFCA_NFC_DEP:
+        case NFC_DIGITAL_FRAMING_NFCF_NFC_DEP:
                 trf->tx_cmd = TRF7970A_CMD_TRANSMIT;
                 iso_ctrl &= ~TRF7970A_ISO_CTRL_RX_CRC_N;
                 break;
@@ -925,6 +1280,15 @@ static int trf7970a_config_framing(struct trf7970a *trf, int framing)
 
         trf->framing = framing;
 
+        if (!(trf->chip_status_ctrl & TRF7970A_CHIP_STATUS_RF_ON)) {
+                ret = trf7970a_is_rf_field(trf, &is_rf_field);
+                if (ret)
+                        return ret;
+
+                if (is_rf_field)
+                        return -EBUSY;
+        }
+
         if (iso_ctrl != trf->iso_ctrl) {
                 ret = trf7970a_write(trf, TRF7970A_ISO_CTRL, iso_ctrl);
                 if (ret)
@@ -947,7 +1311,7 @@ static int trf7970a_config_framing(struct trf7970a *trf, int framing)
 
                 trf->chip_status_ctrl |= TRF7970A_CHIP_STATUS_RF_ON;
 
-                usleep_range(5000, 6000);
+                usleep_range(trf->guard_time, trf->guard_time + 1000);
         }
 
         return 0;
@@ -963,21 +1327,28 @@ static int trf7970a_in_configure_hw(struct nfc_digital_dev *ddev, int type,
 
         mutex_lock(&trf->lock);
 
-        if (trf->state == TRF7970A_ST_OFF)
-                trf7970a_switch_rf_on(trf);
+        trf->is_initiator = true;
+
+        if ((trf->state == TRF7970A_ST_PWR_OFF) ||
+                        (trf->state == TRF7970A_ST_RF_OFF)) {
+                ret = trf7970a_switch_rf_on(trf);
+                if (ret)
+                        goto err_unlock;
+        }
 
         switch (type) {
         case NFC_DIGITAL_CONFIG_RF_TECH:
-                ret = trf7970a_config_rf_tech(trf, param);
+                ret = trf7970a_in_config_rf_tech(trf, param);
                 break;
         case NFC_DIGITAL_CONFIG_FRAMING:
-                ret = trf7970a_config_framing(trf, param);
+                ret = trf7970a_in_config_framing(trf, param);
                 break;
         default:
                 dev_dbg(trf->dev, "Unknown type: %d\n", type);
                 ret = -EINVAL;
         }
 
+err_unlock:
         mutex_unlock(&trf->lock);
         return ret;
 }
@@ -1067,14 +1438,15 @@ static int trf7970a_per_cmd_config(struct trf7970a *trf, struct sk_buff *skb)
         return 0;
 }
 
-static int trf7970a_in_send_cmd(struct nfc_digital_dev *ddev,
+static int trf7970a_send_cmd(struct nfc_digital_dev *ddev,
                 struct sk_buff *skb, u16 timeout,
                 nfc_digital_cmd_complete_t cb, void *arg)
 {
         struct trf7970a *trf = nfc_digital_get_drvdata(ddev);
-        char *prefix;
+        u8 prefix[5];
         unsigned int len;
         int ret;
+        u8 status;
 
         dev_dbg(trf->dev, "New request - state: %d, timeout: %d ms, len: %d\n",
                         trf->state, timeout, skb->len);
@@ -1099,12 +1471,14 @@ static int trf7970a_in_send_cmd(struct nfc_digital_dev *ddev,
                 goto out_err;
         }
 
-        trf->rx_skb = nfc_alloc_recv_skb(TRF7970A_RX_SKB_ALLOC_SIZE,
-                        GFP_KERNEL);
-        if (!trf->rx_skb) {
-                dev_dbg(trf->dev, "Can't alloc rx_skb\n");
-                ret = -ENOMEM;
-                goto out_err;
+        if (timeout) {
+                trf->rx_skb = nfc_alloc_recv_skb(TRF7970A_RX_SKB_ALLOC_SIZE,
+                                GFP_KERNEL);
+                if (!trf->rx_skb) {
+                        dev_dbg(trf->dev, "Can't alloc rx_skb\n");
+                        ret = -ENOMEM;
+                        goto out_err;
+                }
         }
 
         if (trf->state == TRF7970A_ST_IDLE_RX_BLOCKED) {
@@ -1115,9 +1489,11 @@ static int trf7970a_in_send_cmd(struct nfc_digital_dev *ddev,
                 trf->state = TRF7970A_ST_IDLE;
         }
 
-        ret = trf7970a_per_cmd_config(trf, skb);
-        if (ret)
-                goto out_err;
+        if (trf->is_initiator) {
+                ret = trf7970a_per_cmd_config(trf, skb);
+                if (ret)
+                        goto out_err;
+        }
 
         trf->ddev = ddev;
         trf->tx_skb = skb;
@@ -1127,11 +1503,11 @@ static int trf7970a_in_send_cmd(struct nfc_digital_dev *ddev,
         trf->ignore_timeout = false;
 
         len = skb->len;
-        prefix = skb_push(skb, TRF7970A_TX_SKB_HEADROOM);
 
         /* TX data must be prefixed with a FIFO reset cmd, a cmd that depends
          * on what the current framing is, the address of the TX length byte 1
          * register (0x1d), and the 2 byte length of the data to be transmitted.
+         * That totals 5 bytes.
          */
         prefix[0] = TRF7970A_CMD_BIT_CTRL |
                         TRF7970A_CMD_BIT_OPCODE(TRF7970A_CMD_FIFO_RESET);
@@ -1150,9 +1526,12 @@ static int trf7970a_in_send_cmd(struct nfc_digital_dev *ddev,
 
         len = min_t(int, skb->len, TRF7970A_FIFO_SIZE);
 
-        usleep_range(1000, 2000);
+        /* Clear possible spurious interrupt */
+        ret = trf7970a_read_irqstatus(trf, &status);
+        if (ret)
+                goto out_err;
 
-        ret = trf7970a_transmit(trf, skb, len);
+        ret = trf7970a_transmit(trf, skb, len, prefix, sizeof(prefix));
         if (ret) {
                 kfree_skb(trf->rx_skb);
                 trf->rx_skb = NULL;
@@ -1163,46 +1542,272 @@ out_err:
         return ret;
 }
 
-static int trf7970a_tg_configure_hw(struct nfc_digital_dev *ddev,
-                int type, int param)
+static int trf7970a_tg_config_rf_tech(struct trf7970a *trf, int tech)
+{
+        int ret = 0;
+
+        dev_dbg(trf->dev, "rf technology: %d\n", tech);
+
+        switch (tech) {
+        case NFC_DIGITAL_RF_TECH_106A:
+                trf->iso_ctrl_tech = TRF7970A_ISO_CTRL_NFC_NFC_CE_MODE |
+                        TRF7970A_ISO_CTRL_NFC_CE |
+                        TRF7970A_ISO_CTRL_NFC_CE_14443A;
+                trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_DEPTH_OOK;
+                break;
+        case NFC_DIGITAL_RF_TECH_212F:
+                trf->iso_ctrl_tech = TRF7970A_ISO_CTRL_NFC_NFC_CE_MODE |
+                        TRF7970A_ISO_CTRL_NFC_NFCF_212;
+                trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_DEPTH_ASK10;
+                break;
+        case NFC_DIGITAL_RF_TECH_424F:
+                trf->iso_ctrl_tech = TRF7970A_ISO_CTRL_NFC_NFC_CE_MODE |
+                        TRF7970A_ISO_CTRL_NFC_NFCF_424;
+                trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_DEPTH_ASK10;
+                break;
+        default:
+                dev_dbg(trf->dev, "Unsupported rf technology: %d\n", tech);
+                return -EINVAL;
+        }
+
+        trf->technology = tech;
+
+        /* Normally we write the ISO_CTRL register in
+         * trf7970a_tg_config_framing() because the framing can change
+         * the value written.  However, when sending a PSL RES,
+         * digital_tg_send_psl_res_complete() doesn't call
+         * trf7970a_tg_config_framing() so we must write the register
+         * here.
+         */
+        if ((trf->framing == NFC_DIGITAL_FRAMING_NFC_DEP_ACTIVATED) &&
+                        (trf->iso_ctrl_tech != trf->iso_ctrl)) {
+                ret = trf7970a_write(trf, TRF7970A_ISO_CTRL,
+                                trf->iso_ctrl_tech);
+
+                trf->iso_ctrl = trf->iso_ctrl_tech;
+        }
+
+        return ret;
+}
+
+/* Since this is a target routine, several of the framing calls are
+ * made between receiving the request and sending the response so they
+ * should take effect until after the response is sent.  This is accomplished
+ * by skipping the ISO_CTRL register write here and doing it in the interrupt
+ * handler.
+ */
+static int trf7970a_tg_config_framing(struct trf7970a *trf, int framing)
+{
+        u8 iso_ctrl = trf->iso_ctrl_tech;
+        int ret;
+
+        dev_dbg(trf->dev, "framing: %d\n", framing);
+
+        switch (framing) {
+        case NFC_DIGITAL_FRAMING_NFCA_NFC_DEP:
+                trf->tx_cmd = TRF7970A_CMD_TRANSMIT_NO_CRC;
+                iso_ctrl |= TRF7970A_ISO_CTRL_RX_CRC_N;
+                break;
+        case NFC_DIGITAL_FRAMING_NFCA_STANDARD:
+        case NFC_DIGITAL_FRAMING_NFCA_STANDARD_WITH_CRC_A:
+        case NFC_DIGITAL_FRAMING_NFCA_ANTICOL_COMPLETE:
+                /* These ones are applied in the interrupt handler */
+                iso_ctrl = trf->iso_ctrl; /* Don't write to ISO_CTRL yet */
+                break;
+        case NFC_DIGITAL_FRAMING_NFCF_NFC_DEP:
+                trf->tx_cmd = TRF7970A_CMD_TRANSMIT;
+                iso_ctrl &= ~TRF7970A_ISO_CTRL_RX_CRC_N;
+                break;
+        case NFC_DIGITAL_FRAMING_NFC_DEP_ACTIVATED:
+                trf->tx_cmd = TRF7970A_CMD_TRANSMIT;
+                iso_ctrl &= ~TRF7970A_ISO_CTRL_RX_CRC_N;
+                break;
+        default:
+                dev_dbg(trf->dev, "Unsupported Framing: %d\n", framing);
+                return -EINVAL;
+        }
+
+        trf->framing = framing;
+
+        if (iso_ctrl != trf->iso_ctrl) {
+                ret = trf7970a_write(trf, TRF7970A_ISO_CTRL, iso_ctrl);
+                if (ret)
+                        return ret;
+
+                trf->iso_ctrl = iso_ctrl;
+
+                ret = trf7970a_write(trf, TRF7970A_MODULATOR_SYS_CLK_CTRL,
+                                trf->modulator_sys_clk_ctrl);
+                if (ret)
+                        return ret;
+        }
+
+        if (!(trf->chip_status_ctrl & TRF7970A_CHIP_STATUS_RF_ON)) {
+                ret = trf7970a_write(trf, TRF7970A_CHIP_STATUS_CTRL,
+                                trf->chip_status_ctrl |
+                                        TRF7970A_CHIP_STATUS_RF_ON);
+                if (ret)
+                        return ret;
+
+                trf->chip_status_ctrl |= TRF7970A_CHIP_STATUS_RF_ON;
+        }
+
+        return 0;
+}
+
+static int trf7970a_tg_configure_hw(struct nfc_digital_dev *ddev, int type,
+                int param)
+{
+        struct trf7970a *trf = nfc_digital_get_drvdata(ddev);
+        int ret;
+
+        dev_dbg(trf->dev, "Configure hw - type: %d, param: %d\n", type, param);
+
+        mutex_lock(&trf->lock);
+
+        trf->is_initiator = false;
+
+        if ((trf->state == TRF7970A_ST_PWR_OFF) ||
+                        (trf->state == TRF7970A_ST_RF_OFF)) {
+                ret = trf7970a_switch_rf_on(trf);
+                if (ret)
+                        goto err_unlock;
+        }
+
+        switch (type) {
+        case NFC_DIGITAL_CONFIG_RF_TECH:
+                ret = trf7970a_tg_config_rf_tech(trf, param);
+                break;
+        case NFC_DIGITAL_CONFIG_FRAMING:
+                ret = trf7970a_tg_config_framing(trf, param);
+                break;
+        default:
+                dev_dbg(trf->dev, "Unknown type: %d\n", type);
+                ret = -EINVAL;
+        }
+
+err_unlock:
+        mutex_unlock(&trf->lock);
+        return ret;
+}
+
+static int _trf7970a_tg_listen(struct nfc_digital_dev *ddev, u16 timeout,
+                nfc_digital_cmd_complete_t cb, void *arg, bool mode_detect)
 {
         struct trf7970a *trf = nfc_digital_get_drvdata(ddev);
+        int ret;
+
+        mutex_lock(&trf->lock);
 
-        dev_dbg(trf->dev, "Unsupported interface\n");
+        if ((trf->state != TRF7970A_ST_IDLE) &&
+                        (trf->state != TRF7970A_ST_IDLE_RX_BLOCKED)) {
+                dev_err(trf->dev, "%s - Bogus state: %d\n", __func__,
+                                trf->state);
+                ret = -EIO;
+                goto out_err;
+        }
 
-        return -EINVAL;
+        if (trf->aborting) {
+                dev_dbg(trf->dev, "Abort process complete\n");
+                trf->aborting = false;
+                ret = -ECANCELED;
+                goto out_err;
+        }
+
+        trf->rx_skb = nfc_alloc_recv_skb(TRF7970A_RX_SKB_ALLOC_SIZE,
+                        GFP_KERNEL);
+        if (!trf->rx_skb) {
+                dev_dbg(trf->dev, "Can't alloc rx_skb\n");
+                ret = -ENOMEM;
+                goto out_err;
+        }
+
+        ret = trf7970a_write(trf, TRF7970A_RX_SPECIAL_SETTINGS,
+                        TRF7970A_RX_SPECIAL_SETTINGS_HBT |
+                        TRF7970A_RX_SPECIAL_SETTINGS_M848 |
+                        TRF7970A_RX_SPECIAL_SETTINGS_C424 |
+                        TRF7970A_RX_SPECIAL_SETTINGS_C212);
+        if (ret)
+                goto out_err;
+
+        ret = trf7970a_write(trf, TRF7970A_REG_IO_CTRL,
+                        TRF7970A_REG_IO_CTRL_VRS(0x1));
+        if (ret)
+                goto out_err;
+
+        ret = trf7970a_write(trf, TRF7970A_NFC_LOW_FIELD_LEVEL,
+                        TRF7970A_NFC_LOW_FIELD_LEVEL_RFDET(0x3));
+        if (ret)
+                goto out_err;
+
+        ret = trf7970a_write(trf, TRF7970A_NFC_TARGET_LEVEL,
+                        TRF7970A_NFC_TARGET_LEVEL_RFDET(0x7));
+        if (ret)
+                goto out_err;
+
+        trf->ddev = ddev;
+        trf->cb = cb;
+        trf->cb_arg = arg;
+        trf->timeout = timeout;
+        trf->ignore_timeout = false;
+
+        ret = trf7970a_cmd(trf, TRF7970A_CMD_ENABLE_RX);
+        if (ret)
+                goto out_err;
+
+        trf->state = mode_detect ? TRF7970A_ST_LISTENING_MD :
+                                   TRF7970A_ST_LISTENING;
+
+        schedule_delayed_work(&trf->timeout_work, msecs_to_jiffies(timeout));
+
+out_err:
+        mutex_unlock(&trf->lock);
+        return ret;
 }
 
-static int trf7970a_tg_send_cmd(struct nfc_digital_dev *ddev,
-                struct sk_buff *skb, u16 timeout,
+static int trf7970a_tg_listen(struct nfc_digital_dev *ddev, u16 timeout,
                 nfc_digital_cmd_complete_t cb, void *arg)
 {
         struct trf7970a *trf = nfc_digital_get_drvdata(ddev);
 
-        dev_dbg(trf->dev, "Unsupported interface\n");
+        dev_dbg(trf->dev, "Listen - state: %d, timeout: %d ms\n",
+                        trf->state, timeout);
 
-        return -EINVAL;
+        return _trf7970a_tg_listen(ddev, timeout, cb, arg, false);
 }
 
-static int trf7970a_tg_listen(struct nfc_digital_dev *ddev,
+static int trf7970a_tg_listen_md(struct nfc_digital_dev *ddev,
                 u16 timeout, nfc_digital_cmd_complete_t cb, void *arg)
 {
         struct trf7970a *trf = nfc_digital_get_drvdata(ddev);
+        int ret;
+
+        dev_dbg(trf->dev, "Listen MD - state: %d, timeout: %d ms\n",
+                        trf->state, timeout);
 
-        dev_dbg(trf->dev, "Unsupported interface\n");
+        ret = trf7970a_tg_configure_hw(ddev, NFC_DIGITAL_CONFIG_RF_TECH,
+                        NFC_DIGITAL_RF_TECH_106A);
+        if (ret)
+                return ret;
 
-        return -EINVAL;
+        ret = trf7970a_tg_configure_hw(ddev, NFC_DIGITAL_CONFIG_FRAMING,
+                        NFC_DIGITAL_FRAMING_NFCA_NFC_DEP);
+        if (ret)
+                return ret;
+
+        return _trf7970a_tg_listen(ddev, timeout, cb, arg, true);
 }
 
-static int trf7970a_tg_listen_mdaa(struct nfc_digital_dev *ddev,
-                struct digital_tg_mdaa_params *mdaa_params,
-                u16 timeout, nfc_digital_cmd_complete_t cb, void *arg)
+static int trf7970a_tg_get_rf_tech(struct nfc_digital_dev *ddev, u8 *rf_tech)
 {
         struct trf7970a *trf = nfc_digital_get_drvdata(ddev);
 
-        dev_dbg(trf->dev, "Unsupported interface\n");
+        dev_dbg(trf->dev, "Get RF Tech - state: %d, rf_tech: %d\n",
+                        trf->state, trf->md_rf_tech);
 
-        return -EINVAL;
+        *rf_tech = trf->md_rf_tech;
+
+        return 0;
 }
 
 static void trf7970a_abort_cmd(struct nfc_digital_dev *ddev)
@@ -1220,6 +1825,11 @@ static void trf7970a_abort_cmd(struct nfc_digital_dev *ddev)
         case TRF7970A_ST_WAIT_TO_ISSUE_EOF:
                 trf->aborting = true;
                 break;
+        case TRF7970A_ST_LISTENING:
+                trf->ignore_timeout = !cancel_delayed_work(&trf->timeout_work);
+                trf7970a_send_err_upstream(trf, -ECANCELED);
+                dev_dbg(trf->dev, "Abort process complete\n");
+                break;
         default:
                 break;
         }
@@ -1229,15 +1839,114 @@ static void trf7970a_abort_cmd(struct nfc_digital_dev *ddev)
 
 static struct nfc_digital_ops trf7970a_nfc_ops = {
         .in_configure_hw        = trf7970a_in_configure_hw,
-        .in_send_cmd            = trf7970a_in_send_cmd,
+        .in_send_cmd            = trf7970a_send_cmd,
         .tg_configure_hw        = trf7970a_tg_configure_hw,
-        .tg_send_cmd            = trf7970a_tg_send_cmd,
+        .tg_send_cmd            = trf7970a_send_cmd,
         .tg_listen              = trf7970a_tg_listen,
-        .tg_listen_mdaa         = trf7970a_tg_listen_mdaa,
+        .tg_listen_md           = trf7970a_tg_listen_md,
+        .tg_get_rf_tech         = trf7970a_tg_get_rf_tech,
         .switch_rf              = trf7970a_switch_rf,
         .abort_cmd              = trf7970a_abort_cmd,
 };
 
+static int trf7970a_power_up(struct trf7970a *trf)
+{
+        int ret;
+
+        dev_dbg(trf->dev, "Powering up - state: %d\n", trf->state);
+
+        if (trf->state != TRF7970A_ST_PWR_OFF)
+                return 0;
+
+        ret = regulator_enable(trf->regulator);
+        if (ret) {
+                dev_err(trf->dev, "%s - Can't enable VIN: %d\n", __func__, ret);
+                return ret;
+        }
+
+        usleep_range(5000, 6000);
+
+        if (!(trf->quirks & TRF7970A_QUIRK_EN2_MUST_STAY_LOW)) {
+                gpio_set_value(trf->en2_gpio, 1);
+                usleep_range(1000, 2000);
+        }
+
+        gpio_set_value(trf->en_gpio, 1);
+
+        usleep_range(20000, 21000);
+
+        trf->state = TRF7970A_ST_RF_OFF;
+
+        return 0;
+}
+
+static int trf7970a_power_down(struct trf7970a *trf)
+{
+        int ret;
+
+        dev_dbg(trf->dev, "Powering down - state: %d\n", trf->state);
+
+        if (trf->state == TRF7970A_ST_PWR_OFF)
+                return 0;
+
+        if (trf->state != TRF7970A_ST_RF_OFF) {
+                dev_dbg(trf->dev, "Can't power down - not RF_OFF state (%d)\n",
+                                trf->state);
+                return -EBUSY;
+        }
+
+        gpio_set_value(trf->en_gpio, 0);
+        gpio_set_value(trf->en2_gpio, 0);
+
+        ret = regulator_disable(trf->regulator);
+        if (ret)
+                dev_err(trf->dev, "%s - Can't disable VIN: %d\n", __func__,
+                                ret);
+
+        trf->state = TRF7970A_ST_PWR_OFF;
+
+        return ret;
+}
+
+static int trf7970a_startup(struct trf7970a *trf)
+{
+        int ret;
+
+        ret = trf7970a_power_up(trf);
+        if (ret)
+                return ret;
+
+        pm_runtime_set_active(trf->dev);
+        pm_runtime_enable(trf->dev);
+        pm_runtime_mark_last_busy(trf->dev);
+
+        return 0;
+}
+
+static void trf7970a_shutdown(struct trf7970a *trf)
+{
+        switch (trf->state) {
+        case TRF7970A_ST_WAIT_FOR_TX_FIFO:
+        case TRF7970A_ST_WAIT_FOR_RX_DATA:
+        case TRF7970A_ST_WAIT_FOR_RX_DATA_CONT:
+        case TRF7970A_ST_WAIT_TO_ISSUE_EOF:
+        case TRF7970A_ST_LISTENING:
+                trf7970a_send_err_upstream(trf, -ECANCELED);
+                /* FALLTHROUGH */
+        case TRF7970A_ST_IDLE:
+        case TRF7970A_ST_IDLE_RX_BLOCKED:
+                trf7970a_switch_rf_off(trf);
+                break;
+        default:
+                break;
+        }
+
+        pm_runtime_disable(trf->dev);
+        pm_runtime_set_suspended(trf->dev);
+
+        trf7970a_power_down(trf);
+}
+
 static int trf7970a_get_autosuspend_delay(struct device_node *np)
 {
         int autosuspend_delay, ret;
@@ -1246,15 +1955,18 @@ static int trf7970a_get_autosuspend_delay(struct device_node *np)
         if (ret)
                 autosuspend_delay = TRF7970A_AUTOSUSPEND_DELAY;
 
-        of_node_put(np);
-
         return autosuspend_delay;
 }
 
+static int trf7970a_get_vin_voltage_override(struct device_node *np,
+                u32 *vin_uvolts)
+{
+        return of_property_read_u32(np, "vin-voltage-override", vin_uvolts);
+}
+
 static int trf7970a_probe(struct spi_device *spi)
 {
         struct device_node *np = spi->dev.of_node;
-        const struct spi_device_id *id = spi_get_device_id(spi);
         struct trf7970a *trf;
         int uvolts, autosuspend_delay, ret;
 
@@ -1267,14 +1979,22 @@ static int trf7970a_probe(struct spi_device *spi)
         if (!trf)
                 return -ENOMEM;
 
-        trf->state = TRF7970A_ST_OFF;
+        trf->state = TRF7970A_ST_PWR_OFF;
         trf->dev = &spi->dev;
         trf->spi = spi;
-        trf->quirks = id->driver_data;
 
         spi->mode = SPI_MODE_1;
         spi->bits_per_word = 8;
 
+        ret = spi_setup(spi);
+        if (ret < 0) {
+                dev_err(trf->dev, "Can't set up SPI Communication\n");
+                return ret;
+        }
+
+        if (of_property_read_bool(np, "irq-status-read-quirk"))
+                trf->quirks |= TRF7970A_QUIRK_IRQ_STATUS_READ;
+
         /* There are two enable pins - both must be present */
         trf->en_gpio = of_get_named_gpio(np, "ti,enable-gpios", 0);
         if (!gpio_is_valid(trf->en_gpio)) {
@@ -1283,7 +2003,7 @@ static int trf7970a_probe(struct spi_device *spi)
         }
 
         ret = devm_gpio_request_one(trf->dev, trf->en_gpio,
-                        GPIOF_DIR_OUT | GPIOF_INIT_LOW, "EN");
+                        GPIOF_DIR_OUT | GPIOF_INIT_LOW, "trf7970a EN");
         if (ret) {
                 dev_err(trf->dev, "Can't request EN GPIO: %d\n", ret);
                 return ret;
@@ -1296,12 +2016,15 @@ static int trf7970a_probe(struct spi_device *spi)
         }
 
         ret = devm_gpio_request_one(trf->dev, trf->en2_gpio,
-                        GPIOF_DIR_OUT | GPIOF_INIT_LOW, "EN2");
+                        GPIOF_DIR_OUT | GPIOF_INIT_LOW, "trf7970a EN2");
         if (ret) {
                 dev_err(trf->dev, "Can't request EN2 GPIO: %d\n", ret);
                 return ret;
         }
 
+        if (of_property_read_bool(np, "en2-rf-quirk"))
+                trf->quirks |= TRF7970A_QUIRK_EN2_MUST_STAY_LOW;
+
         ret = devm_request_threaded_irq(trf->dev, spi->irq, NULL,
                         trf7970a_irq, IRQF_TRIGGER_RISING | IRQF_ONESHOT,
                         "trf7970a", trf);
@@ -1326,15 +2049,17 @@ static int trf7970a_probe(struct spi_device *spi)
                 goto err_destroy_lock;
         }
 
-        uvolts = regulator_get_voltage(trf->regulator);
+        ret = trf7970a_get_vin_voltage_override(np, &uvolts);
+        if (ret)
+                uvolts = regulator_get_voltage(trf->regulator);
 
         if (uvolts > 4000000)
                 trf->chip_status_ctrl = TRF7970A_CHIP_STATUS_VRS5_3;
 
         trf->ddev = nfc_digital_allocate_device(&trf7970a_nfc_ops,
                         TRF7970A_SUPPORTED_PROTOCOLS,
-                        NFC_DIGITAL_DRV_CAPS_IN_CRC, TRF7970A_TX_SKB_HEADROOM,
-                        0);
+                        NFC_DIGITAL_DRV_CAPS_IN_CRC |
+                                NFC_DIGITAL_DRV_CAPS_TG_CRC, 0, 0);
         if (!trf->ddev) {
                 dev_err(trf->dev, "Can't allocate NFC digital device\n");
                 ret = -ENOMEM;
@@ -1349,19 +2074,23 @@ static int trf7970a_probe(struct spi_device *spi)
 
         pm_runtime_set_autosuspend_delay(trf->dev, autosuspend_delay);
         pm_runtime_use_autosuspend(trf->dev);
-        pm_runtime_enable(trf->dev);
+
+        ret = trf7970a_startup(trf);
+        if (ret)
+                goto err_free_ddev;
 
         ret = nfc_digital_register_device(trf->ddev);
         if (ret) {
                 dev_err(trf->dev, "Can't register NFC digital device: %d\n",
                                 ret);
-                goto err_free_ddev;
+                goto err_shutdown;
         }
 
         return 0;
 
+err_shutdown:
+        trf7970a_shutdown(trf);
 err_free_ddev:
-        pm_runtime_disable(trf->dev);
         nfc_digital_free_device(trf->ddev);
 err_disable_regulator:
         regulator_disable(trf->regulator);
@@ -1376,25 +2105,10 @@ static int trf7970a_remove(struct spi_device *spi)
 
         mutex_lock(&trf->lock);
 
-        switch (trf->state) {
-        case TRF7970A_ST_WAIT_FOR_TX_FIFO:
-        case TRF7970A_ST_WAIT_FOR_RX_DATA:
-        case TRF7970A_ST_WAIT_FOR_RX_DATA_CONT:
-        case TRF7970A_ST_WAIT_TO_ISSUE_EOF:
-                trf7970a_send_err_upstream(trf, -ECANCELED);
-                /* FALLTHROUGH */
-        case TRF7970A_ST_IDLE:
-        case TRF7970A_ST_IDLE_RX_BLOCKED:
-                pm_runtime_put_sync(trf->dev);
-                break;
-        default:
-                break;
-        }
+        trf7970a_shutdown(trf);
 
         mutex_unlock(&trf->lock);
 
-        pm_runtime_disable(trf->dev);
-
         nfc_digital_unregister_device(trf->ddev);
         nfc_digital_free_device(trf->ddev);
 
@@ -1405,72 +2119,83 @@ static int trf7970a_remove(struct spi_device *spi)
         return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
-static int trf7970a_pm_runtime_suspend(struct device *dev)
+#ifdef CONFIG_PM_SLEEP
+static int trf7970a_suspend(struct device *dev)
+{
+        struct spi_device *spi = container_of(dev, struct spi_device, dev);
+        struct trf7970a *trf = spi_get_drvdata(spi);
+
+        dev_dbg(dev, "Suspend\n");
+
+        mutex_lock(&trf->lock);
+
+        trf7970a_shutdown(trf);
+
+        mutex_unlock(&trf->lock);
+
+        return 0;
+}
+
+static int trf7970a_resume(struct device *dev)
 {
         struct spi_device *spi = container_of(dev, struct spi_device, dev);
         struct trf7970a *trf = spi_get_drvdata(spi);
         int ret;
 
-        dev_dbg(dev, "Runtime suspend\n");
+        dev_dbg(dev, "Resume\n");
 
-        if (trf->state != TRF7970A_ST_OFF) {
-                dev_dbg(dev, "Can't suspend - not in OFF state (%d)\n",
-                                trf->state);
-                return -EBUSY;
-        }
+        mutex_lock(&trf->lock);
 
-        gpio_set_value(trf->en_gpio, 0);
-        gpio_set_value(trf->en2_gpio, 0);
+        ret = trf7970a_startup(trf);
 
-        ret = regulator_disable(trf->regulator);
-        if (ret)
-                dev_err(dev, "%s - Can't disable VIN: %d\n", __func__, ret);
+        mutex_unlock(&trf->lock);
 
         return ret;
 }
+#endif
 
-static int trf7970a_pm_runtime_resume(struct device *dev)
+#ifdef CONFIG_PM_RUNTIME
+static int trf7970a_pm_runtime_suspend(struct device *dev)
 {
         struct spi_device *spi = container_of(dev, struct spi_device, dev);
         struct trf7970a *trf = spi_get_drvdata(spi);
         int ret;
 
-        dev_dbg(dev, "Runtime resume\n");
+        dev_dbg(dev, "Runtime suspend\n");
 
-        ret = regulator_enable(trf->regulator);
-        if (ret) {
-                dev_err(dev, "%s - Can't enable VIN: %d\n", __func__, ret);
-                return ret;
-        }
+        mutex_lock(&trf->lock);
 
-        usleep_range(5000, 6000);
+        ret = trf7970a_power_down(trf);
 
-        gpio_set_value(trf->en2_gpio, 1);
-        usleep_range(1000, 2000);
-        gpio_set_value(trf->en_gpio, 1);
+        mutex_unlock(&trf->lock);
 
-        usleep_range(20000, 21000);
+        return ret;
+}
 
-        ret = trf7970a_init(trf);
-        if (ret) {
-                dev_err(dev, "%s - Can't initialize: %d\n", __func__, ret);
-                return ret;
-        }
+static int trf7970a_pm_runtime_resume(struct device *dev)
+{
+        struct spi_device *spi = container_of(dev, struct spi_device, dev);
+        struct trf7970a *trf = spi_get_drvdata(spi);
+        int ret;
 
-        pm_runtime_mark_last_busy(dev);
+        dev_dbg(dev, "Runtime resume\n");
 
-        return 0;
+        ret = trf7970a_power_up(trf);
+        if (!ret)
+                pm_runtime_mark_last_busy(dev);
+
+        return ret;
 }
 #endif
 
 static const struct dev_pm_ops trf7970a_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(trf7970a_suspend, trf7970a_resume)
         SET_RUNTIME_PM_OPS(trf7970a_pm_runtime_suspend,
                         trf7970a_pm_runtime_resume, NULL)
 };
 
 static const struct spi_device_id trf7970a_id_table[] = {
-        { "trf7970a", TRF7970A_QUIRK_IRQ_STATUS_READ_ERRATA },
+        { "trf7970a", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(spi, trf7970a_id_table);
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 634597917670..729f48e6b20b 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -323,6 +323,8 @@ struct bcma_bus {
                 struct pci_dev *host_pci;
                 /* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
                 struct sdio_func *host_sdio;
+                /* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */
+                struct platform_device *host_pdev;
         };
 
         struct bcma_chipinfo chipinfo;
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 373000de610d..58695ffeb138 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -120,9 +120,9 @@ struct bt_voice {
 #define BT_RCVMTU               13
 
 __printf(1, 2)
-int bt_info(const char *fmt, ...);
+void bt_info(const char *fmt, ...);
 __printf(1, 2)
-int bt_err(const char *fmt, ...);
+void bt_err(const char *fmt, ...);
 
 #define BT_INFO(fmt, ...)       bt_info(fmt "\n", ##__VA_ARGS__)
 #define BT_ERR(fmt, ...)        bt_err(fmt "\n", ##__VA_ARGS__)
@@ -284,6 +284,7 @@ struct hci_req_ctrl {
 struct bt_skb_cb {
         __u8 pkt_type;
         __u8 incoming;
+        __u16 opcode;
         __u16 expect;
         __u8 force_active;
         struct l2cap_chan *chan;
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 3f8547f1c6f8..6e8f24967308 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -385,6 +385,7 @@ enum {
 #define HCI_ERROR_AUTH_FAILURE          0x05
 #define HCI_ERROR_MEMORY_EXCEEDED       0x07
 #define HCI_ERROR_CONNECTION_TIMEOUT    0x08
+#define HCI_ERROR_REJ_LIMITED_RESOURCES 0x0d
 #define HCI_ERROR_REJ_BAD_ADDR          0x0f
 #define HCI_ERROR_REMOTE_USER_TERM      0x13
 #define HCI_ERROR_REMOTE_LOW_RESOURCES  0x14
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 206b92bfeebb..37ff1aef0845 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -926,7 +926,6 @@ int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr);
 void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
 
 int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb);
-int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
 int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count);
 
 void hci_init_sysfs(struct hci_dev *hdev);
diff --git a/include/net/nfc/nci.h b/include/net/nfc/nci.h
index fbfa4e471abb..9eca9ae2280c 100644
--- a/include/net/nfc/nci.h
+++ b/include/net/nfc/nci.h
@@ -2,6 +2,7 @@
  *  The NFC Controller Interface is the communication protocol between an
  *  NFC Controller (NFCC) and a Device Host (DH).
  *
+ *  Copyright (C) 2014 Marvell International Ltd.
  *  Copyright (C) 2011 Texas Instruments, Inc.
  *
  *  Written by Ilan Elias <ilane@ti.com>
@@ -65,19 +66,18 @@
 #define NCI_NFC_F_PASSIVE_POLL_MODE                             0x02
 #define NCI_NFC_A_ACTIVE_POLL_MODE                              0x03
 #define NCI_NFC_F_ACTIVE_POLL_MODE                              0x05
-#define NCI_NFC_15693_PASSIVE_POLL_MODE                         0x06
+#define NCI_NFC_V_PASSIVE_POLL_MODE                             0x06
 #define NCI_NFC_A_PASSIVE_LISTEN_MODE                           0x80
 #define NCI_NFC_B_PASSIVE_LISTEN_MODE                           0x81
 #define NCI_NFC_F_PASSIVE_LISTEN_MODE                           0x82
 #define NCI_NFC_A_ACTIVE_LISTEN_MODE                            0x83
 #define NCI_NFC_F_ACTIVE_LISTEN_MODE                            0x85
-#define NCI_NFC_15693_PASSIVE_LISTEN_MODE                       0x86
 
 /* NCI RF Technologies */
 #define NCI_NFC_RF_TECHNOLOGY_A                                 0x00
 #define NCI_NFC_RF_TECHNOLOGY_B                                 0x01
 #define NCI_NFC_RF_TECHNOLOGY_F                                 0x02
-#define NCI_NFC_RF_TECHNOLOGY_15693                             0x03
+#define NCI_NFC_RF_TECHNOLOGY_V                                 0x03
 
 /* NCI Bit Rates */
 #define NCI_NFC_BIT_RATE_106                                    0x00
@@ -87,6 +87,7 @@
 #define NCI_NFC_BIT_RATE_1695                                   0x04
 #define NCI_NFC_BIT_RATE_3390                                   0x05
 #define NCI_NFC_BIT_RATE_6780                                   0x06
+#define NCI_NFC_BIT_RATE_26                                     0x20
 
 /* NCI RF Protocols */
 #define NCI_RF_PROTOCOL_UNKNOWN                                 0x00
@@ -95,6 +96,7 @@
 #define NCI_RF_PROTOCOL_T3T                                     0x03
 #define NCI_RF_PROTOCOL_ISO_DEP                                 0x04
 #define NCI_RF_PROTOCOL_NFC_DEP                                 0x05
+#define NCI_RF_PROTOCOL_T5T                                     0x06
 
 /* NCI RF Interfaces */
 #define NCI_RF_INTERFACE_NFCEE_DIRECT                           0x00
@@ -328,6 +330,12 @@ struct rf_tech_specific_params_nfcf_poll {
         __u8    sensf_res[18];  /* 16 or 18 Bytes */
 } __packed;
 
+struct rf_tech_specific_params_nfcv_poll {
+        __u8    res_flags;
+        __u8    dsfid;
+        __u8    uid[8]; /* 8 Bytes */
+} __packed;
+
 struct nci_rf_discover_ntf {
         __u8    rf_discovery_id;
         __u8    rf_protocol;
@@ -338,6 +346,7 @@ struct nci_rf_discover_ntf {
                 struct rf_tech_specific_params_nfca_poll nfca_poll;
                 struct rf_tech_specific_params_nfcb_poll nfcb_poll;
                 struct rf_tech_specific_params_nfcf_poll nfcf_poll;
+                struct rf_tech_specific_params_nfcv_poll nfcv_poll;
         } rf_tech_specific_params;
 
         __u8    ntf_type;
@@ -372,6 +381,7 @@ struct nci_rf_intf_activated_ntf {
                 struct rf_tech_specific_params_nfca_poll nfca_poll;
                 struct rf_tech_specific_params_nfcb_poll nfcb_poll;
                 struct rf_tech_specific_params_nfcf_poll nfcf_poll;
+                struct rf_tech_specific_params_nfcv_poll nfcv_poll;
         } rf_tech_specific_params;
 
         __u8    data_exch_rf_tech_and_mode;
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index 1f9a0f5272fe..75d10e625c49 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -64,10 +64,11 @@ enum nci_state {
 struct nci_dev;
 
 struct nci_ops {
-        int (*open)(struct nci_dev *ndev);
-        int (*close)(struct nci_dev *ndev);
-        int (*send)(struct nci_dev *ndev, struct sk_buff *skb);
-        int (*setup)(struct nci_dev *ndev);
+        int   (*open)(struct nci_dev *ndev);
+        int   (*close)(struct nci_dev *ndev);
+        int   (*send)(struct nci_dev *ndev, struct sk_buff *skb);
+        int   (*setup)(struct nci_dev *ndev);
+        __u32 (*get_rfprotocol)(struct nci_dev *ndev, __u8 rf_protocol);
 };
 
 #define NCI_MAX_SUPPORTED_RF_INTERFACES         4
diff --git a/include/uapi/linux/wil6210_uapi.h b/include/uapi/linux/wil6210_uapi.h
new file mode 100644
index 000000000000..6a3cddd156c4
--- /dev/null
+++ b/include/uapi/linux/wil6210_uapi.h
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+#ifndef __WIL6210_UAPI_H__
+#define __WIL6210_UAPI_H__
+
+#if !defined(__KERNEL__)
+#define __user
+#endif
+
+#include <linux/sockios.h>
+
+/* Numbers SIOCDEVPRIVATE and SIOCDEVPRIVATE + 1
+ * are used by Android devices to implement PNO (preferred network offload).
+ * Albeit it is temporary solution, use different numbers to avoid conflicts
+ */
+
+/**
+ * Perform 32-bit I/O operation to the card memory
+ *
+ * User code should arrange data in memory like this:
+ *
+ *      struct wil_memio io;
+ *      struct ifreq ifr = {
+ *              .ifr_data = &io,
+ *      };
+ */
+#define WIL_IOCTL_MEMIO (SIOCDEVPRIVATE + 2)
+
+/**
+ * Perform block I/O operation to the card memory
+ *
+ * User code should arrange data in memory like this:
+ *
+ *      void *buf;
+ *      struct wil_memio_block io = {
+ *              .block = buf,
+ *      };
+ *      struct ifreq ifr = {
+ *              .ifr_data = &io,
+ *      };
+ */
+#define WIL_IOCTL_MEMIO_BLOCK (SIOCDEVPRIVATE + 3)
+
+/**
+ * operation to perform
+ *
+ * @wil_mmio_op_mask - bits defining operation,
+ * @wil_mmio_addr_mask - bits defining addressing mode
+ */
+enum wil_memio_op {
+        wil_mmio_read = 0,
+        wil_mmio_write = 1,
+        wil_mmio_op_mask = 0xff,
+        wil_mmio_addr_linker = 0 << 8,
+        wil_mmio_addr_ahb = 1 << 8,
+        wil_mmio_addr_bar = 2 << 8,
+        wil_mmio_addr_mask = 0xff00,
+};
+
+struct wil_memio {
+        uint32_t op; /* enum wil_memio_op */
+        uint32_t addr; /* should be 32-bit aligned */
+        uint32_t val;
+};
+
+struct wil_memio_block {
+        uint32_t op; /* enum wil_memio_op */
+        uint32_t addr; /* should be 32-bit aligned */
+        uint32_t size; /* should be multiple of 4 */
+        void __user *block; /* block address */
+};
+
+#endif /* __WIL6210_UAPI_H__ */
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 0920cb6ed572..c2e0d14433df 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -426,38 +426,33 @@ static void convert_dest_bdaddr(struct in6_addr *ip6_daddr,
         *addr_type = get_addr_type_from_eui64(addr->b[5]);
 }
 
-static int header_create(struct sk_buff *skb, struct net_device *netdev,
-                         unsigned short type, const void *_daddr,
-                         const void *_saddr, unsigned int len)
+static int setup_header(struct sk_buff *skb, struct net_device *netdev,
+                        bdaddr_t *peer_addr, u8 *peer_addr_type)
 {
-        struct ipv6hdr *hdr;
+        struct in6_addr ipv6_daddr;
         struct lowpan_dev *dev;
         struct lowpan_peer *peer;
         bdaddr_t addr, *any = BDADDR_ANY;
-        u8 *saddr, *daddr = any->b;
-        u8 addr_type;
-
-        if (type != ETH_P_IPV6)
-                return -EINVAL;
-
-        hdr = ipv6_hdr(skb);
+        u8 *daddr = any->b;
+        int err, status = 0;
 
         dev = lowpan_dev(netdev);
 
-        if (ipv6_addr_is_multicast(&hdr->daddr)) {
-                memcpy(&lowpan_cb(skb)->addr, &hdr->daddr,
-                       sizeof(struct in6_addr));
+        memcpy(&ipv6_daddr, &lowpan_cb(skb)->addr, sizeof(ipv6_daddr));
+
+        if (ipv6_addr_is_multicast(&ipv6_daddr)) {
                 lowpan_cb(skb)->chan = NULL;
         } else {
                 unsigned long flags;
+                u8 addr_type;
 
                 /* Get destination BT device from skb.
                  * If there is no such peer then discard the packet.
                  */
-                convert_dest_bdaddr(&hdr->daddr, &addr, &addr_type);
+                convert_dest_bdaddr(&ipv6_daddr, &addr, &addr_type);
 
                 BT_DBG("dest addr %pMR type %d IP %pI6c", &addr,
-                       addr_type, &hdr->daddr);
+                       addr_type, &ipv6_daddr);
 
                 read_lock_irqsave(&devices_lock, flags);
                 peer = peer_lookup_ba(dev, &addr, addr_type);
@@ -470,7 +465,7 @@ static int header_create(struct sk_buff *skb, struct net_device *netdev,
                          * the destination address.
                          */
                         read_lock_irqsave(&devices_lock, flags);
-                        peer = peer_lookup_dst(dev, &hdr->daddr, skb);
+                        peer = peer_lookup_dst(dev, &ipv6_daddr, skb);
                         read_unlock_irqrestore(&devices_lock, flags);
                         if (!peer) {
                                 BT_DBG("no such peer %pMR found", &addr);
@@ -479,15 +474,37 @@ static int header_create(struct sk_buff *skb, struct net_device *netdev,
                 }
 
                 daddr = peer->eui64_addr;
-
-                memcpy(&lowpan_cb(skb)->addr, &hdr->daddr,
-                       sizeof(struct in6_addr));
+                *peer_addr = addr;
+                *peer_addr_type = addr_type;
                 lowpan_cb(skb)->chan = peer->chan;
+
+                status = 1;
         }
 
-        saddr = dev->netdev->dev_addr;
+        lowpan_header_compress(skb, netdev, ETH_P_IPV6, daddr,
+                               dev->netdev->dev_addr, skb->len);
 
-        return lowpan_header_compress(skb, netdev, type, daddr, saddr, len);
+        err = dev_hard_header(skb, netdev, ETH_P_IPV6, NULL, NULL, 0);
+        if (err < 0)
+                return err;
+
+        return status;
+}
+
+static int header_create(struct sk_buff *skb, struct net_device *netdev,
+                         unsigned short type, const void *_daddr,
+                         const void *_saddr, unsigned int len)
+{
+        struct ipv6hdr *hdr;
+
+        if (type != ETH_P_IPV6)
+                return -EINVAL;
+
+        hdr = ipv6_hdr(skb);
+
+        memcpy(&lowpan_cb(skb)->addr, &hdr->daddr, sizeof(struct in6_addr));
+
+        return 0;
 }
 
 /* Packet to BT LE device */
@@ -529,11 +546,12 @@ static int send_pkt(struct l2cap_chan *chan, struct sk_buff *skb,
         return err;
 }
 
-static void send_mcast_pkt(struct sk_buff *skb, struct net_device *netdev)
+static int send_mcast_pkt(struct sk_buff *skb, struct net_device *netdev)
 {
         struct sk_buff *local_skb;
         struct lowpan_dev *entry, *tmp;
         unsigned long flags;
+        int err = 0;
 
         read_lock_irqsave(&devices_lock, flags);
 
@@ -547,57 +565,77 @@ static void send_mcast_pkt(struct sk_buff *skb, struct net_device *netdev)
                 dev = lowpan_dev(entry->netdev);
 
                 list_for_each_entry_safe(pentry, ptmp, &dev->peers, list) {
+                        int ret;
+
                         local_skb = skb_clone(skb, GFP_ATOMIC);
 
-                        send_pkt(pentry->chan, local_skb, netdev);
+                        BT_DBG("xmit %s to %pMR type %d IP %pI6c chan %p",
+                               netdev->name,
+                               &pentry->chan->dst, pentry->chan->dst_type,
+                               &pentry->peer_addr, pentry->chan);
+                        ret = send_pkt(pentry->chan, local_skb, netdev);
+                        if (ret < 0)
+                                err = ret;
 
                         kfree_skb(local_skb);
                 }
         }
 
         read_unlock_irqrestore(&devices_lock, flags);
+
+        return err;
 }
 
 static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
         int err = 0;
-        struct lowpan_dev *dev;
-        struct lowpan_peer *peer;
         bdaddr_t addr;
         u8 addr_type;
+        struct sk_buff *tmpskb;
 
-        if (ipv6_addr_is_multicast(&lowpan_cb(skb)->addr)) {
-                /* We need to send the packet to every device
-                 * behind this interface.
-                 */
-                send_mcast_pkt(skb, netdev);
-        } else {
-                unsigned long flags;
-
-                convert_dest_bdaddr(&lowpan_cb(skb)->addr, &addr, &addr_type);
-                dev = lowpan_dev(netdev);
-
-                read_lock_irqsave(&devices_lock, flags);
-                peer = peer_lookup_ba(dev, &addr, addr_type);
-                if (!peer)
-                        peer = peer_lookup_dst(dev, &lowpan_cb(skb)->addr, skb);
-                read_unlock_irqrestore(&devices_lock, flags);
+        /* We must take a copy of the skb before we modify/replace the ipv6
+         * header as the header could be used elsewhere
+         */
+        tmpskb = skb_unshare(skb, GFP_ATOMIC);
+        if (!tmpskb) {
+                kfree_skb(skb);
+                return NET_XMIT_DROP;
+        }
+        skb = tmpskb;
 
-                BT_DBG("xmit %s to %pMR type %d IP %pI6c peer %p",
-                       netdev->name, &addr, addr_type,
-                       &lowpan_cb(skb)->addr, peer);
+        /* Return values from setup_header()
+         *  <0 - error, packet is dropped
+         *   0 - this is a multicast packet
+         *   1 - this is unicast packet
+         */
+        err = setup_header(skb, netdev, &addr, &addr_type);
+        if (err < 0) {
+                kfree_skb(skb);
+                return NET_XMIT_DROP;
+        }
 
-                if (peer && peer->chan)
-                        err = send_pkt(peer->chan, skb, netdev);
-                else
+        if (err) {
+                if (lowpan_cb(skb)->chan) {
+                        BT_DBG("xmit %s to %pMR type %d IP %pI6c chan %p",
+                               netdev->name, &addr, addr_type,
+                               &lowpan_cb(skb)->addr, lowpan_cb(skb)->chan);
+                        err = send_pkt(lowpan_cb(skb)->chan, skb, netdev);
+                } else {
                         err = -ENOENT;
+                }
+        } else {
+                /* We need to send the packet to every device behind this
+                 * interface.
+                 */
+                err = send_mcast_pkt(skb, netdev);
         }
+
         dev_kfree_skb(skb);
 
         if (err)
                 BT_DBG("ERROR: xmit failed (%d)", err);
 
-        return (err < 0) ? NET_XMIT_DROP : err;
+        return err < 0 ? NET_XMIT_DROP : err;
 }
 
 static const struct net_device_ops netdev_ops = {
@@ -617,7 +655,8 @@ static void netdev_setup(struct net_device *dev)
         dev->needed_tailroom    = 0;
         dev->mtu                = IPV6_MIN_MTU;
         dev->tx_queue_len       = 0;
-        dev->flags              = IFF_RUNNING | IFF_POINTOPOINT;
+        dev->flags              = IFF_RUNNING | IFF_POINTOPOINT |
+                                  IFF_MULTICAST;
         dev->watchdog_timeo     = 0;
 
         dev->netdev_ops         = &netdev_ops;
@@ -950,6 +989,9 @@ static void chan_suspend_cb(struct l2cap_chan *chan)
 
         BT_DBG("chan %p conn %p skb %p", chan, chan->conn, skb);
 
+        if (!skb)
+                return;
+
         lowpan_cb(skb)->status = -EAGAIN;
 }
 
@@ -959,6 +1001,9 @@ static void chan_resume_cb(struct l2cap_chan *chan)
 
         BT_DBG("chan %p conn %p skb %p", chan, chan->conn, skb);
 
+        if (!skb)
+                return;
+
         lowpan_cb(skb)->status = 0;
 }
 
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 4dca0299ed96..339c74ad4553 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -709,8 +709,11 @@ EXPORT_SYMBOL_GPL(bt_debugfs);
 
 static int __init bt_init(void)
 {
+        struct sk_buff *skb;
         int err;
 
+        BUILD_BUG_ON(sizeof(struct bt_skb_cb) > sizeof(skb->cb));
+
         BT_INFO("Core ver %s", VERSION);
 
         bt_debugfs = debugfs_create_dir("bluetooth", NULL);
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index e3d7ae9e2edd..b9517bd17190 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -36,19 +36,25 @@
 struct sco_param {
         u16 pkt_type;
         u16 max_latency;
+        u8  retrans_effort;
+};
+
+static const struct sco_param esco_param_cvsd[] = {
+        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x000a,   0x01 }, /* S3 */
+        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x0007,   0x01 }, /* S2 */
+        { EDR_ESCO_MASK | ESCO_EV3,   0x0007,   0x01 }, /* S1 */
+        { EDR_ESCO_MASK | ESCO_HV3,   0xffff,   0x01 }, /* D1 */
+        { EDR_ESCO_MASK | ESCO_HV1,   0xffff,   0x01 }, /* D0 */
 };
 
 static const struct sco_param sco_param_cvsd[] = {
-        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x000a }, /* S3 */
-        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x0007 }, /* S2 */
-        { EDR_ESCO_MASK | ESCO_EV3,   0x0007 }, /* S1 */
-        { EDR_ESCO_MASK | ESCO_HV3,   0xffff }, /* D1 */
-        { EDR_ESCO_MASK | ESCO_HV1,   0xffff }, /* D0 */
+        { EDR_ESCO_MASK | ESCO_HV3,   0xffff,   0xff }, /* D1 */
+        { EDR_ESCO_MASK | ESCO_HV1,   0xffff,   0xff }, /* D0 */
 };
 
-static const struct sco_param sco_param_wideband[] = {
-        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x000d }, /* T2 */
-        { EDR_ESCO_MASK | ESCO_EV3,   0x0008 }, /* T1 */
+static const struct sco_param esco_param_msbc[] = {
+        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x000d,   0x02 }, /* T2 */
+        { EDR_ESCO_MASK | ESCO_EV3,   0x0008,   0x02 }, /* T1 */
 };
 
 static void hci_le_create_connection_cancel(struct hci_conn *conn)
@@ -116,7 +122,7 @@ static void hci_reject_sco(struct hci_conn *conn)
 {
         struct hci_cp_reject_sync_conn_req cp;
 
-        cp.reason = HCI_ERROR_REMOTE_USER_TERM;
+        cp.reason = HCI_ERROR_REJ_LIMITED_RESOURCES;
         bacpy(&cp.bdaddr, &conn->dst);
 
         hci_send_cmd(conn->hdev, HCI_OP_REJECT_SYNC_CONN_REQ, sizeof(cp), &cp);
@@ -201,21 +207,26 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle)
 
         switch (conn->setting & SCO_AIRMODE_MASK) {
         case SCO_AIRMODE_TRANSP:
-                if (conn->attempt > ARRAY_SIZE(sco_param_wideband))
+                if (conn->attempt > ARRAY_SIZE(esco_param_msbc))
                         return false;
-                cp.retrans_effort = 0x02;
-                param = &sco_param_wideband[conn->attempt - 1];
+                param = &esco_param_msbc[conn->attempt - 1];
                 break;
         case SCO_AIRMODE_CVSD:
-                if (conn->attempt > ARRAY_SIZE(sco_param_cvsd))
-                        return false;
-                cp.retrans_effort = 0x01;
-                param = &sco_param_cvsd[conn->attempt - 1];
+                if (lmp_esco_capable(conn->link)) {
+                        if (conn->attempt > ARRAY_SIZE(esco_param_cvsd))
+                                return false;
+                        param = &esco_param_cvsd[conn->attempt - 1];
+                } else {
+                        if (conn->attempt > ARRAY_SIZE(sco_param_cvsd))
+                                return false;
+                        param = &sco_param_cvsd[conn->attempt - 1];
+                }
                 break;
         default:
                 return false;
         }
 
+        cp.retrans_effort = param->retrans_effort;
         cp.pkt_type = __cpu_to_le16(param->pkt_type);
         cp.max_latency = __cpu_to_le16(param->max_latency);
 
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 067526d9680d..cb05d7f16a34 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -4374,26 +4374,6 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
         return remain;
 }
 
-int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count)
-{
-        int rem = 0;
-
-        if (type < HCI_ACLDATA_PKT || type > HCI_EVENT_PKT)
-                return -EILSEQ;
-
-        while (count) {
-                rem = hci_reassembly(hdev, type, data, count, type - 1);
-                if (rem < 0)
-                        return rem;
-
-                data += (count - rem);
-                count = rem;
-        }
-
-        return rem;
-}
-EXPORT_SYMBOL(hci_recv_fragment);
-
 #define STREAM_REASSEMBLY 0
 
 int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
@@ -4547,6 +4527,7 @@ static struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode,
         BT_DBG("skb len %d", skb->len);
 
         bt_cb(skb)->pkt_type = HCI_COMMAND_PKT;
+        bt_cb(skb)->opcode = opcode;
 
         return skb;
 }
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 8d53fc57faba..b6f9777e057d 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6980,8 +6980,6 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
 
         hci_dev_lock(hdev);
 
-        l2cap_chan_lock(chan);
-
         if (!is_valid_psm(__le16_to_cpu(psm), dst_type) && !cid &&
             chan->chan_type != L2CAP_CHAN_RAW) {
                 err = -EINVAL;
@@ -7078,17 +7076,20 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
                 goto done;
         }
 
+        mutex_lock(&conn->chan_lock);
+        l2cap_chan_lock(chan);
+
         if (cid && __l2cap_get_chan_by_dcid(conn, cid)) {
                 hci_conn_drop(hcon);
                 err = -EBUSY;
-                goto done;
+                goto chan_unlock;
         }
 
         /* Update source addr of the socket */
         bacpy(&chan->src, &hcon->src);
         chan->src_type = bdaddr_type(hcon, hcon->src_type);
 
-        l2cap_chan_add(conn, chan);
+        __l2cap_chan_add(conn, chan);
 
         /* l2cap_chan_add takes its own ref so we can drop this one */
         hci_conn_drop(hcon);
@@ -7114,8 +7115,10 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
 
         err = 0;
 
-done:
+chan_unlock:
         l2cap_chan_unlock(chan);
+        mutex_unlock(&conn->chan_lock);
+done:
         hci_dev_unlock(hdev);
         hci_dev_put(hdev);
         return err;
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c
index 941ad7530eda..b36bc0415854 100644
--- a/net/bluetooth/lib.c
+++ b/net/bluetooth/lib.c
@@ -135,40 +135,34 @@ int bt_to_errno(__u16 code)
 }
 EXPORT_SYMBOL(bt_to_errno);
 
-int bt_info(const char *format, ...)
+void bt_info(const char *format, ...)
 {
         struct va_format vaf;
         va_list args;
-        int r;
 
         va_start(args, format);
 
         vaf.fmt = format;
         vaf.va = &args;
 
-        r = pr_info("%pV", &vaf);
+        pr_info("%pV", &vaf);
 
         va_end(args);
-
-        return r;
 }
 EXPORT_SYMBOL(bt_info);
 
-int bt_err(const char *format, ...)
+void bt_err(const char *format, ...)
 {
         struct va_format vaf;
         va_list args;
-        int r;
 
         va_start(args, format);
 
         vaf.fmt = format;
         vaf.va = &args;
 
-        r = pr_err("%pV", &vaf);
+        pr_err("%pV", &vaf);
 
         va_end(args);
-
-        return r;
 }
 EXPORT_SYMBOL(bt_err);
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 51fc7db2d84e..f09b6b65cf6b 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -494,8 +494,11 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
         }
 
         /* Not Just Works/Confirm results in MITM Authentication */
-        if (method != JUST_CFM)
+        if (method != JUST_CFM) {
                 set_bit(SMP_FLAG_MITM_AUTH, &smp->flags);
+                if (hcon->pending_sec_level < BT_SECURITY_HIGH)
+                        hcon->pending_sec_level = BT_SECURITY_HIGH;
+        }
 
         /* If both devices have Keyoard-Display I/O, the master
          * Confirms and the slave Enters the passkey.
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
index 5e788cdc499a..44136297b673 100644
--- a/net/ieee802154/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan_rtnl.c
@@ -71,20 +71,42 @@ struct lowpan_dev_record {
         struct list_head list;
 };
 
+/* don't save pan id, it's intra pan */
+struct lowpan_addr {
+        u8 mode;
+        union {
+                /* IPv6 needs big endian here */
+                __be64 extended_addr;
+                __be16 short_addr;
+        } u;
+};
+
+struct lowpan_addr_info {
+        struct lowpan_addr daddr;
+        struct lowpan_addr saddr;
+};
+
 static inline struct
 lowpan_dev_info *lowpan_dev_info(const struct net_device *dev)
 {
         return netdev_priv(dev);
 }
 
+static inline struct
+lowpan_addr_info *lowpan_skb_priv(const struct sk_buff *skb)
+{
+        WARN_ON_ONCE(skb_headroom(skb) < sizeof(struct lowpan_addr_info));
+        return (struct lowpan_addr_info *)(skb->data -
+                        sizeof(struct lowpan_addr_info));
+}
+
 static int lowpan_header_create(struct sk_buff *skb, struct net_device *dev,
                                 unsigned short type, const void *_daddr,
                                 const void *_saddr, unsigned int len)
 {
         const u8 *saddr = _saddr;
         const u8 *daddr = _daddr;
-        struct ieee802154_addr sa, da;
-        struct ieee802154_mac_cb *cb = mac_cb_init(skb);
+        struct lowpan_addr_info *info;
 
         /* TODO:
          * if this package isn't ipv6 one, where should it be routed?
@@ -98,41 +120,17 @@ static int lowpan_header_create(struct sk_buff *skb, struct net_device *dev,
         raw_dump_inline(__func__, "saddr", (unsigned char *)saddr, 8);
         raw_dump_inline(__func__, "daddr", (unsigned char *)daddr, 8);
 
-        lowpan_header_compress(skb, dev, type, daddr, saddr, len);
-
-        /* NOTE1: I'm still unsure about the fact that compression and WPAN
-         * header are created here and not later in the xmit. So wait for
-         * an opinion of net maintainers.
-         */
-        /* NOTE2: to be absolutely correct, we must derive PANid information
-         * from MAC subif of the 'dev' and 'real_dev' network devices, but
-         * this isn't implemented in mainline yet, so currently we assign 0xff
-         */
-        cb->type = IEEE802154_FC_TYPE_DATA;
-
-        /* prepare wpan address data */
-        sa.mode = IEEE802154_ADDR_LONG;
-        sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);
-        sa.extended_addr = ieee802154_devaddr_from_raw(saddr);
-
-        /* intra-PAN communications */
-        da.pan_id = sa.pan_id;
-
-        /* if the destination address is the broadcast address, use the
-         * corresponding short address
-         */
-        if (lowpan_is_addr_broadcast(daddr)) {
-                da.mode = IEEE802154_ADDR_SHORT;
-                da.short_addr = cpu_to_le16(IEEE802154_ADDR_BROADCAST);
-        } else {
-                da.mode = IEEE802154_ADDR_LONG;
-                da.extended_addr = ieee802154_devaddr_from_raw(daddr);
-        }
+        info = lowpan_skb_priv(skb);
 
-        cb->ackreq = !lowpan_is_addr_broadcast(daddr);
+        /* TODO: Currently we only support extended_addr */
+        info->daddr.mode = IEEE802154_ADDR_LONG;
+        memcpy(&info->daddr.u.extended_addr, daddr,
+               sizeof(info->daddr.u.extended_addr));
+        info->saddr.mode = IEEE802154_ADDR_LONG;
+        memcpy(&info->saddr.u.extended_addr, saddr,
+               sizeof(info->daddr.u.extended_addr));
 
-        return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,
-                        type, (void *)&da, (void *)&sa, 0);
+        return 0;
 }
 
 static int lowpan_give_skb_to_devices(struct sk_buff *skb,
@@ -330,13 +328,68 @@ err:
         return rc;
 }
 
+static int lowpan_header(struct sk_buff *skb, struct net_device *dev)
+{
+        struct ieee802154_addr sa, da;
+        struct ieee802154_mac_cb *cb = mac_cb_init(skb);
+        struct lowpan_addr_info info;
+        void *daddr, *saddr;
+
+        memcpy(&info, lowpan_skb_priv(skb), sizeof(info));
+
+        /* TODO: Currently we only support extended_addr */
+        daddr = &info.daddr.u.extended_addr;
+        saddr = &info.saddr.u.extended_addr;
+
+        lowpan_header_compress(skb, dev, ETH_P_IPV6, daddr, saddr, skb->len);
+
+        cb->type = IEEE802154_FC_TYPE_DATA;
+
+        /* prepare wpan address data */
+        sa.mode = IEEE802154_ADDR_LONG;
+        sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);
+        sa.extended_addr = ieee802154_devaddr_from_raw(saddr);
+
+        /* intra-PAN communications */
+        da.pan_id = sa.pan_id;
+
+        /* if the destination address is the broadcast address, use the
+         * corresponding short address
+         */
+        if (lowpan_is_addr_broadcast((const u8 *)daddr)) {
+                da.mode = IEEE802154_ADDR_SHORT;
+                da.short_addr = cpu_to_le16(IEEE802154_ADDR_BROADCAST);
+                cb->ackreq = false;
+        } else {
+                da.mode = IEEE802154_ADDR_LONG;
+                da.extended_addr = ieee802154_devaddr_from_raw(daddr);
+                cb->ackreq = true;
+        }
+
+        return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,
+                        ETH_P_IPV6, (void *)&da, (void *)&sa, 0);
+}
+
 static netdev_tx_t lowpan_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ieee802154_hdr wpan_hdr;
-        int max_single;
+        int max_single, ret;
 
         pr_debug("package xmit\n");
 
+        /* We must take a copy of the skb before we modify/replace the ipv6
+         * header as the header could be used elsewhere
+         */
+        skb = skb_unshare(skb, GFP_ATOMIC);
+        if (!skb)
+                return NET_XMIT_DROP;
+
+        ret = lowpan_header(skb, dev);
+        if (ret < 0) {
+                kfree_skb(skb);
+                return NET_XMIT_DROP;
+        }
+
         if (ieee802154_hdr_peek(skb, &wpan_hdr) < 0) {
                 kfree_skb(skb);
                 return NET_XMIT_DROP;
diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c
index e1638dab076d..b60aa35c074f 100644
--- a/net/nfc/digital_dep.c
+++ b/net/nfc/digital_dep.c
@@ -33,6 +33,8 @@
 #define DIGITAL_ATR_REQ_MAX_SIZE 64
 
 #define DIGITAL_LR_BITS_PAYLOAD_SIZE_254B 0x30
+#define DIGITAL_FSL_BITS_PAYLOAD_SIZE_254B \
+                                (DIGITAL_LR_BITS_PAYLOAD_SIZE_254B >> 4)
 #define DIGITAL_GB_BIT  0x02
 
 #define DIGITAL_NFC_DEP_PFB_TYPE(pfb) ((pfb) & 0xE0)
@@ -127,6 +129,98 @@ static int digital_skb_pull_dep_sod(struct nfc_digital_dev *ddev,
         return 0;
 }
 
+static void digital_in_recv_psl_res(struct nfc_digital_dev *ddev, void *arg,
+                                    struct sk_buff *resp)
+{
+        struct nfc_target *target = arg;
+        struct digital_psl_res *psl_res;
+        int rc;
+
+        if (IS_ERR(resp)) {
+                rc = PTR_ERR(resp);
+                resp = NULL;
+                goto exit;
+        }
+
+        rc = ddev->skb_check_crc(resp);
+        if (rc) {
+                PROTOCOL_ERR("14.4.1.6");
+                goto exit;
+        }
+
+        rc = digital_skb_pull_dep_sod(ddev, resp);
+        if (rc) {
+                PROTOCOL_ERR("14.4.1.2");
+                goto exit;
+        }
+
+        psl_res = (struct digital_psl_res *)resp->data;
+
+        if ((resp->len != sizeof(*psl_res)) ||
+            (psl_res->dir != DIGITAL_NFC_DEP_FRAME_DIR_IN) ||
+            (psl_res->cmd != DIGITAL_CMD_PSL_RES)) {
+                rc = -EIO;
+                goto exit;
+        }
+
+        rc = digital_in_configure_hw(ddev, NFC_DIGITAL_CONFIG_RF_TECH,
+                                     NFC_DIGITAL_RF_TECH_424F);
+        if (rc)
+                goto exit;
+
+        rc = digital_in_configure_hw(ddev, NFC_DIGITAL_CONFIG_FRAMING,
+                                     NFC_DIGITAL_FRAMING_NFCF_NFC_DEP);
+        if (rc)
+                goto exit;
+
+        if (!DIGITAL_DRV_CAPS_IN_CRC(ddev) &&
+            (ddev->curr_rf_tech == NFC_DIGITAL_RF_TECH_106A)) {
+                ddev->skb_add_crc = digital_skb_add_crc_f;
+                ddev->skb_check_crc = digital_skb_check_crc_f;
+        }
+
+        ddev->curr_rf_tech = NFC_DIGITAL_RF_TECH_424F;
+
+        nfc_dep_link_is_up(ddev->nfc_dev, target->idx, NFC_COMM_ACTIVE,
+                           NFC_RF_INITIATOR);
+
+        ddev->curr_nfc_dep_pni = 0;
+
+exit:
+        dev_kfree_skb(resp);
+
+        if (rc)
+                ddev->curr_protocol = 0;
+}
+
+static int digital_in_send_psl_req(struct nfc_digital_dev *ddev,
+                                   struct nfc_target *target)
+{
+        struct sk_buff *skb;
+        struct digital_psl_req *psl_req;
+
+        skb = digital_skb_alloc(ddev, sizeof(*psl_req));
+        if (!skb)
+                return -ENOMEM;
+
+        skb_put(skb, sizeof(*psl_req));
+
+        psl_req = (struct digital_psl_req *)skb->data;
+
+        psl_req->dir = DIGITAL_NFC_DEP_FRAME_DIR_OUT;
+        psl_req->cmd = DIGITAL_CMD_PSL_REQ;
+        psl_req->did = 0;
+        psl_req->brs = (0x2 << 3) | 0x2; /* 424F both directions */
+        psl_req->fsl = DIGITAL_FSL_BITS_PAYLOAD_SIZE_254B;
+
+        digital_skb_push_dep_sod(ddev, skb);
+
+        ddev->skb_add_crc(skb);
+
+        return digital_in_send_cmd(ddev, skb, 500, digital_in_recv_psl_res,
+                                   target);
+}
+
 static void digital_in_recv_atr_res(struct nfc_digital_dev *ddev, void *arg,
                                  struct sk_buff *resp)
 {
@@ -166,6 +260,13 @@ static void digital_in_recv_atr_res(struct nfc_digital_dev *ddev, void *arg,
         if (rc)
                 goto exit;
 
+        if ((ddev->protocols & NFC_PROTO_FELICA_MASK) &&
+            (ddev->curr_rf_tech != NFC_DIGITAL_RF_TECH_424F)) {
+                rc = digital_in_send_psl_req(ddev, target);
+                if (!rc)
+                        goto exit;
+        }
+
         rc = nfc_dep_link_is_up(ddev->nfc_dev, target->idx, NFC_COMM_ACTIVE,
                                 NFC_RF_INITIATOR);
 
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 2b400e1a8695..90b16cb40058 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -231,6 +231,14 @@ static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt)
                 cmd.num_disc_configs++;
         }
 
+        if ((cmd.num_disc_configs < NCI_MAX_NUM_RF_CONFIGS) &&
+            (protocols & NFC_PROTO_ISO15693_MASK)) {
+                cmd.disc_configs[cmd.num_disc_configs].rf_tech_and_mode =
+                        NCI_NFC_V_PASSIVE_POLL_MODE;
+                cmd.disc_configs[cmd.num_disc_configs].frequency = 1;
+                cmd.num_disc_configs++;
+        }
+
         nci_send_cmd(ndev, NCI_OP_RF_DISCOVER_CMD,
                      (1 + (cmd.num_disc_configs * sizeof(struct disc_config))),
                      &cmd);
@@ -751,10 +759,6 @@ int nci_register_device(struct nci_dev *ndev)
         struct device *dev = &ndev->nfc_dev->dev;
         char name[32];
 
-        rc = nfc_register_device(ndev->nfc_dev);
-        if (rc)
-                goto exit;
-
         ndev->flags = 0;
 
         INIT_WORK(&ndev->cmd_work, nci_cmd_work);
@@ -762,7 +766,7 @@ int nci_register_device(struct nci_dev *ndev)
         ndev->cmd_wq = create_singlethread_workqueue(name);
         if (!ndev->cmd_wq) {
                 rc = -ENOMEM;
-                goto unreg_exit;
+                goto exit;
         }
 
         INIT_WORK(&ndev->rx_work, nci_rx_work);
@@ -792,6 +796,10 @@ int nci_register_device(struct nci_dev *ndev)
 
         mutex_init(&ndev->req_lock);
 
+        rc = nfc_register_device(ndev->nfc_dev);
+        if (rc)
+                goto destroy_rx_wq_exit;
+
         goto exit;
 
 destroy_rx_wq_exit:
@@ -800,9 +808,6 @@ destroy_rx_wq_exit:
 destroy_cmd_wq_exit:
         destroy_workqueue(ndev->cmd_wq);
 
-unreg_exit:
-        nfc_unregister_device(ndev->nfc_dev);
-
 exit:
         return rc;
 }
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c
index 6c3aef852876..427ef2c7ab68 100644
--- a/net/nfc/nci/data.c
+++ b/net/nfc/nci/data.c
@@ -241,9 +241,12 @@ void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb)
         /* strip the nci data header */
         skb_pull(skb, NCI_DATA_HDR_SIZE);
 
-        if (ndev->target_active_prot == NFC_PROTO_MIFARE) {
+        if (ndev->target_active_prot == NFC_PROTO_MIFARE ||
+            ndev->target_active_prot == NFC_PROTO_JEWEL ||
+            ndev->target_active_prot == NFC_PROTO_FELICA ||
+            ndev->target_active_prot == NFC_PROTO_ISO15693) {
                 /* frame I/F => remove the status byte */
-                pr_debug("NFC_PROTO_MIFARE => remove the status byte\n");
+                pr_debug("frame I/F => remove the status byte\n");
                 skb_trim(skb, (skb->len - 1));
         }
 
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index df91bb95b12a..205b35f666db 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -2,6 +2,7 @@
  *  The NFC Controller Interface is the communication protocol between an
  *  NFC Controller (NFCC) and a Device Host (DH).
  *
+ *  Copyright (C) 2014 Marvell International Ltd.
  *  Copyright (C) 2011 Texas Instruments, Inc.
  *
  *  Written by Ilan Elias <ilane@ti.com>
@@ -155,6 +156,24 @@ static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
         return data;
 }
 
+static __u8 *nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev,
+                        struct rf_tech_specific_params_nfcv_poll *nfcv_poll,
+                                                     __u8 *data)
+{
+        ++data;
+        nfcv_poll->dsfid = *data++;
+        memcpy(nfcv_poll->uid, data, NFC_ISO15693_UID_MAXSIZE);
+        data += NFC_ISO15693_UID_MAXSIZE;
+        return data;
+}
+
+__u32 nci_get_prop_rf_protocol(struct nci_dev *ndev, __u8 rf_protocol)
+{
+        if (ndev->ops->get_rfprotocol)
+                return ndev->ops->get_rfprotocol(ndev, rf_protocol);
+        return 0;
+}
+
 static int nci_add_new_protocol(struct nci_dev *ndev,
                                 struct nfc_target *target,
                                 __u8 rf_protocol,
@@ -164,6 +183,7 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
         struct rf_tech_specific_params_nfca_poll *nfca_poll;
         struct rf_tech_specific_params_nfcb_poll *nfcb_poll;
         struct rf_tech_specific_params_nfcf_poll *nfcf_poll;
+        struct rf_tech_specific_params_nfcv_poll *nfcv_poll;
         __u32 protocol;
 
         if (rf_protocol == NCI_RF_PROTOCOL_T1T)
@@ -179,8 +199,10 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
                 protocol = NFC_PROTO_FELICA_MASK;
         else if (rf_protocol == NCI_RF_PROTOCOL_NFC_DEP)
                 protocol = NFC_PROTO_NFC_DEP_MASK;
+        else if (rf_protocol == NCI_RF_PROTOCOL_T5T)
+                protocol = NFC_PROTO_ISO15693_MASK;
         else
-                protocol = 0;
+                protocol = nci_get_prop_rf_protocol(ndev, rf_protocol);
 
         if (!(protocol & ndev->poll_prots)) {
                 pr_err("the target found does not have the desired protocol\n");
@@ -213,6 +235,12 @@ static int nci_add_new_protocol(struct nci_dev *ndev,
                         memcpy(target->sensf_res, nfcf_poll->sensf_res,
                                target->sensf_res_len);
                 }
+        } else if (rf_tech_and_mode == NCI_NFC_V_PASSIVE_POLL_MODE) {
+                nfcv_poll = (struct rf_tech_specific_params_nfcv_poll *)params;
+
+                target->is_iso15693 = 1;
+                target->iso15693_dsfid = nfcv_poll->dsfid;
+                memcpy(target->iso15693_uid, nfcv_poll->uid, NFC_ISO15693_UID_MAXSIZE);
         } else {
                 pr_err("unsupported rf_tech_and_mode 0x%x\n", rf_tech_and_mode);
                 return -EPROTO;
@@ -305,6 +333,11 @@ static void nci_rf_discover_ntf_packet(struct nci_dev *ndev,
                                 &(ntf.rf_tech_specific_params.nfcf_poll), data);
                         break;
 
+                case NCI_NFC_V_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfcv_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfcv_poll), data);
+                        break;
+
                 default:
                         pr_err("unsupported rf_tech_and_mode 0x%x\n",
                                ntf.rf_tech_and_mode);
@@ -455,6 +488,11 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
                                 &(ntf.rf_tech_specific_params.nfcf_poll), data);
                         break;
 
+                case NCI_NFC_V_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfcv_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfcv_poll), data);
+                        break;
+
                 default:
                         pr_err("unsupported activation_rf_tech_and_mode 0x%x\n",
                                ntf.activation_rf_tech_and_mode);