73 files changed, 8497 insertions, 3564 deletions

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 83a7fb68fd24..53f1095de8ff 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -2151,6 +2151,10 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,
         struct ath10k_peer *peer;
         struct htt_rx_indication_mpdu_range *mpdu_ranges;
         struct fw_rx_desc_hl *fw_desc;
+        enum htt_txrx_sec_cast_type sec_index;
+        enum htt_security_types sec_type;
+        union htt_rx_pn_t new_pn = {0};
+        struct htt_hl_rx_desc *rx_desc;
         struct ieee80211_hdr *hdr;
         struct ieee80211_rx_status *rx_status;
         u16 peer_id;
@@ -2158,9 +2162,11 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,
         int num_mpdu_ranges;
         size_t tot_hdr_len;
         struct ieee80211_channel *ch;
-        bool pn_invalid;
+        bool pn_invalid, qos, first_msdu;
+        u32 tid, rx_desc_info;
 
         peer_id = __le16_to_cpu(rx->hdr.peer_id);
+        tid = MS(rx->hdr.info0, HTT_RX_INDICATION_INFO0_EXT_TID);
 
         spin_lock_bh(&ar->data_lock);
         peer = ath10k_peer_find_by_id(ar, peer_id);
@@ -2168,6 +2174,9 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,
         if (!peer && peer_id != HTT_INVALID_PEERID)
                 ath10k_warn(ar, "Got RX ind from invalid peer: %u\n", peer_id);
 
+        if (!peer)
+                return true;
+
         num_mpdu_ranges = MS(__le32_to_cpu(rx->hdr.info1),
                              HTT_RX_INDICATION_INFO1_NUM_MPDU_RANGES);
         mpdu_ranges = htt_rx_ind_get_mpdu_ranges_hl(rx);
@@ -2192,10 +2201,24 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,
                 goto err;
         }
 
-        if (check_pn_type == HTT_RX_PN_CHECK) {
+        rx_desc = (struct htt_hl_rx_desc *)&rx->mpdu_ranges[num_mpdu_ranges];
+        rx_desc_info = __le32_to_cpu(rx_desc->info);
+
+        if (MS(rx_desc_info, HTT_RX_DESC_HL_INFO_MCAST_BCAST))
+                sec_index = HTT_TXRX_SEC_MCAST;
+        else
+                sec_index = HTT_TXRX_SEC_UCAST;
+
+        sec_type = peer->rx_pn[sec_index].sec_type;
+        first_msdu = rx->fw_desc.flags & FW_RX_DESC_FLAGS_FIRST_MSDU;
+
+        ath10k_htt_rx_mpdu_desc_pn_hl(rx_desc, &new_pn, peer->rx_pn[sec_index].pn_len);
+
+        if (check_pn_type == HTT_RX_PN_CHECK && tid >= IEEE80211_NUM_TIDS) {
                 spin_lock_bh(&ar->data_lock);
                 pn_invalid = ath10k_htt_rx_pn_check_replay_hl(ar, peer, rx);
                 spin_unlock_bh(&ar->data_lock);
+
                 if (pn_invalid)
                         goto err;
         }
@@ -2211,6 +2234,7 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,
         skb_pull(skb, tot_hdr_len);
 
         hdr = (struct ieee80211_hdr *)skb->data;
+        qos = ieee80211_is_data_qos(hdr->frame_control);
         rx_status = IEEE80211_SKB_RXCB(skb);
         rx_status->chains |= BIT(0);
         if (rx->ppdu.combined_rssi == 0) {
@@ -2254,6 +2278,55 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,
                 rx_status->flag |= RX_FLAG_DECRYPTED |
                                    RX_FLAG_IV_STRIPPED |
                                    RX_FLAG_MMIC_STRIPPED;
+
+                if (tid < IEEE80211_NUM_TIDS &&
+                    first_msdu &&
+                    check_pn_type == HTT_RX_PN_CHECK &&
+                   (sec_type == HTT_SECURITY_AES_CCMP ||
+                    sec_type == HTT_SECURITY_TKIP ||
+                    sec_type == HTT_SECURITY_TKIP_NOMIC)) {
+                        u8 offset, *ivp, i;
+                        s8 keyidx = 0;
+                        __le64 pn48 = cpu_to_le64(new_pn.pn48);
+
+                        hdr = (struct ieee80211_hdr *)skb->data;
+                        offset = ieee80211_hdrlen(hdr->frame_control);
+                        hdr->frame_control |= __cpu_to_le16(IEEE80211_FCTL_PROTECTED);
+                        rx_status->flag &= ~RX_FLAG_IV_STRIPPED;
+
+                        memmove(skb->data - IEEE80211_CCMP_HDR_LEN,
+                                skb->data, offset);
+                        skb_push(skb, IEEE80211_CCMP_HDR_LEN);
+                        ivp = skb->data + offset;
+                        memset(skb->data + offset, 0, IEEE80211_CCMP_HDR_LEN);
+                        /* Ext IV */
+                        ivp[IEEE80211_WEP_IV_LEN - 1] |= ATH10K_IEEE80211_EXTIV;
+
+                        for (i = 0; i < ARRAY_SIZE(peer->keys); i++) {
+                                if (peer->keys[i] &&
+                                    peer->keys[i]->flags & IEEE80211_KEY_FLAG_PAIRWISE)
+                                        keyidx = peer->keys[i]->keyidx;
+                        }
+
+                        /* Key ID */
+                        ivp[IEEE80211_WEP_IV_LEN - 1] |= keyidx << 6;
+
+                        if (sec_type == HTT_SECURITY_AES_CCMP) {
+                                rx_status->flag |= RX_FLAG_MIC_STRIPPED;
+                                /* pn 0, pn 1 */
+                                memcpy(skb->data + offset, &pn48, 2);
+                                /* pn 1, pn 3 , pn 34 , pn 5 */
+                                memcpy(skb->data + offset + 4, ((u8 *)&pn48) + 2, 4);
+                        } else {
+                                rx_status->flag |= RX_FLAG_ICV_STRIPPED;
+                                /* TSC 0 */
+                                memcpy(skb->data + offset + 2, &pn48, 1);
+                                /* TSC 1 */
+                                memcpy(skb->data + offset, ((u8 *)&pn48) + 1, 1);
+                                /* TSC 2 , TSC 3 , TSC 4 , TSC 5*/
+                                memcpy(skb->data + offset + 4, ((u8 *)&pn48) + 2, 4);
+                        }
+                }
         }
 
         if (tkip_mic_type == HTT_RX_TKIP_MIC)
@@ -2263,6 +2336,20 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,
         if (mpdu_ranges->mpdu_range_status == HTT_RX_IND_MPDU_STATUS_TKIP_MIC_ERR)
                 rx_status->flag |= RX_FLAG_MMIC_ERROR;
 
+        if (!qos && tid < IEEE80211_NUM_TIDS) {
+                u8 offset;
+                __le16 qos_ctrl = 0;
+
+                hdr = (struct ieee80211_hdr *)skb->data;
+                offset = ieee80211_hdrlen(hdr->frame_control);
+
+                hdr->frame_control |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
+                memmove(skb->data - IEEE80211_QOS_CTL_LEN, skb->data, offset);
+                skb_push(skb, IEEE80211_QOS_CTL_LEN);
+                qos_ctrl = cpu_to_le16(tid);
+                memcpy(skb->data + offset, &qos_ctrl, IEEE80211_QOS_CTL_LEN);
+        }
+
         ieee80211_rx_ni(ar->hw, skb);
 
         /* We have delivered the skb to the upper layers (mac80211) so we
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 2ef717f18795..a182c0944cc7 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -1237,6 +1237,7 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm
         struct ath10k *ar = htt->ar;
         int res, data_len;
         struct htt_cmd_hdr *cmd_hdr;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data;
         struct htt_data_tx_desc *tx_desc;
         struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu);
         struct sk_buff *tmp_skb;
@@ -1247,6 +1248,13 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm
         u16 flags1 = 0;
         u16 msdu_id = 0;
 
+        if ((ieee80211_is_action(hdr->frame_control) ||
+             ieee80211_is_deauth(hdr->frame_control) ||
+             ieee80211_is_disassoc(hdr->frame_control)) &&
+             ieee80211_has_protected(hdr->frame_control)) {
+                skb_put(msdu, IEEE80211_CCMP_MIC_LEN);
+        }
+
         data_len = msdu->len;
 
         switch (txmode) {
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 12dad659bf68..a6d21856b7e7 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -5503,10 +5503,6 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
 
         mutex_lock(&ar->conf_mutex);
 
-        spin_lock_bh(&ar->data_lock);
-        ath10k_mac_vif_beacon_cleanup(arvif);
-        spin_unlock_bh(&ar->data_lock);
-
         ret = ath10k_spectral_vif_stop(arvif);
         if (ret)
                 ath10k_warn(ar, "failed to stop spectral for vdev %i: %d\n",
@@ -5575,6 +5571,11 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
                         peer->vif = NULL;
                 }
         }
+
+        /* Clean this up late, less opportunity for firmware to access
+         * DMA memory we have deleted.
+         */
+        ath10k_mac_vif_beacon_cleanup(arvif);
         spin_unlock_bh(&ar->data_lock);
 
         ath10k_peer_cleanup(ar, arvif->vdev_id);
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index 8ed4fbd8d6c3..9870d2d095c8 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -381,16 +381,11 @@ static int ath10k_sdio_mbox_rx_process_packet(struct ath10k *ar,
         struct ath10k_htc_hdr *htc_hdr = (struct ath10k_htc_hdr *)skb->data;
         bool trailer_present = htc_hdr->flags & ATH10K_HTC_FLAG_TRAILER_PRESENT;
         enum ath10k_htc_ep_id eid;
-        u16 payload_len;
         u8 *trailer;
         int ret;
 
-        payload_len = le16_to_cpu(htc_hdr->len);
-        skb->len = payload_len + sizeof(struct ath10k_htc_hdr);
-
         if (trailer_present) {
-                trailer = skb->data + sizeof(*htc_hdr) +
-                          payload_len - htc_hdr->trailer_len;
+                trailer = skb->data + skb->len - htc_hdr->trailer_len;
 
                 eid = pipe_id_to_eid(htc_hdr->eid);
 
@@ -632,13 +627,31 @@ static int ath10k_sdio_mbox_rx_packet(struct ath10k *ar,
 {
         struct ath10k_sdio *ar_sdio = ath10k_sdio_priv(ar);
         struct sk_buff *skb = pkt->skb;
+        struct ath10k_htc_hdr *htc_hdr;
         int ret;
 
         ret = ath10k_sdio_readsb(ar, ar_sdio->mbox_info.htc_addr,
                                  skb->data, pkt->alloc_len);
+        if (ret)
+                goto out;
+
+        /* Update actual length. The original length may be incorrect,
+         * as the FW will bundle multiple packets as long as their sizes
+         * fit within the same aligned length (pkt->alloc_len).
+         */
+        htc_hdr = (struct ath10k_htc_hdr *)skb->data;
+        pkt->act_len = le16_to_cpu(htc_hdr->len) + sizeof(*htc_hdr);
+        if (pkt->act_len > pkt->alloc_len) {
+                ath10k_warn(ar, "rx packet too large (%zu > %zu)\n",
+                            pkt->act_len, pkt->alloc_len);
+                ret = -EMSGSIZE;
+                goto out;
+        }
+
+        skb_put(skb, pkt->act_len);
+
+out:
         pkt->status = ret;
-        if (!ret)
-                skb_put(skb, pkt->act_len);
 
         return ret;
 }
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index 2985bb17decd..4d5d10c01064 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -841,7 +841,7 @@ static int ath10k_wmi_tlv_op_pull_ch_info_ev(struct ath10k *ar,
                                              struct wmi_ch_info_ev_arg *arg)
 {
         const void **tb;
-        const struct wmi_chan_info_event *ev;
+        const struct wmi_tlv_chan_info_event *ev;
         int ret;
 
         tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
index d691f06e58f2..649b229a41e9 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
@@ -1615,6 +1615,22 @@ struct chan_info_params {
 
 #define WMI_TLV_FLAG_MGMT_BUNDLE_TX_COMPL       BIT(9)
 
+struct wmi_tlv_chan_info_event {
+        __le32 err_code;
+        __le32 freq;
+        __le32 cmd_flags;
+        __le32 noise_floor;
+        __le32 rx_clear_count;
+        __le32 cycle_count;
+        __le32 chan_tx_pwr_range;
+        __le32 chan_tx_pwr_tp;
+        __le32 rx_frame_count;
+        __le32 my_bss_rx_cycle_count;
+        __le32 rx_11b_mode_data_duration;
+        __le32 tx_frame_cnt;
+        __le32 mac_clk_mhz;
+} __packed;
+
 struct wmi_tlv_mgmt_tx_compl_ev {
         __le32 desc_id;
         __le32 status;
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 838768c98adc..e80dbe7e8f4c 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -6533,14 +6533,6 @@ struct wmi_chan_info_event {
         __le32 noise_floor;
         __le32 rx_clear_count;
         __le32 cycle_count;
-        __le32 chan_tx_pwr_range;
-        __le32 chan_tx_pwr_tp;
-        __le32 rx_frame_count;
-        __le32 my_bss_rx_cycle_count;
-        __le32 rx_11b_mode_data_duration;
-        __le32 tx_frame_cnt;
-        __le32 mac_clk_mhz;
-
 } __packed;
 
 struct wmi_10_4_chan_info_event {
diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index 65c31da43c47..998947ef63b6 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -2855,8 +2855,8 @@ static void *ath6kl_htc_mbox_create(struct ath6kl *ar)
         target->dev = kzalloc(sizeof(*target->dev), GFP_KERNEL);
         if (!target->dev) {
                 ath6kl_err("unable to allocate memory\n");
-                status = -ENOMEM;
-                goto err_htc_cleanup;
+                kfree(target);
+                return NULL;
         }
 
         spin_lock_init(&target->htc_lock);
diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c
index 4defb7a0330f..53b66e9434c9 100644
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
@@ -132,6 +132,10 @@ ath6kl_usb_alloc_urb_from_pipe(struct ath6kl_usb_pipe *pipe)
         struct ath6kl_urb_context *urb_context = NULL;
         unsigned long flags;
 
+        /* bail if this pipe is not initialized */
+        if (!pipe->ar_usb)
+                return NULL;
+
         spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags);
         if (!list_empty(&pipe->urb_list_head)) {
                 urb_context =
@@ -150,6 +154,10 @@ static void ath6kl_usb_free_urb_to_pipe(struct ath6kl_usb_pipe *pipe,
 {
         unsigned long flags;
 
+        /* bail if this pipe is not initialized */
+        if (!pipe->ar_usb)
+                return;
+
         spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags);
         pipe->urb_cnt++;
 
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index 5601cfd6a293..2d1247f61297 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -157,6 +157,22 @@ config ATH9K_PCOEM
         depends on ATH9K
         default y
 
+config ATH9K_PCI_NO_EEPROM
+        tristate "Atheros ath9k pci loader for EEPROM-less chips"
+        depends on ATH9K_PCI
+        default n
+        help
+         This separate driver provides a loader in order to support the
+         AR500X to AR92XX-generation of ath9k PCI(e) WiFi chips, which have
+         their initialization data (which contains the real PCI Device ID
+         that ath9k will need) stored together with the calibration data out
+         of reach for the ath9k chip.
+
+         These devices are usually various network appliances, routers or
+         access Points and such.
+
+         If unsure say N.
+
 config ATH9K_HTC
        tristate "Atheros HTC based wireless cards support"
        depends on USB && MAC80211
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index 15af0a836925..eff94bcd1f0a 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -77,3 +77,5 @@ ath9k_htc-y +=	htc_hst.o \
 ath9k_htc-$(CONFIG_ATH9K_HTC_DEBUGFS) += htc_drv_debug.o
 
 obj-$(CONFIG_ATH9K_HTC) += ath9k_htc.o
+
+obj-$(CONFIG_ATH9K_PCI_NO_EEPROM) += ath9k_pci_owl_loader.o
diff --git a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c
new file mode 100644
index 000000000000..159490f5a111
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c
@@ -0,0 +1,215 @@
+// SPDX-License-Identifier: ISC
+/* Initialize Owl Emulation Devices
+ *
+ * Copyright (C) 2016 Christian Lamparter <chunkeey@gmail.com>
+ * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+ *
+ * Some devices (like the Cisco Meraki Z1 Cloud Managed Teleworker Gateway)
+ * need to be able to initialize the PCIe wifi device. Normally, this is done
+ * during the early stages as a pci quirk.
+ * However, this isn't possible for devices which have the init code for the
+ * Atheros chip stored on UBI Volume on NAND. Hence, this module can be used to
+ * initialize the chip when the user-space is ready to extract the init code.
+ */
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/completion.h>
+#include <linux/etherdevice.h>
+#include <linux/firmware.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+
+struct owl_ctx {
+        struct completion eeprom_load;
+};
+
+#define EEPROM_FILENAME_LEN 100
+
+#define AR5416_EEPROM_MAGIC 0xa55a
+
+static int ath9k_pci_fixup(struct pci_dev *pdev, const u16 *cal_data,
+                           size_t cal_len)
+{
+        void __iomem *mem;
+        const void *cal_end = (void *)cal_data + cal_len;
+        const struct {
+                u16 reg;
+                u16 low_val;
+                u16 high_val;
+        } __packed * data;
+        u16 cmd;
+        u32 bar0;
+        bool swap_needed = false;
+
+        if (*cal_data != AR5416_EEPROM_MAGIC) {
+                if (*cal_data != swab16(AR5416_EEPROM_MAGIC)) {
+                        dev_err(&pdev->dev, "invalid calibration data\n");
+                        return -EINVAL;
+                }
+
+                dev_dbg(&pdev->dev, "calibration data needs swapping\n");
+                swap_needed = true;
+        }
+
+        dev_info(&pdev->dev, "fixup device configuration\n");
+
+        mem = pcim_iomap(pdev, 0, 0);
+        if (!mem) {
+                dev_err(&pdev->dev, "ioremap error\n");
+                return -EINVAL;
+        }
+
+        pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &bar0);
+        pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0,
+                               pci_resource_start(pdev, 0));
+        pci_read_config_word(pdev, PCI_COMMAND, &cmd);
+        cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+        pci_write_config_word(pdev, PCI_COMMAND, cmd);
+
+        /* set pointer to first reg address */
+        for (data = (const void *)(cal_data + 3);
+             (const void *)data <= cal_end && data->reg != (u16)~0;
+             data++) {
+                u32 val;
+                u16 reg;
+
+                reg = data->reg;
+                val = data->low_val;
+                val |= ((u32)data->high_val) << 16;
+
+                if (swap_needed) {
+                        reg = swab16(reg);
+                        val = swahb32(val);
+                }
+
+                __raw_writel(val, mem + reg);
+                usleep_range(100, 120);
+        }
+
+        pci_read_config_word(pdev, PCI_COMMAND, &cmd);
+        cmd &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
+        pci_write_config_word(pdev, PCI_COMMAND, cmd);
+
+        pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, bar0);
+        pcim_iounmap(pdev, mem);
+
+        pci_disable_device(pdev);
+
+        return 0;
+}
+
+static void owl_fw_cb(const struct firmware *fw, void *context)
+{
+        struct pci_dev *pdev = (struct pci_dev *)context;
+        struct owl_ctx *ctx = (struct owl_ctx *)pci_get_drvdata(pdev);
+        struct pci_bus *bus;
+
+        complete(&ctx->eeprom_load);
+
+        if (!fw) {
+                dev_err(&pdev->dev, "no eeprom data received.\n");
+                goto release;
+        }
+
+        /* also note that we are doing *u16 operations on the file */
+        if (fw->size > 4096 || fw->size < 0x200 || (fw->size & 1) == 1) {
+                dev_err(&pdev->dev, "eeprom file has an invalid size.\n");
+                goto release;
+        }
+
+        if (ath9k_pci_fixup(pdev, (const u16 *)fw->data, fw->size))
+                goto release;
+
+        pci_lock_rescan_remove();
+        bus = pdev->bus;
+        pci_stop_and_remove_bus_device(pdev);
+        /* the device should come back with the proper
+         * ProductId. But we have to initiate a rescan.
+         */
+        pci_rescan_bus(bus);
+        pci_unlock_rescan_remove();
+
+release:
+        release_firmware(fw);
+}
+
+static const char *owl_get_eeprom_name(struct pci_dev *pdev)
+{
+        struct device *dev = &pdev->dev;
+        char *eeprom_name;
+
+        dev_dbg(dev, "using auto-generated eeprom filename\n");
+
+        eeprom_name = devm_kzalloc(dev, EEPROM_FILENAME_LEN, GFP_KERNEL);
+        if (!eeprom_name)
+                return NULL;
+
+        /* this should match the pattern used in ath9k/init.c */
+        scnprintf(eeprom_name, EEPROM_FILENAME_LEN, "ath9k-eeprom-pci-%s.bin",
+                  dev_name(dev));
+
+        return eeprom_name;
+}
+
+static int owl_probe(struct pci_dev *pdev,
+                     const struct pci_device_id *id)
+{
+        struct owl_ctx *ctx;
+        const char *eeprom_name;
+        int err = 0;
+
+        if (pcim_enable_device(pdev))
+                return -EIO;
+
+        pcim_pin_device(pdev);
+
+        eeprom_name = owl_get_eeprom_name(pdev);
+        if (!eeprom_name) {
+                dev_err(&pdev->dev, "no eeprom filename found.\n");
+                return -ENODEV;
+        }
+
+        ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
+        if (!ctx)
+                return -ENOMEM;
+
+        init_completion(&ctx->eeprom_load);
+
+        pci_set_drvdata(pdev, ctx);
+        err = request_firmware_nowait(THIS_MODULE, true, eeprom_name,
+                                      &pdev->dev, GFP_KERNEL, pdev, owl_fw_cb);
+        if (err)
+                dev_err(&pdev->dev, "failed to request caldata (%d).\n", err);
+
+        return err;
+}
+
+static void owl_remove(struct pci_dev *pdev)
+{
+        struct owl_ctx *ctx = pci_get_drvdata(pdev);
+
+        if (ctx) {
+                wait_for_completion(&ctx->eeprom_load);
+                pci_set_drvdata(pdev, NULL);
+        }
+}
+
+static const struct pci_device_id owl_pci_table[] = {
+        { PCI_VDEVICE(ATHEROS, 0xff1c) }, /* PCIe */
+        { PCI_VDEVICE(ATHEROS, 0xff1d) }, /* PCI */
+        { },
+};
+MODULE_DEVICE_TABLE(pci, owl_pci_table);
+
+static struct pci_driver owl_driver = {
+        .name           = KBUILD_MODNAME,
+        .id_table       = owl_pci_table,
+        .probe          = owl_probe,
+        .remove         = owl_remove,
+};
+module_pci_driver(owl_driver);
+MODULE_AUTHOR("Christian Lamparter <chunkeey@gmail.com>");
+MODULE_DESCRIPTION("External EEPROM data loader for Atheros AR500X to AR92XX");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/wireless/ath/ath9k/dynack.c b/drivers/net/wireless/ath/ath9k/dynack.c
index f112fa5b2eac..fbeb4a739d32 100644
--- a/drivers/net/wireless/ath/ath9k/dynack.c
+++ b/drivers/net/wireless/ath/ath9k/dynack.c
@@ -20,12 +20,31 @@
 
 #define COMPUTE_TO              (5 * HZ)
 #define LATEACK_DELAY           (10 * HZ)
-#define LATEACK_TO              256
-#define MAX_DELAY               300
 #define EWMA_LEVEL              96
 #define EWMA_DIV                128
 
 /**
+ * ath_dynack_get_max_to - set max timeout according to channel width
+ * @ah: ath hw
+ *
+ */
+static u32 ath_dynack_get_max_to(struct ath_hw *ah)
+{
+        const struct ath9k_channel *chan = ah->curchan;
+
+        if (!chan)
+                return 300;
+
+        if (IS_CHAN_HT40(chan))
+                return 300;
+        if (IS_CHAN_HALF_RATE(chan))
+                return 750;
+        if (IS_CHAN_QUARTER_RATE(chan))
+                return 1500;
+        return 600;
+}
+
+/**
  * ath_dynack_ewma - EWMA (Exponentially Weighted Moving Average) calculation
  *
  */
@@ -79,6 +98,24 @@ static inline bool ath_dynack_bssidmask(struct ath_hw *ah, const u8 *mac)
 }
 
 /**
+ * ath_dynack_set_timeout - configure timeouts/slottime registers
+ * @ah: ath hw
+ * @to: timeout value
+ *
+ */
+static void ath_dynack_set_timeout(struct ath_hw *ah, int to)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        int slottime = (to - 3) / 2;
+
+        ath_dbg(common, DYNACK, "ACK timeout %u slottime %u\n",
+                to, slottime);
+        ath9k_hw_setslottime(ah, slottime);
+        ath9k_hw_set_ack_timeout(ah, to);
+        ath9k_hw_set_cts_timeout(ah, to);
+}
+
+/**
  * ath_dynack_compute_ackto - compute ACK timeout as the maximum STA timeout
  * @ah: ath hw
  *
@@ -86,7 +123,6 @@ static inline bool ath_dynack_bssidmask(struct ath_hw *ah, const u8 *mac)
  */
 static void ath_dynack_compute_ackto(struct ath_hw *ah)
 {
-        struct ath_common *common = ath9k_hw_common(ah);
         struct ath_dynack *da = &ah->dynack;
         struct ath_node *an;
         int to = 0;
@@ -96,15 +132,8 @@ static void ath_dynack_compute_ackto(struct ath_hw *ah)
                         to = an->ackto;
 
         if (to && da->ackto != to) {
-                u32 slottime;
-
-                slottime = (to - 3) / 2;
+                ath_dynack_set_timeout(ah, to);
                 da->ackto = to;
-                ath_dbg(common, DYNACK, "ACK timeout %u slottime %u\n",
-                        da->ackto, slottime);
-                ath9k_hw_setslottime(ah, slottime);
-                ath9k_hw_set_ack_timeout(ah, da->ackto);
-                ath9k_hw_set_cts_timeout(ah, da->ackto);
         }
 }
 
@@ -116,15 +145,16 @@ static void ath_dynack_compute_ackto(struct ath_hw *ah)
  */
 static void ath_dynack_compute_to(struct ath_hw *ah)
 {
-        u32 ackto, ack_ts;
-        u8 *dst, *src;
+        struct ath_dynack *da = &ah->dynack;
+        u32 ackto, ack_ts, max_to;
         struct ieee80211_sta *sta;
-        struct ath_node *an;
         struct ts_info *st_ts;
-        struct ath_dynack *da = &ah->dynack;
+        struct ath_node *an;
+        u8 *dst, *src;
 
         rcu_read_lock();
 
+        max_to = ath_dynack_get_max_to(ah);
         while (da->st_rbf.h_rb != da->st_rbf.t_rb &&
                da->ack_rbf.h_rb != da->ack_rbf.t_rb) {
                 ack_ts = da->ack_rbf.tstamp[da->ack_rbf.h_rb];
@@ -140,7 +170,7 @@ static void ath_dynack_compute_to(struct ath_hw *ah)
                 if (ack_ts > st_ts->tstamp + st_ts->dur) {
                         ackto = ack_ts - st_ts->tstamp - st_ts->dur;
 
-                        if (ackto < MAX_DELAY) {
+                        if (ackto < max_to) {
                                 sta = ieee80211_find_sta_by_ifaddr(ah->hw, dst,
                                                                    src);
                                 if (sta) {
@@ -197,11 +227,10 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,
                 if (ieee80211_is_assoc_req(hdr->frame_control) ||
                     ieee80211_is_assoc_resp(hdr->frame_control) ||
                     ieee80211_is_auth(hdr->frame_control)) {
-                        ath_dbg(common, DYNACK, "late ack\n");
+                        u32 max_to = ath_dynack_get_max_to(ah);
 
-                        ath9k_hw_setslottime(ah, (LATEACK_TO - 3) / 2);
-                        ath9k_hw_set_ack_timeout(ah, LATEACK_TO);
-                        ath9k_hw_set_cts_timeout(ah, LATEACK_TO);
+                        ath_dbg(common, DYNACK, "late ack\n");
+                        ath_dynack_set_timeout(ah, max_to);
                         if (sta) {
                                 struct ath_node *an;
 
@@ -292,15 +321,13 @@ EXPORT_SYMBOL(ath_dynack_sample_ack_ts);
  */
 void ath_dynack_node_init(struct ath_hw *ah, struct ath_node *an)
 {
-        /* ackto = slottime + sifs + air delay */
-        u32 ackto = 9 + 16 + 64;
         struct ath_dynack *da = &ah->dynack;
 
-        an->ackto = ackto;
+        an->ackto = da->ackto;
 
-        spin_lock(&da->qlock);
+        spin_lock_bh(&da->qlock);
         list_add_tail(&an->list, &da->nodes);
-        spin_unlock(&da->qlock);
+        spin_unlock_bh(&da->qlock);
 }
 EXPORT_SYMBOL(ath_dynack_node_init);
 
@@ -314,9 +341,9 @@ void ath_dynack_node_deinit(struct ath_hw *ah, struct ath_node *an)
 {
         struct ath_dynack *da = &ah->dynack;
 
-        spin_lock(&da->qlock);
+        spin_lock_bh(&da->qlock);
         list_del(&an->list);
-        spin_unlock(&da->qlock);
+        spin_unlock_bh(&da->qlock);
 }
 EXPORT_SYMBOL(ath_dynack_node_deinit);
 
@@ -327,22 +354,26 @@ EXPORT_SYMBOL(ath_dynack_node_deinit);
  */
 void ath_dynack_reset(struct ath_hw *ah)
 {
-        /* ackto = slottime + sifs + air delay */
-        u32 ackto = 9 + 16 + 64;
         struct ath_dynack *da = &ah->dynack;
+        struct ath_node *an;
+
+        spin_lock_bh(&da->qlock);
 
-        da->lto = jiffies;
-        da->ackto = ackto;
+        da->lto = jiffies + COMPUTE_TO;
 
         da->st_rbf.t_rb = 0;
         da->st_rbf.h_rb = 0;
         da->ack_rbf.t_rb = 0;
         da->ack_rbf.h_rb = 0;
 
+        da->ackto = ath_dynack_get_max_to(ah);
+        list_for_each_entry(an, &da->nodes, list)
+                an->ackto = da->ackto;
+
         /* init acktimeout */
-        ath9k_hw_setslottime(ah, (ackto - 3) / 2);
-        ath9k_hw_set_ack_timeout(ah, ackto);
-        ath9k_hw_set_cts_timeout(ah, ackto);
+        ath_dynack_set_timeout(ah, da->ackto);
+
+        spin_unlock_bh(&da->qlock);
 }
 EXPORT_SYMBOL(ath_dynack_reset);
 
@@ -359,6 +390,8 @@ void ath_dynack_init(struct ath_hw *ah)
 
         spin_lock_init(&da->qlock);
         INIT_LIST_HEAD(&da->nodes);
+        /* ackto = slottime + sifs + air delay */
+        da->ackto = 9 + 16 + 64;
 
         ah->hw->wiphy->features |= NL80211_FEATURE_ACKTO_ESTIMATION;
 }
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 214c68269a69..d961095ab01f 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -463,7 +463,7 @@ static void ath9k_enable_rmw_buffer(void *hw_priv)
         atomic_inc(&priv->wmi->m_rmw_cnt);
 }
 
-static u32 ath9k_reg_rmw_single(void *hw_priv,
+static void ath9k_reg_rmw_single(void *hw_priv,
                                  u32 reg_offset, u32 set, u32 clr)
 {
         struct ath_hw *ah = hw_priv;
@@ -471,7 +471,6 @@ static u32 ath9k_reg_rmw_single(void *hw_priv,
         struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
         struct register_rmw buf, buf_ret;
         int ret;
-        u32 val = 0;
 
         buf.reg = cpu_to_be32(reg_offset);
         buf.set = cpu_to_be32(set);
@@ -485,7 +484,6 @@ static u32 ath9k_reg_rmw_single(void *hw_priv,
                 ath_dbg(common, WMI, "REGISTER RMW FAILED:(0x%04x, %d)\n",
                         reg_offset, ret);
         }
-        return val;
 }
 
 static u32 ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 clr)
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 1bf63a4efb4c..d091c8ebdcf0 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -170,6 +170,7 @@ static int htc_config_pipe_credits(struct htc_target *target)
         time_left = wait_for_completion_timeout(&target->cmd_wait, HZ);
         if (!time_left) {
                 dev_err(target->dev, "HTC credit config timeout\n");
+                kfree_skb(skb);
                 return -ETIMEDOUT;
         }
 
@@ -205,6 +206,7 @@ static int htc_setup_complete(struct htc_target *target)
         time_left = wait_for_completion_timeout(&target->cmd_wait, HZ);
         if (!time_left) {
                 dev_err(target->dev, "HTC start timeout\n");
+                kfree_skb(skb);
                 return -ETIMEDOUT;
         }
 
@@ -277,6 +279,7 @@ int htc_connect_service(struct htc_target *target,
         if (!time_left) {
                 dev_err(target->dev, "Service connection timeout for: %d\n",
                         service_connreq->service_id);
+                kfree_skb(skb);
                 return -ETIMEDOUT;
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index d1f6710ca63b..cdc146091194 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -336,6 +336,7 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
                 ath_dbg(common, WMI, "Timeout waiting for WMI command: %s\n",
                         wmi_cmd_to_name(cmd_id));
                 mutex_unlock(&wmi->op_mutex);
+                kfree_skb(skb);
                 return -ETIMEDOUT;
         }
 
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
index 99f1897a775d..486957a04bd1 100644
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
@@ -1107,12 +1107,10 @@ static int carl9170_usb_probe(struct usb_interface *intf,
 static void carl9170_usb_disconnect(struct usb_interface *intf)
 {
         struct ar9170 *ar = usb_get_intfdata(intf);
-        struct usb_device *udev;
 
         if (WARN_ON(!ar))
                 return;
 
-        udev = ar->udev;
         wait_for_completion(&ar->fw_load_wait);
 
         if (IS_INITIALIZED(ar)) {
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index 1d2d698fb779..523550f94a3f 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -641,52 +641,58 @@ int wcn36xx_smd_start_hw_scan(struct wcn36xx *wcn, struct ieee80211_vif *vif,
                               struct cfg80211_scan_request *req)
 {
         struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);
-        struct wcn36xx_hal_start_scan_offload_req_msg msg_body;
+        struct wcn36xx_hal_start_scan_offload_req_msg *msg_body;
         int ret, i;
 
         if (req->ie_len > WCN36XX_MAX_SCAN_IE_LEN)
                 return -EINVAL;
 
         mutex_lock(&wcn->hal_mutex);
-        INIT_HAL_MSG(msg_body, WCN36XX_HAL_START_SCAN_OFFLOAD_REQ);
+        msg_body = kzalloc(sizeof(*msg_body), GFP_KERNEL);
+        if (!msg_body) {
+                ret = -ENOMEM;
+                goto out;
+        }
 
-        msg_body.scan_type = WCN36XX_HAL_SCAN_TYPE_ACTIVE;
-        msg_body.min_ch_time = 30;
-        msg_body.max_ch_time = 100;
-        msg_body.scan_hidden = 1;
-        memcpy(msg_body.mac, vif->addr, ETH_ALEN);
-        msg_body.bss_type = vif_priv->bss_type;
-        msg_body.p2p_search = vif->p2p;
+        INIT_HAL_MSG((*msg_body), WCN36XX_HAL_START_SCAN_OFFLOAD_REQ);
 
-        msg_body.num_ssid = min_t(u8, req->n_ssids, ARRAY_SIZE(msg_body.ssids));
-        for (i = 0; i < msg_body.num_ssid; i++) {
-                msg_body.ssids[i].length = min_t(u8, req->ssids[i].ssid_len,
-                                                sizeof(msg_body.ssids[i].ssid));
-                memcpy(msg_body.ssids[i].ssid, req->ssids[i].ssid,
-                       msg_body.ssids[i].length);
+        msg_body->scan_type = WCN36XX_HAL_SCAN_TYPE_ACTIVE;
+        msg_body->min_ch_time = 30;
+        msg_body->max_ch_time = 100;
+        msg_body->scan_hidden = 1;
+        memcpy(msg_body->mac, vif->addr, ETH_ALEN);
+        msg_body->bss_type = vif_priv->bss_type;
+        msg_body->p2p_search = vif->p2p;
+
+        msg_body->num_ssid = min_t(u8, req->n_ssids, ARRAY_SIZE(msg_body->ssids));
+        for (i = 0; i < msg_body->num_ssid; i++) {
+                msg_body->ssids[i].length = min_t(u8, req->ssids[i].ssid_len,
+                                                sizeof(msg_body->ssids[i].ssid));
+                memcpy(msg_body->ssids[i].ssid, req->ssids[i].ssid,
+                       msg_body->ssids[i].length);
         }
 
-        msg_body.num_channel = min_t(u8, req->n_channels,
-                                     sizeof(msg_body.channels));
-        for (i = 0; i < msg_body.num_channel; i++)
-                msg_body.channels[i] = req->channels[i]->hw_value;
+        msg_body->num_channel = min_t(u8, req->n_channels,
+                                     sizeof(msg_body->channels));
+        for (i = 0; i < msg_body->num_channel; i++)
+                msg_body->channels[i] = req->channels[i]->hw_value;
 
-        msg_body.header.len -= WCN36XX_MAX_SCAN_IE_LEN;
+        msg_body->header.len -= WCN36XX_MAX_SCAN_IE_LEN;
 
         if (req->ie_len > 0) {
-                msg_body.ie_len = req->ie_len;
-                msg_body.header.len += req->ie_len;
-                memcpy(msg_body.ie, req->ie, req->ie_len);
+                msg_body->ie_len = req->ie_len;
+                msg_body->header.len += req->ie_len;
+                memcpy(msg_body->ie, req->ie, req->ie_len);
         }
 
-        PREPARE_HAL_BUF(wcn->hal_buf, msg_body);
+        PREPARE_HAL_BUF(wcn->hal_buf, (*msg_body));
 
         wcn36xx_dbg(WCN36XX_DBG_HAL,
                     "hal start hw-scan (channels: %u; ssids: %u; p2p: %s)\n",
-                    msg_body.num_channel, msg_body.num_ssid,
-                    msg_body.p2p_search ? "yes" : "no");
+                    msg_body->num_channel, msg_body->num_ssid,
+                    msg_body->p2p_search ? "yes" : "no");
 
-        ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);
+        ret = wcn36xx_smd_send_and_wait(wcn, msg_body->header.len);
         if (ret) {
                 wcn36xx_err("Sending hal_start_scan_offload failed\n");
                 goto out;
@@ -698,6 +704,7 @@ int wcn36xx_smd_start_hw_scan(struct wcn36xx *wcn, struct ieee80211_vif *vif,
                 goto out;
         }
 out:
+        kfree(msg_body);
         mutex_unlock(&wcn->hal_mutex);
         return ret;
 }
@@ -1257,96 +1264,104 @@ out:
 static int wcn36xx_smd_config_bss_v1(struct wcn36xx *wcn,
                         const struct wcn36xx_hal_config_bss_req_msg *orig)
 {
-        struct wcn36xx_hal_config_bss_req_msg_v1 msg_body;
-        struct wcn36xx_hal_config_bss_params_v1 *bss = &msg_body.bss_params;
-        struct wcn36xx_hal_config_sta_params_v1 *sta = &bss->sta;
+        struct wcn36xx_hal_config_bss_req_msg_v1 *msg_body;
+        struct wcn36xx_hal_config_bss_params_v1 *bss;
+        struct wcn36xx_hal_config_sta_params_v1 *sta;
+        int ret;
+
+        msg_body = kzalloc(sizeof(*msg_body), GFP_KERNEL);
+        if (!msg_body)
+                return -ENOMEM;
+
+        INIT_HAL_MSG((*msg_body), WCN36XX_HAL_CONFIG_BSS_REQ);
 
-        INIT_HAL_MSG(msg_body, WCN36XX_HAL_CONFIG_BSS_REQ);
+        bss = &msg_body->bss_params;
+        sta = &bss->sta;
 
         /* convert orig to v1 */
-        memcpy(&msg_body.bss_params.bssid,
+        memcpy(&msg_body->bss_params.bssid,
                &orig->bss_params.bssid, ETH_ALEN);
-        memcpy(&msg_body.bss_params.self_mac_addr,
+        memcpy(&msg_body->bss_params.self_mac_addr,
                &orig->bss_params.self_mac_addr, ETH_ALEN);
 
-        msg_body.bss_params.bss_type = orig->bss_params.bss_type;
-        msg_body.bss_params.oper_mode = orig->bss_params.oper_mode;
-        msg_body.bss_params.nw_type = orig->bss_params.nw_type;
+        msg_body->bss_params.bss_type = orig->bss_params.bss_type;
+        msg_body->bss_params.oper_mode = orig->bss_params.oper_mode;
+        msg_body->bss_params.nw_type = orig->bss_params.nw_type;
 
-        msg_body.bss_params.short_slot_time_supported =
+        msg_body->bss_params.short_slot_time_supported =
                 orig->bss_params.short_slot_time_supported;
-        msg_body.bss_params.lla_coexist = orig->bss_params.lla_coexist;
-        msg_body.bss_params.llb_coexist = orig->bss_params.llb_coexist;
-        msg_body.bss_params.llg_coexist = orig->bss_params.llg_coexist;
-        msg_body.bss_params.ht20_coexist = orig->bss_params.ht20_coexist;
-        msg_body.bss_params.lln_non_gf_coexist =
+        msg_body->bss_params.lla_coexist = orig->bss_params.lla_coexist;
+        msg_body->bss_params.llb_coexist = orig->bss_params.llb_coexist;
+        msg_body->bss_params.llg_coexist = orig->bss_params.llg_coexist;
+        msg_body->bss_params.ht20_coexist = orig->bss_params.ht20_coexist;
+        msg_body->bss_params.lln_non_gf_coexist =
                 orig->bss_params.lln_non_gf_coexist;
 
-        msg_body.bss_params.lsig_tx_op_protection_full_support =
+        msg_body->bss_params.lsig_tx_op_protection_full_support =
                 orig->bss_params.lsig_tx_op_protection_full_support;
-        msg_body.bss_params.rifs_mode = orig->bss_params.rifs_mode;
-        msg_body.bss_params.beacon_interval = orig->bss_params.beacon_interval;
-        msg_body.bss_params.dtim_period = orig->bss_params.dtim_period;
-        msg_body.bss_params.tx_channel_width_set =
+        msg_body->bss_params.rifs_mode = orig->bss_params.rifs_mode;
+        msg_body->bss_params.beacon_interval = orig->bss_params.beacon_interval;
+        msg_body->bss_params.dtim_period = orig->bss_params.dtim_period;
+        msg_body->bss_params.tx_channel_width_set =
                 orig->bss_params.tx_channel_width_set;
-        msg_body.bss_params.oper_channel = orig->bss_params.oper_channel;
-        msg_body.bss_params.ext_channel = orig->bss_params.ext_channel;
+        msg_body->bss_params.oper_channel = orig->bss_params.oper_channel;
+        msg_body->bss_params.ext_channel = orig->bss_params.ext_channel;
 
-        msg_body.bss_params.reserved = orig->bss_params.reserved;
+        msg_body->bss_params.reserved = orig->bss_params.reserved;
 
-        memcpy(&msg_body.bss_params.ssid,
+        memcpy(&msg_body->bss_params.ssid,
                &orig->bss_params.ssid,
                sizeof(orig->bss_params.ssid));
 
-        msg_body.bss_params.action = orig->bss_params.action;
-        msg_body.bss_params.rateset = orig->bss_params.rateset;
-        msg_body.bss_params.ht = orig->bss_params.ht;
-        msg_body.bss_params.obss_prot_enabled =
+        msg_body->bss_params.action = orig->bss_params.action;
+        msg_body->bss_params.rateset = orig->bss_params.rateset;
+        msg_body->bss_params.ht = orig->bss_params.ht;
+        msg_body->bss_params.obss_prot_enabled =
                 orig->bss_params.obss_prot_enabled;
-        msg_body.bss_params.rmf = orig->bss_params.rmf;
-        msg_body.bss_params.ht_oper_mode = orig->bss_params.ht_oper_mode;
-        msg_body.bss_params.dual_cts_protection =
+        msg_body->bss_params.rmf = orig->bss_params.rmf;
+        msg_body->bss_params.ht_oper_mode = orig->bss_params.ht_oper_mode;
+        msg_body->bss_params.dual_cts_protection =
                 orig->bss_params.dual_cts_protection;
 
-        msg_body.bss_params.max_probe_resp_retry_limit =
+        msg_body->bss_params.max_probe_resp_retry_limit =
                 orig->bss_params.max_probe_resp_retry_limit;
-        msg_body.bss_params.hidden_ssid = orig->bss_params.hidden_ssid;
-        msg_body.bss_params.proxy_probe_resp =
+        msg_body->bss_params.hidden_ssid = orig->bss_params.hidden_ssid;
+        msg_body->bss_params.proxy_probe_resp =
                 orig->bss_params.proxy_probe_resp;
-        msg_body.bss_params.edca_params_valid =
+        msg_body->bss_params.edca_params_valid =
                 orig->bss_params.edca_params_valid;
 
-        memcpy(&msg_body.bss_params.acbe,
+        memcpy(&msg_body->bss_params.acbe,
                &orig->bss_params.acbe,
                sizeof(orig->bss_params.acbe));
-        memcpy(&msg_body.bss_params.acbk,
+        memcpy(&msg_body->bss_params.acbk,
                &orig->bss_params.acbk,
                sizeof(orig->bss_params.acbk));
-        memcpy(&msg_body.bss_params.acvi,
+        memcpy(&msg_body->bss_params.acvi,
                &orig->bss_params.acvi,
                sizeof(orig->bss_params.acvi));
-        memcpy(&msg_body.bss_params.acvo,
+        memcpy(&msg_body->bss_params.acvo,
                &orig->bss_params.acvo,
                sizeof(orig->bss_params.acvo));
 
-        msg_body.bss_params.ext_set_sta_key_param_valid =
+        msg_body->bss_params.ext_set_sta_key_param_valid =
                 orig->bss_params.ext_set_sta_key_param_valid;
 
-        memcpy(&msg_body.bss_params.ext_set_sta_key_param,
+        memcpy(&msg_body->bss_params.ext_set_sta_key_param,
                &orig->bss_params.ext_set_sta_key_param,
                sizeof(orig->bss_params.acvo));
 
-        msg_body.bss_params.wcn36xx_hal_persona =
+        msg_body->bss_params.wcn36xx_hal_persona =
                 orig->bss_params.wcn36xx_hal_persona;
-        msg_body.bss_params.spectrum_mgt_enable =
+        msg_body->bss_params.spectrum_mgt_enable =
                 orig->bss_params.spectrum_mgt_enable;
-        msg_body.bss_params.tx_mgmt_power = orig->bss_params.tx_mgmt_power;
-        msg_body.bss_params.max_tx_power = orig->bss_params.max_tx_power;
+        msg_body->bss_params.tx_mgmt_power = orig->bss_params.tx_mgmt_power;
+        msg_body->bss_params.max_tx_power = orig->bss_params.max_tx_power;
 
         wcn36xx_smd_convert_sta_to_v1(wcn, &orig->bss_params.sta,
-                                      &msg_body.bss_params.sta);
+                                      &msg_body->bss_params.sta);
 
-        PREPARE_HAL_BUF(wcn->hal_buf, msg_body);
+        PREPARE_HAL_BUF(wcn->hal_buf, (*msg_body));
 
         wcn36xx_dbg(WCN36XX_DBG_HAL,
                     "hal config bss v1 bssid %pM self_mac_addr %pM bss_type %d oper_mode %d nw_type %d\n",
@@ -1358,7 +1373,10 @@ static int wcn36xx_smd_config_bss_v1(struct wcn36xx *wcn,
                     sta->bssid, sta->action, sta->sta_index,
                     sta->bssid_index, sta->aid, sta->type, sta->mac);
 
-        return wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);
+        ret = wcn36xx_smd_send_and_wait(wcn, msg_body->header.len);
+        kfree(msg_body);
+
+        return ret;
 }
 
 
@@ -1410,16 +1428,21 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
                            struct ieee80211_sta *sta, const u8 *bssid,
                            bool update)
 {
-        struct wcn36xx_hal_config_bss_req_msg msg;
+        struct wcn36xx_hal_config_bss_req_msg *msg;
         struct wcn36xx_hal_config_bss_params *bss;
         struct wcn36xx_hal_config_sta_params *sta_params;
         struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);
         int ret;
 
         mutex_lock(&wcn->hal_mutex);
-        INIT_HAL_MSG(msg, WCN36XX_HAL_CONFIG_BSS_REQ);
+        msg = kzalloc(sizeof(*msg), GFP_KERNEL);
+        if (!msg) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        INIT_HAL_MSG((*msg), WCN36XX_HAL_CONFIG_BSS_REQ);
 
-        bss = &msg.bss_params;
+        bss = &msg->bss_params;
         sta_params = &bss->sta;
 
         WARN_ON(is_zero_ether_addr(bssid));
@@ -1514,11 +1537,11 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
                     sta_params->mac);
 
         if (!wcn36xx_is_fw_version(wcn, 1, 2, 2, 24)) {
-                ret = wcn36xx_smd_config_bss_v1(wcn, &msg);
+                ret = wcn36xx_smd_config_bss_v1(wcn, msg);
         } else {
-                PREPARE_HAL_BUF(wcn->hal_buf, msg);
+                PREPARE_HAL_BUF(wcn->hal_buf, (*msg));
 
-                ret = wcn36xx_smd_send_and_wait(wcn, msg.header.len);
+                ret = wcn36xx_smd_send_and_wait(wcn, msg->header.len);
         }
         if (ret) {
                 wcn36xx_err("Sending hal_config_bss failed\n");
@@ -1534,6 +1557,7 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
                 goto out;
         }
 out:
+        kfree(msg);
         mutex_unlock(&wcn->hal_mutex);
         return ret;
 }
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 2414f574bf69..c70854ea5634 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -25,6 +25,22 @@
 
 #define WIL_MAX_ROC_DURATION_MS 5000
 
+#define WIL_EDMG_CHANNEL_9_SUBCHANNELS  (BIT(0) | BIT(1))
+#define WIL_EDMG_CHANNEL_10_SUBCHANNELS (BIT(1) | BIT(2))
+#define WIL_EDMG_CHANNEL_11_SUBCHANNELS (BIT(2) | BIT(3))
+
+/* WIL_EDMG_BW_CONFIGURATION define the allowed channel bandwidth
+ * configurations as defined by IEEE 802.11 section 9.4.2.251, Table 13.
+ * The value 5 allowing CB1 and CB2 of adjacent channels.
+ */
+#define WIL_EDMG_BW_CONFIGURATION 5
+
+/* WIL_EDMG_CHANNELS is a bitmap that indicates the 2.16 GHz channel(s) that
+ * are allowed to be used for EDMG transmissions in the BSS as defined by
+ * IEEE 802.11 section 9.4.2.251.
+ */
+#define WIL_EDMG_CHANNELS (BIT(0) | BIT(1) | BIT(2) | BIT(3))
+
 bool disable_ap_sme;
 module_param(disable_ap_sme, bool, 0444);
 MODULE_PARM_DESC(disable_ap_sme, " let user space handle AP mode SME");
@@ -51,6 +67,39 @@ static struct ieee80211_channel wil_60ghz_channels[] = {
         CHAN60G(4, 0),
 };
 
+/* Rx channel bonding mode */
+enum wil_rx_cb_mode {
+        WIL_RX_CB_MODE_DMG,
+        WIL_RX_CB_MODE_EDMG,
+        WIL_RX_CB_MODE_WIDE,
+};
+
+static int wil_rx_cb_mode_to_n_bonded(u8 cb_mode)
+{
+        switch (cb_mode) {
+        case WIL_RX_CB_MODE_DMG:
+        case WIL_RX_CB_MODE_EDMG:
+                return 1;
+        case WIL_RX_CB_MODE_WIDE:
+                return 2;
+        default:
+                return 1;
+        }
+}
+
+static int wil_tx_cb_mode_to_n_bonded(u8 cb_mode)
+{
+        switch (cb_mode) {
+        case WMI_TX_MODE_DMG:
+        case WMI_TX_MODE_EDMG_CB1:
+                return 1;
+        case WMI_TX_MODE_EDMG_CB2:
+                return 2;
+        default:
+                return 1;
+        }
+}
+
 static void
 wil_memdup_ie(u8 **pdst, size_t *pdst_len, const u8 *src, size_t src_len)
 {
@@ -82,6 +131,13 @@ void update_supported_bands(struct wil6210_priv *wil)
 
         wiphy->bands[NL80211_BAND_60GHZ]->n_channels =
                                                 wil_num_supported_channels(wil);
+
+        if (test_bit(WMI_FW_CAPABILITY_CHANNEL_BONDING, wil->fw_capabilities)) {
+                wiphy->bands[NL80211_BAND_60GHZ]->edmg_cap.channels =
+                                                        WIL_EDMG_CHANNELS;
+                wiphy->bands[NL80211_BAND_60GHZ]->edmg_cap.bw_config =
+                                                      WIL_EDMG_BW_CONFIGURATION;
+        }
 }
 
 /* Vendor id to be used in vendor specific command and events
@@ -275,6 +331,8 @@ static const char * const key_usage_str[] = {
         [WMI_KEY_USE_PAIRWISE]  = "PTK",
         [WMI_KEY_USE_RX_GROUP]  = "RX_GTK",
         [WMI_KEY_USE_TX_GROUP]  = "TX_GTK",
+        [WMI_KEY_USE_STORE_PTK] = "STORE_PTK",
+        [WMI_KEY_USE_APPLY_PTK] = "APPLY_PTK",
 };
 
 int wil_iftype_nl2wmi(enum nl80211_iftype type)
@@ -300,6 +358,86 @@ int wil_iftype_nl2wmi(enum nl80211_iftype type)
         return -EOPNOTSUPP;
 }
 
+int wil_spec2wmi_ch(u8 spec_ch, u8 *wmi_ch)
+{
+        switch (spec_ch) {
+        case 1:
+                *wmi_ch = WMI_CHANNEL_1;
+                break;
+        case 2:
+                *wmi_ch = WMI_CHANNEL_2;
+                break;
+        case 3:
+                *wmi_ch = WMI_CHANNEL_3;
+                break;
+        case 4:
+                *wmi_ch = WMI_CHANNEL_4;
+                break;
+        case 5:
+                *wmi_ch = WMI_CHANNEL_5;
+                break;
+        case 6:
+                *wmi_ch = WMI_CHANNEL_6;
+                break;
+        case 9:
+                *wmi_ch = WMI_CHANNEL_9;
+                break;
+        case 10:
+                *wmi_ch = WMI_CHANNEL_10;
+                break;
+        case 11:
+                *wmi_ch = WMI_CHANNEL_11;
+                break;
+        case 12:
+                *wmi_ch = WMI_CHANNEL_12;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+int wil_wmi2spec_ch(u8 wmi_ch, u8 *spec_ch)
+{
+        switch (wmi_ch) {
+        case WMI_CHANNEL_1:
+                *spec_ch = 1;
+                break;
+        case WMI_CHANNEL_2:
+                *spec_ch = 2;
+                break;
+        case WMI_CHANNEL_3:
+                *spec_ch = 3;
+                break;
+        case WMI_CHANNEL_4:
+                *spec_ch = 4;
+                break;
+        case WMI_CHANNEL_5:
+                *spec_ch = 5;
+                break;
+        case WMI_CHANNEL_6:
+                *spec_ch = 6;
+                break;
+        case WMI_CHANNEL_9:
+                *spec_ch = 9;
+                break;
+        case WMI_CHANNEL_10:
+                *spec_ch = 10;
+                break;
+        case WMI_CHANNEL_11:
+                *spec_ch = 11;
+                break;
+        case WMI_CHANNEL_12:
+                *spec_ch = 12;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,
                        struct station_info *sinfo)
 {
@@ -314,6 +452,7 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,
         } __packed reply;
         struct wil_net_stats *stats = &wil->sta[cid].stats;
         int rc;
+        u8 txflag = RATE_INFO_FLAGS_DMG;
 
         memset(&reply, 0, sizeof(reply));
 
@@ -327,7 +466,8 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,
                     "  MCS %d TSF 0x%016llx\n"
                     "  BF status 0x%08x RSSI %d SQI %d%%\n"
                     "  Tx Tpt %d goodput %d Rx goodput %d\n"
-                    "  Sectors(rx:tx) my %d:%d peer %d:%d\n""}\n",
+                    "  Sectors(rx:tx) my %d:%d peer %d:%d\n"
+                    "  Tx mode %d}\n",
                     cid, vif->mid, le16_to_cpu(reply.evt.bf_mcs),
                     le64_to_cpu(reply.evt.tsf), reply.evt.status,
                     reply.evt.rssi,
@@ -338,7 +478,8 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,
                     le16_to_cpu(reply.evt.my_rx_sector),
                     le16_to_cpu(reply.evt.my_tx_sector),
                     le16_to_cpu(reply.evt.other_rx_sector),
-                    le16_to_cpu(reply.evt.other_tx_sector));
+                    le16_to_cpu(reply.evt.other_tx_sector),
+                    reply.evt.tx_mode);
 
         sinfo->generation = wil->sinfo_gen;
 
@@ -351,9 +492,16 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,
                         BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC) |
                         BIT_ULL(NL80211_STA_INFO_TX_FAILED);
 
-        sinfo->txrate.flags = RATE_INFO_FLAGS_DMG;
+        if (wil->use_enhanced_dma_hw && reply.evt.tx_mode != WMI_TX_MODE_DMG)
+                txflag = RATE_INFO_FLAGS_EDMG;
+
+        sinfo->txrate.flags = txflag;
         sinfo->txrate.mcs = le16_to_cpu(reply.evt.bf_mcs);
         sinfo->rxrate.mcs = stats->last_mcs_rx;
+        sinfo->txrate.n_bonded_ch =
+                                  wil_tx_cb_mode_to_n_bonded(reply.evt.tx_mode);
+        sinfo->rxrate.n_bonded_ch =
+                             wil_rx_cb_mode_to_n_bonded(stats->last_cb_mode_rx);
         sinfo->rx_bytes = stats->rx_bytes;
         sinfo->rx_packets = stats->rx_packets;
         sinfo->rx_dropped_misc = stats->rx_dropped;
@@ -396,7 +544,7 @@ static int wil_cfg80211_get_station(struct wiphy *wiphy,
 /*
  * Find @idx-th active STA for specific MID for station dump.
  */
-static int wil_find_cid_by_idx(struct wil6210_priv *wil, u8 mid, int idx)
+int wil_find_cid_by_idx(struct wil6210_priv *wil, u8 mid, int idx)
 {
         int i;
 
@@ -1022,6 +1170,33 @@ static int wil_ft_connect(struct wiphy *wiphy,
         return rc;
 }
 
+static int wil_get_wmi_edmg_channel(struct wil6210_priv *wil, u8 edmg_bw_config,
+                                    u8 edmg_channels, u8 *wmi_ch)
+{
+        if (!edmg_bw_config) {
+                *wmi_ch = 0;
+                return 0;
+        } else if (edmg_bw_config == WIL_EDMG_BW_CONFIGURATION) {
+                /* convert from edmg channel bitmap into edmg channel number */
+                switch (edmg_channels) {
+                case WIL_EDMG_CHANNEL_9_SUBCHANNELS:
+                        return wil_spec2wmi_ch(9, wmi_ch);
+                case WIL_EDMG_CHANNEL_10_SUBCHANNELS:
+                        return wil_spec2wmi_ch(10, wmi_ch);
+                case WIL_EDMG_CHANNEL_11_SUBCHANNELS:
+                        return wil_spec2wmi_ch(11, wmi_ch);
+                default:
+                        wil_err(wil, "Unsupported edmg channel bitmap 0x%x\n",
+                                edmg_channels);
+                        return -EINVAL;
+                }
+        } else {
+                wil_err(wil, "Unsupported EDMG BW configuration %d\n",
+                        edmg_bw_config);
+                return -EINVAL;
+        }
+}
+
 static int wil_cfg80211_connect(struct wiphy *wiphy,
                                 struct net_device *ndev,
                                 struct cfg80211_connect_params *sme)
@@ -1167,6 +1342,11 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
         memcpy(conn.ssid, ssid_eid+2, conn.ssid_len);
         conn.channel = ch - 1;
 
+        rc = wil_get_wmi_edmg_channel(wil, sme->edmg.bw_config,
+                                      sme->edmg.channels, &conn.edmg_channel);
+        if (rc < 0)
+                return rc;
+
         ether_addr_copy(conn.bssid, bss->bssid);
         ether_addr_copy(conn.dst_mac, bss->bssid);
 
@@ -1376,6 +1556,7 @@ void wil_set_crypto_rx(u8 key_index, enum wmi_key_usage key_usage,
                 return;
 
         switch (key_usage) {
+        case WMI_KEY_USE_STORE_PTK:
         case WMI_KEY_USE_PAIRWISE:
                 for (tid = 0; tid < WIL_STA_TID_NUM; tid++) {
                         cc = &cs->tid_crypto_rx[tid].key_id[key_index];
@@ -1473,6 +1654,16 @@ static int wil_cfg80211_add_key(struct wiphy *wiphy,
                 return -EINVAL;
         }
 
+        spin_lock_bh(&wil->eap_lock);
+        if (pairwise && wdev->iftype == NL80211_IFTYPE_STATION &&
+            (vif->ptk_rekey_state == WIL_REKEY_M3_RECEIVED ||
+             vif->ptk_rekey_state == WIL_REKEY_WAIT_M4_SENT)) {
+                key_usage = WMI_KEY_USE_STORE_PTK;
+                vif->ptk_rekey_state = WIL_REKEY_WAIT_M4_SENT;
+                wil_dbg_misc(wil, "Store EAPOL key\n");
+        }
+        spin_unlock_bh(&wil->eap_lock);
+
         rc = wmi_add_cipher_key(vif, key_index, mac_addr, params->key_len,
                                 params->key, key_usage);
         if (!rc && !IS_ERR(cs)) {
@@ -1728,7 +1919,7 @@ out:
 static int _wil_cfg80211_start_ap(struct wiphy *wiphy,
                                   struct net_device *ndev,
                                   const u8 *ssid, size_t ssid_len, u32 privacy,
-                                  int bi, u8 chan,
+                                  int bi, u8 chan, u8 wmi_edmg_channel,
                                   struct cfg80211_beacon_data *bcon,
                                   u8 hidden_ssid, u32 pbss)
 {
@@ -1791,6 +1982,7 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy,
 
         vif->privacy = privacy;
         vif->channel = chan;
+        vif->wmi_edmg_channel = wmi_edmg_channel;
         vif->hidden_ssid = hidden_ssid;
         vif->pbss = pbss;
         vif->bi = bi;
@@ -1801,7 +1993,8 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy,
         if (!wil_has_other_active_ifaces(wil, ndev, false, true))
                 wil6210_bus_request(wil, WIL_MAX_BUS_REQUEST_KBPS);
 
-        rc = wmi_pcp_start(vif, bi, wmi_nettype, chan, hidden_ssid, is_go);
+        rc = wmi_pcp_start(vif, bi, wmi_nettype, chan, wmi_edmg_channel,
+                           hidden_ssid, is_go);
         if (rc)
                 goto err_pcp_start;
 
@@ -1853,7 +2046,8 @@ void wil_cfg80211_ap_recovery(struct wil6210_priv *wil)
                 rc = _wil_cfg80211_start_ap(wiphy, ndev,
                                             vif->ssid, vif->ssid_len,
                                             vif->privacy, vif->bi,
-                                            vif->channel, &bcon,
+                                            vif->channel,
+                                            vif->wmi_edmg_channel, &bcon,
                                             vif->hidden_ssid, vif->pbss);
                 if (rc) {
                         wil_err(wil, "vif %d recovery failed (%d)\n", i, rc);
@@ -1903,7 +2097,8 @@ static int wil_cfg80211_change_beacon(struct wiphy *wiphy,
                 rc = _wil_cfg80211_start_ap(wiphy, ndev, vif->ssid,
                                             vif->ssid_len, privacy,
                                             wdev->beacon_interval,
-                                            vif->channel, bcon,
+                                            vif->channel,
+                                            vif->wmi_edmg_channel, bcon,
                                             vif->hidden_ssid,
                                             vif->pbss);
         } else {
@@ -1922,10 +2117,17 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
         struct ieee80211_channel *channel = info->chandef.chan;
         struct cfg80211_beacon_data *bcon = &info->beacon;
         struct cfg80211_crypto_settings *crypto = &info->crypto;
+        u8 wmi_edmg_channel;
         u8 hidden_ssid;
 
         wil_dbg_misc(wil, "start_ap\n");
 
+        rc = wil_get_wmi_edmg_channel(wil, info->chandef.edmg.bw_config,
+                                      info->chandef.edmg.channels,
+                                      &wmi_edmg_channel);
+        if (rc < 0)
+                return rc;
+
         if (!channel) {
                 wil_err(wil, "AP: No channel???\n");
                 return -EINVAL;
@@ -1965,7 +2167,8 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
         rc = _wil_cfg80211_start_ap(wiphy, ndev,
                                     info->ssid, info->ssid_len, info->privacy,
                                     info->beacon_interval, channel->hw_value,
-                                    bcon, hidden_ssid, info->pbss);
+                                    wmi_edmg_channel, bcon, hidden_ssid,
+                                    info->pbss);
 
         return rc;
 }
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index fd3b2b3d1b5c..304b4d4e506a 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -393,7 +393,8 @@ static int wil_debugfs_iomem_x32_set(void *data, u64 val)
         if (ret < 0)
                 return ret;
 
-        writel(val, (void __iomem *)d->offset);
+        writel_relaxed(val, (void __iomem *)d->offset);
+
         wmb(); /* make sure write propagated to HW */
 
         wil_pm_runtime_put(wil);
@@ -959,6 +960,18 @@ static const struct file_operations fops_pmcdata = {
         .llseek         = wil_pmc_llseek,
 };
 
+static int wil_pmcring_seq_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, wil_pmcring_read, inode->i_private);
+}
+
+static const struct file_operations fops_pmcring = {
+        .open           = wil_pmcring_seq_open,
+        .release        = single_release,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+};
+
 /*---tx_mgmt---*/
 /* Write mgmt frame to this file to send it */
 static ssize_t wil_write_file_txmgmt(struct file *file, const char __user *buf,
@@ -2371,6 +2384,7 @@ static const struct {
         {"back",        0644,           &fops_back},
         {"pmccfg",      0644,           &fops_pmccfg},
         {"pmcdata",     0444,           &fops_pmcdata},
+        {"pmcring",     0444,           &fops_pmcring},
         {"temp",        0444,           &temp_fops},
         {"freq",        0444,           &freq_fops},
         {"link",        0444,           &link_fops},
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 173561fe593d..9b72202eeadc 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -373,6 +373,7 @@ static void _wil6210_disconnect_complete(struct wil6210_vif *vif,
                 }
                 clear_bit(wil_vif_fwconnecting, vif->status);
                 clear_bit(wil_vif_ft_roam, vif->status);
+                vif->ptk_rekey_state = WIL_REKEY_IDLE;
 
                 break;
         case NL80211_IFTYPE_AP:
@@ -724,6 +725,8 @@ int wil_priv_init(struct wil6210_priv *wil)
         INIT_LIST_HEAD(&wil->pending_wmi_ev);
         spin_lock_init(&wil->wmi_ev_lock);
         spin_lock_init(&wil->net_queue_lock);
+        spin_lock_init(&wil->eap_lock);
+
         init_waitqueue_head(&wil->wq);
         init_rwsem(&wil->mem_lock);
 
@@ -1654,6 +1657,7 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
                         cancel_work_sync(&vif->disconnect_worker);
                         wil6210_disconnect(vif, NULL,
                                            WLAN_REASON_DEAUTH_LEAVING);
+                        vif->ptk_rekey_state = WIL_REKEY_IDLE;
                 }
         }
         wil_bcast_fini_all(wil);
diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index 59f041d708fe..a87bb84a8286 100644
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -218,6 +218,7 @@ static void wil_vif_deinit(struct wil6210_vif *vif)
         cancel_work_sync(&vif->p2p.delayed_listen_work);
         wil_probe_client_flush(vif);
         cancel_work_sync(&vif->probe_client_worker);
+        cancel_work_sync(&vif->enable_tx_key_worker);
 }
 
 void wil_vif_free(struct wil6210_vif *vif)
@@ -283,7 +284,9 @@ static void wil_vif_init(struct wil6210_vif *vif)
 
         INIT_WORK(&vif->probe_client_worker, wil_probe_client_worker);
         INIT_WORK(&vif->disconnect_worker, wil_disconnect_worker);
+        INIT_WORK(&vif->p2p.discovery_expired_work, wil_p2p_listen_expired);
         INIT_WORK(&vif->p2p.delayed_listen_work, wil_p2p_delayed_listen_work);
+        INIT_WORK(&vif->enable_tx_key_worker, wil_enable_tx_key_worker);
 
         INIT_LIST_HEAD(&vif->probe_client_pending);
 
@@ -540,6 +543,7 @@ void wil_vif_remove(struct wil6210_priv *wil, u8 mid)
         cancel_work_sync(&vif->disconnect_worker);
         wil_probe_client_flush(vif);
         cancel_work_sync(&vif->probe_client_worker);
+        cancel_work_sync(&vif->enable_tx_key_worker);
         /* for VIFs, ndev will be freed by destructor after RTNL is unlocked.
          * the main interface will be freed in wil_if_free, we need to keep it
          * a bit longer so logging macros will work.
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index 9f5a914abc18..18dd8b246022 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -435,7 +435,7 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 mutex_unlock(&wil->mutex);
                 if (rc) {
                         wil_err(wil, "failed to load WMI only FW\n");
-                        goto if_remove;
+                        /* ignore the error to allow debugging */
                 }
         }
 
@@ -455,8 +455,6 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         return 0;
 
-if_remove:
-        wil_if_remove(wil);
 bus_disable:
         wil_if_pcie_disable(wil);
 err_iounmap:
diff --git a/drivers/net/wireless/ath/wil6210/pmc.c b/drivers/net/wireless/ath/wil6210/pmc.c
index c49f7988369e..4b7ac14fc2a7 100644
--- a/drivers/net/wireless/ath/wil6210/pmc.c
+++ b/drivers/net/wireless/ath/wil6210/pmc.c
@@ -18,6 +18,7 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/seq_file.h>
 #include "wmi.h"
 #include "wil6210.h"
 #include "txrx.h"
@@ -431,3 +432,28 @@ out:
 
         return newpos;
 }
+
+int wil_pmcring_read(struct seq_file *s, void *data)
+{
+        struct wil6210_priv *wil = s->private;
+        struct pmc_ctx *pmc = &wil->pmc;
+        size_t pmc_ring_size =
+                sizeof(struct vring_rx_desc) * pmc->num_descriptors;
+
+        mutex_lock(&pmc->lock);
+
+        if (!wil_is_pmc_allocated(pmc)) {
+                wil_err(wil, "error, pmc is not allocated!\n");
+                pmc->last_cmd_status = -EPERM;
+                mutex_unlock(&pmc->lock);
+                return -EPERM;
+        }
+
+        wil_dbg_misc(wil, "pmcring_read: size %zu\n", pmc_ring_size);
+
+        seq_write(s, pmc->pring_va, pmc_ring_size);
+
+        mutex_unlock(&pmc->lock);
+
+        return 0;
+}
diff --git a/drivers/net/wireless/ath/wil6210/pmc.h b/drivers/net/wireless/ath/wil6210/pmc.h
index bebc8d52e1e6..92b8c4d84a6a 100644
--- a/drivers/net/wireless/ath/wil6210/pmc.h
+++ b/drivers/net/wireless/ath/wil6210/pmc.h
@@ -25,3 +25,4 @@ void wil_pmc_free(struct wil6210_priv *wil, int send_pmc_cmd);
 int wil_pmc_last_cmd_status(struct wil6210_priv *wil);
 ssize_t wil_pmc_read(struct file *, char __user *, size_t, loff_t *);
 loff_t wil_pmc_llseek(struct file *filp, loff_t off, int whence);
+int wil_pmcring_read(struct seq_file *s, void *data);
diff --git a/drivers/net/wireless/ath/wil6210/rx_reorder.c b/drivers/net/wireless/ath/wil6210/rx_reorder.c
index 784239bcb3a6..13246d216803 100644
--- a/drivers/net/wireless/ath/wil6210/rx_reorder.c
+++ b/drivers/net/wireless/ath/wil6210/rx_reorder.c
@@ -260,7 +260,6 @@ struct wil_tid_ampdu_rx *wil_tid_ampdu_rx_alloc(struct wil6210_priv *wil,
         r->reorder_buf =
                 kcalloc(size, sizeof(struct sk_buff *), GFP_KERNEL);
         if (!r->reorder_buf) {
-                kfree(r->reorder_buf);
                 kfree(r);
                 return NULL;
         }
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index 8b01ef8269da..cb13652491ad 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -725,24 +725,198 @@ static void wil_get_netif_rx_params(struct sk_buff *skb, int *cid,
 }
 
 /*
+ * Check if skb is ptk eapol key message
+ *
+ * returns a pointer to the start of the eapol key structure, NULL
+ * if frame is not PTK eapol key
+ */
+static struct wil_eapol_key *wil_is_ptk_eapol_key(struct wil6210_priv *wil,
+                                                  struct sk_buff *skb)
+{
+        u8 *buf;
+        const struct wil_1x_hdr *hdr;
+        struct wil_eapol_key *key;
+        u16 key_info;
+        int len = skb->len;
+
+        if (!skb_mac_header_was_set(skb)) {
+                wil_err(wil, "mac header was not set\n");
+                return NULL;
+        }
+
+        len -= skb_mac_offset(skb);
+
+        if (len < sizeof(struct ethhdr) + sizeof(struct wil_1x_hdr) +
+            sizeof(struct wil_eapol_key))
+                return NULL;
+
+        buf = skb_mac_header(skb) + sizeof(struct ethhdr);
+
+        hdr = (const struct wil_1x_hdr *)buf;
+        if (hdr->type != WIL_1X_TYPE_EAPOL_KEY)
+                return NULL;
+
+        key = (struct wil_eapol_key *)(buf + sizeof(struct wil_1x_hdr));
+        if (key->type != WIL_EAPOL_KEY_TYPE_WPA &&
+            key->type != WIL_EAPOL_KEY_TYPE_RSN)
+                return NULL;
+
+        key_info = be16_to_cpu(key->key_info);
+        if (!(key_info & WIL_KEY_INFO_KEY_TYPE)) /* check if pairwise */
+                return NULL;
+
+        return key;
+}
+
+static bool wil_skb_is_eap_3(struct wil6210_priv *wil, struct sk_buff *skb)
+{
+        struct wil_eapol_key *key;
+        u16 key_info;
+
+        key = wil_is_ptk_eapol_key(wil, skb);
+        if (!key)
+                return false;
+
+        key_info = be16_to_cpu(key->key_info);
+        if (key_info & (WIL_KEY_INFO_MIC |
+                        WIL_KEY_INFO_ENCR_KEY_DATA)) {
+                /* 3/4 of 4-Way Handshake */
+                wil_dbg_misc(wil, "EAPOL key message 3\n");
+                return true;
+        }
+        /* 1/4 of 4-Way Handshake */
+        wil_dbg_misc(wil, "EAPOL key message 1\n");
+
+        return false;
+}
+
+static bool wil_skb_is_eap_4(struct wil6210_priv *wil, struct sk_buff *skb)
+{
+        struct wil_eapol_key *key;
+        u32 *nonce, i;
+
+        key = wil_is_ptk_eapol_key(wil, skb);
+        if (!key)
+                return false;
+
+        nonce = (u32 *)key->key_nonce;
+        for (i = 0; i < WIL_EAP_NONCE_LEN / sizeof(u32); i++, nonce++) {
+                if (*nonce != 0) {
+                        /* message 2/4 */
+                        wil_dbg_misc(wil, "EAPOL key message 2\n");
+                        return false;
+                }
+        }
+        wil_dbg_misc(wil, "EAPOL key message 4\n");
+
+        return true;
+}
+
+void wil_enable_tx_key_worker(struct work_struct *work)
+{
+        struct wil6210_vif *vif = container_of(work,
+                        struct wil6210_vif, enable_tx_key_worker);
+        struct wil6210_priv *wil = vif_to_wil(vif);
+        int rc, cid;
+
+        rtnl_lock();
+        if (vif->ptk_rekey_state != WIL_REKEY_WAIT_M4_SENT) {
+                wil_dbg_misc(wil, "Invalid rekey state = %d\n",
+                             vif->ptk_rekey_state);
+                rtnl_unlock();
+                return;
+        }
+
+        cid =  wil_find_cid_by_idx(wil, vif->mid, 0);
+        if (!wil_cid_valid(wil, cid)) {
+                wil_err(wil, "Invalid cid = %d\n", cid);
+                rtnl_unlock();
+                return;
+        }
+
+        wil_dbg_misc(wil, "Apply PTK key after eapol was sent out\n");
+        rc = wmi_add_cipher_key(vif, 0, wil->sta[cid].addr, 0, NULL,
+                                WMI_KEY_USE_APPLY_PTK);
+
+        vif->ptk_rekey_state = WIL_REKEY_IDLE;
+        rtnl_unlock();
+
+        if (rc)
+                wil_err(wil, "Apply PTK key failed %d\n", rc);
+}
+
+void wil_tx_complete_handle_eapol(struct wil6210_vif *vif, struct sk_buff *skb)
+{
+        struct wil6210_priv *wil = vif_to_wil(vif);
+        struct wireless_dev *wdev = vif_to_wdev(vif);
+        bool q = false;
+
+        if (wdev->iftype != NL80211_IFTYPE_STATION ||
+            !test_bit(WMI_FW_CAPABILITY_SPLIT_REKEY, wil->fw_capabilities))
+                return;
+
+        /* check if skb is an EAP message 4/4 */
+        if (!wil_skb_is_eap_4(wil, skb))
+                return;
+
+        spin_lock_bh(&wil->eap_lock);
+        switch (vif->ptk_rekey_state) {
+        case WIL_REKEY_IDLE:
+                /* ignore idle state, can happen due to M4 retransmission */
+                break;
+        case WIL_REKEY_M3_RECEIVED:
+                vif->ptk_rekey_state = WIL_REKEY_IDLE;
+                break;
+        case WIL_REKEY_WAIT_M4_SENT:
+                q = true;
+                break;
+        default:
+                wil_err(wil, "Unknown rekey state = %d",
+                        vif->ptk_rekey_state);
+        }
+        spin_unlock_bh(&wil->eap_lock);
+
+        if (q) {
+                q = queue_work(wil->wmi_wq, &vif->enable_tx_key_worker);
+                wil_dbg_misc(wil, "queue_work of enable_tx_key_worker -> %d\n",
+                             q);
+        }
+}
+
+static void wil_rx_handle_eapol(struct wil6210_vif *vif, struct sk_buff *skb)
+{
+        struct wil6210_priv *wil = vif_to_wil(vif);
+        struct wireless_dev *wdev = vif_to_wdev(vif);
+
+        if (wdev->iftype != NL80211_IFTYPE_STATION ||
+            !test_bit(WMI_FW_CAPABILITY_SPLIT_REKEY, wil->fw_capabilities))
+                return;
+
+        /* check if skb is a EAP message 3/4 */
+        if (!wil_skb_is_eap_3(wil, skb))
+                return;
+
+        if (vif->ptk_rekey_state == WIL_REKEY_IDLE)
+                vif->ptk_rekey_state = WIL_REKEY_M3_RECEIVED;
+}
+
+/*
  * Pass Rx packet to the netif. Update statistics.
  * Called in softirq context (NAPI poll).
  */
-void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev)
+void wil_netif_rx(struct sk_buff *skb, struct net_device *ndev, int cid,
+                  struct wil_net_stats *stats, bool gro)
 {
         gro_result_t rc = GRO_NORMAL;
         struct wil6210_vif *vif = ndev_to_vif(ndev);
         struct wil6210_priv *wil = ndev_to_wil(ndev);
         struct wireless_dev *wdev = vif_to_wdev(vif);
         unsigned int len = skb->len;
-        int cid;
-        int security;
         u8 *sa, *da = wil_skb_get_da(skb);
         /* here looking for DA, not A1, thus Rxdesc's 'mcast' indication
          * is not suitable, need to look at data
          */
         int mcast = is_multicast_ether_addr(da);
-        struct wil_net_stats *stats;
         struct sk_buff *xmit_skb = NULL;
         static const char * const gro_res_str[] = {
                 [GRO_MERGED]            = "GRO_MERGED",
@@ -753,25 +927,6 @@ void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev)
                 [GRO_CONSUMED]          = "GRO_CONSUMED",
         };
 
-        wil->txrx_ops.get_netif_rx_params(skb, &cid, &security);
-
-        stats = &wil->sta[cid].stats;
-
-        skb_orphan(skb);
-
-        if (security && (wil->txrx_ops.rx_crypto_check(wil, skb) != 0)) {
-                rc = GRO_DROP;
-                dev_kfree_skb(skb);
-                stats->rx_replay++;
-                goto stats;
-        }
-
-        /* check errors reported by HW and update statistics */
-        if (unlikely(wil->txrx_ops.rx_error_check(wil, skb, stats))) {
-                dev_kfree_skb(skb);
-                return;
-        }
-
         if (wdev->iftype == NL80211_IFTYPE_STATION) {
                 sa = wil_skb_get_sa(skb);
                 if (mcast && ether_addr_equal(sa, ndev->dev_addr)) {
@@ -817,7 +972,14 @@ void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev)
         if (skb) { /* deliver to local stack */
                 skb->protocol = eth_type_trans(skb, ndev);
                 skb->dev = ndev;
-                rc = napi_gro_receive(&wil->napi_rx, skb);
+
+                if (skb->protocol == cpu_to_be16(ETH_P_PAE))
+                        wil_rx_handle_eapol(vif, skb);
+
+                if (gro)
+                        rc = napi_gro_receive(&wil->napi_rx, skb);
+                else
+                        netif_rx_ni(skb);
                 wil_dbg_txrx(wil, "Rx complete %d bytes => %s\n",
                              len, gro_res_str[rc]);
         }
@@ -837,6 +999,36 @@ stats:
         }
 }
 
+void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev)
+{
+        int cid, security;
+        struct wil6210_priv *wil = ndev_to_wil(ndev);
+        struct wil_net_stats *stats;
+
+        wil->txrx_ops.get_netif_rx_params(skb, &cid, &security);
+
+        stats = &wil->sta[cid].stats;
+
+        skb_orphan(skb);
+
+        if (security && (wil->txrx_ops.rx_crypto_check(wil, skb) != 0)) {
+                dev_kfree_skb(skb);
+                ndev->stats.rx_dropped++;
+                stats->rx_replay++;
+                stats->rx_dropped++;
+                wil_dbg_txrx(wil, "Rx drop %d bytes\n", skb->len);
+                return;
+        }
+
+        /* check errors reported by HW and update statistics */
+        if (unlikely(wil->txrx_ops.rx_error_check(wil, skb, stats))) {
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        wil_netif_rx(skb, ndev, cid, stats, true);
+}
+
 /**
  * Proceed all completed skb's from Rx VRING
  *
@@ -2320,6 +2512,10 @@ int wil_tx_complete(struct wil6210_vif *vif, int ringid)
                                         if (stats)
                                                 stats->tx_errors++;
                                 }
+
+                                if (skb->protocol == cpu_to_be16(ETH_P_PAE))
+                                        wil_tx_complete_handle_eapol(vif, skb);
+
                                 wil_consume_skb(skb, d->dma.error == 0);
                         }
                         memset(ctx, 0, sizeof(*ctx));
diff --git a/drivers/net/wireless/ath/wil6210/txrx.h b/drivers/net/wireless/ath/wil6210/txrx.h
index c0da1340c2d2..5120475b0cd7 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.h
+++ b/drivers/net/wireless/ath/wil6210/txrx.h
@@ -423,6 +423,46 @@ struct vring_rx_mac {
 #define RX_DMA_STATUS_PHY_INFO  BIT(6)
 #define RX_DMA_STATUS_FFM       BIT(7) /* EtherType Flex Filter Match */
 
+/* IEEE 802.11, 8.5.2 EAPOL-Key frames */
+#define WIL_KEY_INFO_KEY_TYPE BIT(3) /* val of 1 = Pairwise, 0 = Group key */
+
+#define WIL_KEY_INFO_MIC BIT(8)
+#define WIL_KEY_INFO_ENCR_KEY_DATA BIT(12) /* for rsn only */
+
+#define WIL_EAP_NONCE_LEN 32
+#define WIL_EAP_KEY_RSC_LEN 8
+#define WIL_EAP_REPLAY_COUNTER_LEN 8
+#define WIL_EAP_KEY_IV_LEN 16
+#define WIL_EAP_KEY_ID_LEN 8
+
+enum {
+        WIL_1X_TYPE_EAP_PACKET = 0,
+        WIL_1X_TYPE_EAPOL_START = 1,
+        WIL_1X_TYPE_EAPOL_LOGOFF = 2,
+        WIL_1X_TYPE_EAPOL_KEY = 3,
+};
+
+#define WIL_EAPOL_KEY_TYPE_RSN 2
+#define WIL_EAPOL_KEY_TYPE_WPA 254
+
+struct wil_1x_hdr {
+        u8 version;
+        u8 type;
+        __be16 length;
+        /* followed by data */
+} __packed;
+
+struct wil_eapol_key {
+        u8 type;
+        __be16 key_info;
+        __be16 key_length;
+        u8 replay_counter[WIL_EAP_REPLAY_COUNTER_LEN];
+        u8 key_nonce[WIL_EAP_NONCE_LEN];
+        u8 key_iv[WIL_EAP_KEY_IV_LEN];
+        u8 key_rsc[WIL_EAP_KEY_RSC_LEN];
+        u8 key_id[WIL_EAP_KEY_ID_LEN];
+} __packed;
+
 struct vring_rx_dma {
         u32 d0;
         struct wil_ring_dma_addr addr;
@@ -646,6 +686,8 @@ static inline void wil_skb_set_cid(struct sk_buff *skb, u8 cid)
 }
 
 void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev);
+void wil_netif_rx(struct sk_buff *skb, struct net_device *ndev, int cid,
+                  struct wil_net_stats *stats, bool gro);
 void wil_rx_reorder(struct wil6210_priv *wil, struct sk_buff *skb);
 void wil_rx_bar(struct wil6210_priv *wil, struct wil6210_vif *vif,
                 u8 cid, u8 tid, u16 seq);
diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.c b/drivers/net/wireless/ath/wil6210/txrx_edma.c
index 71b7ad4b6454..04d576deae72 100644
--- a/drivers/net/wireless/ath/wil6210/txrx_edma.c
+++ b/drivers/net/wireless/ath/wil6210/txrx_edma.c
@@ -221,10 +221,17 @@ static int wil_ring_alloc_skb_edma(struct wil6210_priv *wil,
 }
 
 static inline
-void wil_get_next_rx_status_msg(struct wil_status_ring *sring, void *msg)
+void wil_get_next_rx_status_msg(struct wil_status_ring *sring, u8 *dr_bit,
+                                void *msg)
 {
-        memcpy(msg, (void *)(sring->va + (sring->elem_size * sring->swhead)),
-               sring->elem_size);
+        struct wil_rx_status_compressed *_msg;
+
+        _msg = (struct wil_rx_status_compressed *)
+                (sring->va + (sring->elem_size * sring->swhead));
+        *dr_bit = WIL_GET_BITS(_msg->d0, 31, 31);
+        /* make sure dr_bit is read before the rest of status msg */
+        rmb();
+        memcpy(msg, (void *)_msg, sring->elem_size);
 }
 
 static inline void wil_sring_advance_swhead(struct wil_status_ring *sring)
@@ -587,8 +594,7 @@ static bool wil_is_rx_idle_edma(struct wil6210_priv *wil)
                 if (!sring->va)
                         continue;
 
-                wil_get_next_rx_status_msg(sring, msg);
-                dr_bit = wil_rx_status_get_desc_rdy_bit(msg);
+                wil_get_next_rx_status_msg(sring, &dr_bit, msg);
 
                 /* Check if there are unhandled RX status messages */
                 if (dr_bit == sring->desc_rdy_pol)
@@ -878,8 +884,7 @@ static struct sk_buff *wil_sring_reap_rx_edma(struct wil6210_priv *wil,
         BUILD_BUG_ON(sizeof(struct wil_rx_status_extended) > sizeof(skb->cb));
 
 again:
-        wil_get_next_rx_status_msg(sring, msg);
-        dr_bit = wil_rx_status_get_desc_rdy_bit(msg);
+        wil_get_next_rx_status_msg(sring, &dr_bit, msg);
 
         /* Completed handling all the ready status messages */
         if (dr_bit != sring->desc_rdy_pol)
@@ -959,8 +964,8 @@ again:
         }
         stats = &wil->sta[cid].stats;
 
-        if (unlikely(skb->len < ETH_HLEN)) {
-                wil_dbg_txrx(wil, "Short frame, len = %d\n", skb->len);
+        if (unlikely(dmalen < ETH_HLEN)) {
+                wil_dbg_txrx(wil, "Short frame, len = %d\n", dmalen);
                 stats->rx_short_frame++;
                 rxdata->skipping = true;
                 goto skipping;
@@ -1023,6 +1028,8 @@ skipping:
                 stats->last_mcs_rx = wil_rx_status_get_mcs(msg);
                 if (stats->last_mcs_rx < ARRAY_SIZE(stats->rx_per_mcs))
                         stats->rx_per_mcs[stats->last_mcs_rx]++;
+
+                stats->last_cb_mode_rx  = wil_rx_status_get_cb_mode(msg);
         }
 
         if (!wil->use_rx_hw_reordering && !wil->use_compressed_rx_status &&
@@ -1133,12 +1140,15 @@ static int wil_tx_desc_map_edma(union wil_tx_desc *desc,
 }
 
 static inline void
-wil_get_next_tx_status_msg(struct wil_status_ring *sring,
+wil_get_next_tx_status_msg(struct wil_status_ring *sring, u8 *dr_bit,
                            struct wil_ring_tx_status *msg)
 {
         struct wil_ring_tx_status *_msg = (struct wil_ring_tx_status *)
                 (sring->va + (sring->elem_size * sring->swhead));
 
+        *dr_bit = _msg->desc_ready >> TX_STATUS_DESC_READY_POS;
+        /* make sure dr_bit is read before the rest of status msg */
+        rmb();
         *msg = *_msg;
 }
 
@@ -1167,8 +1177,7 @@ int wil_tx_sring_handler(struct wil6210_priv *wil,
         int used_before_complete;
         int used_new;
 
-        wil_get_next_tx_status_msg(sring, &msg);
-        dr_bit = msg.desc_ready >> TX_STATUS_DESC_READY_POS;
+        wil_get_next_tx_status_msg(sring, &dr_bit, &msg);
 
         /* Process completion messages while DR bit has the expected polarity */
         while (dr_bit == sring->desc_rdy_pol) {
@@ -1255,6 +1264,10 @@ int wil_tx_sring_handler(struct wil6210_priv *wil,
                                         if (stats)
                                                 stats->tx_errors++;
                                 }
+
+                                if (skb->protocol == cpu_to_be16(ETH_P_PAE))
+                                        wil_tx_complete_handle_eapol(vif, skb);
+
                                 wil_consume_skb(skb, msg.status == 0);
                         }
                         memset(ctx, 0, sizeof(*ctx));
@@ -1287,8 +1300,7 @@ again:
 
                 wil_sring_advance_swhead(sring);
 
-                wil_get_next_tx_status_msg(sring, &msg);
-                dr_bit = msg.desc_ready >> TX_STATUS_DESC_READY_POS;
+                wil_get_next_tx_status_msg(sring, &dr_bit, &msg);
         }
 
         /* shall we wake net queues? */
diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.h b/drivers/net/wireless/ath/wil6210/txrx_edma.h
index e9e6ea9b16b9..136c51c338cf 100644
--- a/drivers/net/wireless/ath/wil6210/txrx_edma.h
+++ b/drivers/net/wireless/ath/wil6210/txrx_edma.h
@@ -366,6 +366,12 @@ static inline u8 wil_rx_status_get_mcs(void *msg)
                             16, 21);
 }
 
+static inline u8 wil_rx_status_get_cb_mode(void *msg)
+{
+        return WIL_GET_BITS(((struct wil_rx_status_compressed *)msg)->d1,
+                            22, 23);
+}
+
 static inline u16 wil_rx_status_get_flow_id(void *msg)
 {
         return WIL_GET_BITS(((struct wil_rx_status_compressed *)msg)->d0,
@@ -415,12 +421,6 @@ static inline u8 wil_rx_status_get_tid(void *msg)
                 return val & WIL_RX_EDMA_DLPF_LU_MISS_CID_TID_MASK;
 }
 
-static inline int wil_rx_status_get_desc_rdy_bit(void *msg)
-{
-        return WIL_GET_BITS(((struct wil_rx_status_compressed *)msg)->d0,
-                            31, 31);
-}
-
 static inline int wil_rx_status_get_eop(void *msg) /* EoP = End of Packet */
 {
         return WIL_GET_BITS(((struct wil_rx_status_compressed *)msg)->d0,
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 6f456b311a39..0783c7963621 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -590,6 +590,7 @@ struct wil_net_stats {
         unsigned long   rx_amsdu_error; /* eDMA specific */
         unsigned long   rx_csum_err;
         u16 last_mcs_rx;
+        u8 last_cb_mode_rx;
         u64 rx_per_mcs[WIL_MCS_MAX + 1];
         u32 ft_roams; /* relevant in STA mode */
 };
@@ -730,6 +731,12 @@ enum wil_sta_status {
         wil_sta_connected = 2,
 };
 
+enum wil_rekey_state {
+        WIL_REKEY_IDLE = 0,
+        WIL_REKEY_M3_RECEIVED = 1,
+        WIL_REKEY_WAIT_M4_SENT = 2,
+};
+
 /**
  * struct wil_sta_info - data for peer
  *
@@ -850,6 +857,7 @@ struct wil6210_vif {
         DECLARE_BITMAP(status, wil_vif_status_last);
         u32 privacy; /* secure connection? */
         u16 channel; /* relevant in AP mode */
+        u8 wmi_edmg_channel; /* relevant in AP mode */
         u8 hidden_ssid; /* relevant in AP mode */
         u32 ap_isolate; /* no intra-BSS communication */
         bool pbss;
@@ -877,6 +885,10 @@ struct wil6210_vif {
         int net_queue_stopped; /* netif_tx_stop_all_queues invoked */
         bool fw_stats_ready; /* per-cid statistics are ready inside sta_info */
         u64 fw_stats_tsf; /* measurement timestamp */
+
+        /* PTK rekey race prevention, this is relevant to station mode only */
+        enum wil_rekey_state ptk_rekey_state;
+        struct work_struct enable_tx_key_worker;
 };
 
 /**
@@ -977,6 +989,7 @@ struct wil6210_priv {
          */
         spinlock_t wmi_ev_lock;
         spinlock_t net_queue_lock; /* guarding stop/wake netif queue */
+        spinlock_t eap_lock; /* guarding access to eap rekey fields */
         struct napi_struct napi_rx;
         struct napi_struct napi_tx;
         struct net_device napi_ndev; /* dummy net_device serving all VIFs */
@@ -1144,7 +1157,7 @@ static inline void wil_c(struct wil6210_priv *wil, u32 reg, u32 val)
 /**
  * wil_cid_valid - check cid is valid
  */
-static inline bool wil_cid_valid(struct wil6210_priv *wil, u8 cid)
+static inline bool wil_cid_valid(struct wil6210_priv *wil, int cid)
 {
         return (cid >= 0 && cid < wil->max_assoc_sta);
 }
@@ -1224,6 +1237,7 @@ int __wil_down(struct wil6210_priv *wil);
 void wil_refresh_fw_capabilities(struct wil6210_priv *wil);
 void wil_mbox_ring_le2cpus(struct wil6210_mbox_ring *r);
 int wil_find_cid(struct wil6210_priv *wil, u8 mid, const u8 *mac);
+int wil_find_cid_by_idx(struct wil6210_priv *wil, u8 mid, int idx);
 void wil_set_ethtoolops(struct net_device *ndev);
 
 struct fw_map *wil_find_fw_mapping(const char *section);
@@ -1335,7 +1349,7 @@ void wil_p2p_wdev_free(struct wil6210_priv *wil);
 
 int wmi_set_mac_address(struct wil6210_priv *wil, void *addr);
 int wmi_pcp_start(struct wil6210_vif *vif, int bi, u8 wmi_nettype, u8 chan,
-                  u8 hidden_ssid, u8 is_go);
+                  u8 edmg_chan, u8 hidden_ssid, u8 is_go);
 int wmi_pcp_stop(struct wil6210_vif *vif);
 int wmi_led_cfg(struct wil6210_priv *wil, bool enable);
 int wmi_abort_scan(struct wil6210_vif *vif);
@@ -1349,6 +1363,7 @@ void wil6210_disconnect_complete(struct wil6210_vif *vif, const u8 *bssid,
 void wil_probe_client_flush(struct wil6210_vif *vif);
 void wil_probe_client_worker(struct work_struct *work);
 void wil_disconnect_worker(struct work_struct *work);
+void wil_enable_tx_key_worker(struct work_struct *work);
 
 void wil_init_txrx_ops(struct wil6210_priv *wil);
 
@@ -1365,6 +1380,8 @@ void wil_update_net_queues_bh(struct wil6210_priv *wil, struct wil6210_vif *vif,
                               struct wil_ring *ring, bool check_stop);
 netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev);
 int wil_tx_complete(struct wil6210_vif *vif, int ringid);
+void wil_tx_complete_handle_eapol(struct wil6210_vif *vif,
+                                  struct sk_buff *skb);
 void wil6210_unmask_irq_tx(struct wil6210_priv *wil);
 void wil6210_unmask_irq_tx_edma(struct wil6210_priv *wil);
 
@@ -1412,6 +1429,10 @@ int wmi_mgmt_tx_ext(struct wil6210_vif *vif, const u8 *buf, size_t len,
                     u8 channel, u16 duration_ms);
 int wmi_rbufcap_cfg(struct wil6210_priv *wil, bool enable, u16 threshold);
 
+int wil_wmi2spec_ch(u8 wmi_ch, u8 *spec_ch);
+int wil_spec2wmi_ch(u8 spec_ch, u8 *wmi_ch);
+void wil_update_supported_bands(struct wil6210_priv *wil);
+
 int reverse_memcmp(const void *cs, const void *ct, size_t count);
 
 /* WMI for enhanced DMA */
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 475b1a233cc9..153b84447e40 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -878,6 +878,12 @@ static void wmi_evt_rx_mgmt(struct wil6210_vif *vif, int id, void *d, int len)
 
         if (ieee80211_is_beacon(fc) || ieee80211_is_probe_resp(fc)) {
                 struct cfg80211_bss *bss;
+                struct cfg80211_inform_bss bss_data = {
+                        .chan = channel,
+                        .scan_width = NL80211_BSS_CHAN_WIDTH_20,
+                        .signal = signal,
+                        .boottime_ns = ktime_to_ns(ktime_get_boottime()),
+                };
                 u64 tsf = le64_to_cpu(rx_mgmt_frame->u.beacon.timestamp);
                 u16 cap = le16_to_cpu(rx_mgmt_frame->u.beacon.capab_info);
                 u16 bi = le16_to_cpu(rx_mgmt_frame->u.beacon.beacon_int);
@@ -892,8 +898,9 @@ static void wmi_evt_rx_mgmt(struct wil6210_vif *vif, int id, void *d, int len)
 
                 wil_dbg_wmi(wil, "Capability info : 0x%04x\n", cap);
 
-                bss = cfg80211_inform_bss_frame(wiphy, channel, rx_mgmt_frame,
-                                                d_len, signal, GFP_KERNEL);
+                bss = cfg80211_inform_bss_frame_data(wiphy, &bss_data,
+                                                     rx_mgmt_frame,
+                                                     d_len, GFP_KERNEL);
                 if (bss) {
                         wil_dbg_wmi(wil, "Added BSS %pM\n",
                                     rx_mgmt_frame->bssid);
@@ -1332,6 +1339,12 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock)
                 cid = evt->cid;
                 tid = evt->tid;
         }
+
+        if (!wil_cid_valid(wil, cid)) {
+                wil_err(wil, "DELBA: Invalid CID %d\n", cid);
+                return;
+        }
+
         wil_dbg_wmi(wil, "DELBA MID %d CID %d TID %d from %s reason %d\n",
                     vif->mid, cid, tid,
                     evt->from_initiator ? "originator" : "recipient",
@@ -1385,6 +1398,10 @@ wmi_evt_sched_scan_result(struct wil6210_vif *vif, int id, void *d, int len)
         __le16 fc;
         u32 d_len;
         struct cfg80211_bss *bss;
+        struct cfg80211_inform_bss bss_data = {
+                .scan_width = NL80211_BSS_CHAN_WIDTH_20,
+                .boottime_ns = ktime_to_ns(ktime_get_boottime()),
+        };
 
         if (flen < 0) {
                 wil_err(wil, "sched scan result event too short, len %d\n",
@@ -1427,8 +1444,10 @@ wmi_evt_sched_scan_result(struct wil6210_vif *vif, int id, void *d, int len)
                 return;
         }
 
-        bss = cfg80211_inform_bss_frame(wiphy, channel, rx_mgmt_frame,
-                                        d_len, signal, GFP_KERNEL);
+        bss_data.signal = signal;
+        bss_data.chan = channel;
+        bss = cfg80211_inform_bss_frame_data(wiphy, &bss_data, rx_mgmt_frame,
+                                             d_len, GFP_KERNEL);
         if (bss) {
                 wil_dbg_wmi(wil, "Added BSS %pM\n", rx_mgmt_frame->bssid);
                 cfg80211_put_bss(wiphy, bss);
@@ -2163,8 +2182,8 @@ int wmi_rbufcap_cfg(struct wil6210_priv *wil, bool enable, u16 threshold)
         return rc;
 }
 
-int wmi_pcp_start(struct wil6210_vif *vif,
-                  int bi, u8 wmi_nettype, u8 chan, u8 hidden_ssid, u8 is_go)
+int wmi_pcp_start(struct wil6210_vif *vif, int bi, u8 wmi_nettype,
+                  u8 chan, u8 wmi_edmg_chan, u8 hidden_ssid, u8 is_go)
 {
         struct wil6210_priv *wil = vif_to_wil(vif);
         int rc;
@@ -2174,6 +2193,7 @@ int wmi_pcp_start(struct wil6210_vif *vif,
                 .network_type = wmi_nettype,
                 .disable_sec_offload = 1,
                 .channel = chan - 1,
+                .edmg_channel = wmi_edmg_chan,
                 .pcp_max_assoc_sta = wil->max_assoc_sta,
                 .hidden_ssid = hidden_ssid,
                 .is_go = is_go,
@@ -2437,10 +2457,17 @@ int wmi_add_cipher_key(struct wil6210_vif *vif, u8 key_index,
                 .key_len = key_len,
         };
 
-        if (!key || (key_len > sizeof(cmd.key)))
+        if (key_len > sizeof(cmd.key))
                 return -EINVAL;
 
-        memcpy(cmd.key, key, key_len);
+        /* key len = 0 is allowed only for usage of WMI_KEY_USE_APPLY */
+        if ((key_len == 0 || !key) &&
+            key_usage != WMI_KEY_USE_APPLY_PTK)
+                return -EINVAL;
+
+        if (key)
+                memcpy(cmd.key, key, key_len);
+
         if (mac_addr)
                 memcpy(cmd.mac, mac_addr, WMI_MAC_LEN);
 
diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h
index 3e37229b36b5..a2f7034489ae 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -97,6 +97,7 @@ enum wmi_fw_capability {
         WMI_FW_CAPABILITY_SET_SILENT_RSSI_TABLE         = 13,
         WMI_FW_CAPABILITY_LO_POWER_CALIB_FROM_OTP       = 14,
         WMI_FW_CAPABILITY_PNO                           = 15,
+        WMI_FW_CAPABILITY_CHANNEL_BONDING               = 17,
         WMI_FW_CAPABILITY_REF_CLOCK_CONTROL             = 18,
         WMI_FW_CAPABILITY_AP_SME_OFFLOAD_NONE           = 19,
         WMI_FW_CAPABILITY_MULTI_VIFS                    = 20,
@@ -108,6 +109,7 @@ enum wmi_fw_capability {
         WMI_FW_CAPABILITY_CHANNEL_4                     = 26,
         WMI_FW_CAPABILITY_IPA                           = 27,
         WMI_FW_CAPABILITY_TEMPERATURE_ALL_RF            = 30,
+        WMI_FW_CAPABILITY_SPLIT_REKEY                   = 31,
         WMI_FW_CAPABILITY_MAX,
 };
 
@@ -361,6 +363,19 @@ enum wmi_connect_ctrl_flag_bits {
 
 #define WMI_MAX_SSID_LEN        (32)
 
+enum wmi_channel {
+        WMI_CHANNEL_1   = 0x00,
+        WMI_CHANNEL_2   = 0x01,
+        WMI_CHANNEL_3   = 0x02,
+        WMI_CHANNEL_4   = 0x03,
+        WMI_CHANNEL_5   = 0x04,
+        WMI_CHANNEL_6   = 0x05,
+        WMI_CHANNEL_9   = 0x06,
+        WMI_CHANNEL_10  = 0x07,
+        WMI_CHANNEL_11  = 0x08,
+        WMI_CHANNEL_12  = 0x09,
+};
+
 /* WMI_CONNECT_CMDID */
 struct wmi_connect_cmd {
         u8 network_type;
@@ -372,8 +387,12 @@ struct wmi_connect_cmd {
         u8 group_crypto_len;
         u8 ssid_len;
         u8 ssid[WMI_MAX_SSID_LEN];
+        /* enum wmi_channel WMI_CHANNEL_1..WMI_CHANNEL_6; for EDMG this is
+         * the primary channel number
+         */
         u8 channel;
-        u8 reserved0;
+        /* enum wmi_channel WMI_CHANNEL_9..WMI_CHANNEL_12 */
+        u8 edmg_channel;
         u8 bssid[WMI_MAC_LEN];
         __le32 ctrl_flags;
         u8 dst_mac[WMI_MAC_LEN];
@@ -403,6 +422,8 @@ enum wmi_key_usage {
         WMI_KEY_USE_PAIRWISE    = 0x00,
         WMI_KEY_USE_RX_GROUP    = 0x01,
         WMI_KEY_USE_TX_GROUP    = 0x02,
+        WMI_KEY_USE_STORE_PTK   = 0x03,
+        WMI_KEY_USE_APPLY_PTK   = 0x04,
 };
 
 struct wmi_add_cipher_key_cmd {
@@ -2312,8 +2333,12 @@ struct wmi_notify_req_done_event {
 
 /* WMI_CONNECT_EVENTID */
 struct wmi_connect_event {
+        /* enum wmi_channel WMI_CHANNEL_1..WMI_CHANNEL_6; for EDMG this is
+         * the primary channel number
+         */
         u8 channel;
-        u8 reserved0;
+        /* enum wmi_channel WMI_CHANNEL_9..WMI_CHANNEL_12 */
+        u8 edmg_channel;
         u8 bssid[WMI_MAC_LEN];
         __le16 listen_interval;
         __le16 beacon_interval;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
index 0988a166a785..623c0168da79 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
@@ -253,10 +253,12 @@ void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_event);
 /* Receive async event packet from firmware. Callee disposes of rxp. */
 void brcmf_rx_event(struct device *dev, struct sk_buff *rxp);
 
+int brcmf_alloc(struct device *dev, struct brcmf_mp_device *settings);
 /* Indication from bus module regarding presence/insertion of dongle. */
-int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings);
+int brcmf_attach(struct device *dev);
 /* Indication from bus module regarding removal/absence of dongle */
 void brcmf_detach(struct device *dev);
+void brcmf_free(struct device *dev);
 /* Indication from bus module that dongle should be reset */
 void brcmf_dev_reset(struct device *dev);
 /* Request from bus module to initiate a coredump */
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index dd6303f5f72e..e3ebb7abbdae 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -7202,7 +7202,6 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)
         brcmf_pno_detach(cfg);
         brcmf_btcoex_detach(cfg);
         wiphy_unregister(cfg->wiphy);
-        kfree(cfg->ops);
         wl_deinit_priv(cfg);
         brcmf_free_wiphy(cfg->wiphy);
         kfree(cfg);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
index b7b50b07f776..14d5bbad1db1 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
@@ -292,7 +292,6 @@ struct brcmf_cfg80211_wowl {
  */
 struct brcmf_cfg80211_info {
         struct wiphy *wiphy;
-        struct cfg80211_ops *ops;
         struct brcmf_cfg80211_conf *conf;
         struct brcmf_p2p_info p2p;
         struct brcmf_btcoex_info *btcoex;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 21e07d1ceeae..406b367c284c 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -1209,13 +1209,11 @@ fail:
         return ret;
 }
 
-int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
+int brcmf_alloc(struct device *dev, struct brcmf_mp_device *settings)
 {
         struct wiphy *wiphy;
         struct cfg80211_ops *ops;
         struct brcmf_pub *drvr = NULL;
-        int ret = 0;
-        int i;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -1224,12 +1222,30 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
                 return -ENOMEM;
 
         wiphy = wiphy_new(ops, sizeof(*drvr));
-        if (!wiphy)
+        if (!wiphy) {
+                kfree(ops);
                 return -ENOMEM;
+        }
 
         set_wiphy_dev(wiphy, dev);
         drvr = wiphy_priv(wiphy);
         drvr->wiphy = wiphy;
+        drvr->ops = ops;
+        drvr->bus_if = dev_get_drvdata(dev);
+        drvr->bus_if->drvr = drvr;
+        drvr->settings = settings;
+
+        return 0;
+}
+
+int brcmf_attach(struct device *dev)
+{
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_pub *drvr = bus_if->drvr;
+        int ret = 0;
+        int i;
+
+        brcmf_dbg(TRACE, "Enter\n");
 
         for (i = 0; i < ARRAY_SIZE(drvr->if2bss); i++)
                 drvr->if2bss[i] = BRCMF_BSSIDX_INVALID;
@@ -1238,9 +1254,6 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
 
         /* Link to bus module */
         drvr->hdrlen = 0;
-        drvr->bus_if = dev_get_drvdata(dev);
-        drvr->bus_if->drvr = drvr;
-        drvr->settings = settings;
 
         /* Attach and link in the protocol */
         ret = brcmf_proto_attach(drvr);
@@ -1256,18 +1269,16 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
         /* attach firmware event handler */
         brcmf_fweh_attach(drvr);
 
-        ret = brcmf_bus_started(drvr, ops);
+        ret = brcmf_bus_started(drvr, drvr->ops);
         if (ret != 0) {
                 bphy_err(drvr, "dongle is not responding: err=%d\n", ret);
                 goto fail;
         }
 
-        drvr->config->ops = ops;
         return 0;
 
 fail:
         brcmf_detach(dev);
-        kfree(ops);
 
         return ret;
 }
@@ -1350,9 +1361,20 @@ void brcmf_detach(struct device *dev)
                 brcmf_cfg80211_detach(drvr->config);
                 drvr->config = NULL;
         }
+}
+
+void brcmf_free(struct device *dev)
+{
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_pub *drvr = bus_if->drvr;
+
+        if (!drvr)
+                return;
 
         bus_if->drvr = NULL;
 
+        kfree(drvr->ops);
+
         wiphy_free(drvr->wiphy);
 }
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
index 86517a3d74b1..6699637d3bf8 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
@@ -97,6 +97,7 @@ struct brcmf_pub {
         struct brcmf_bus *bus_if;
         struct brcmf_proto *proto;
         struct wiphy *wiphy;
+        struct cfg80211_ops *ops;
         struct brcmf_cfg80211_info *config;
 
         /* Internal brcmf items */
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
index 7ac945369762..6c463475e90b 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
@@ -1824,11 +1824,15 @@ static void brcmf_pcie_setup(struct device *dev, int ret,
 
         brcmf_pcie_intr_enable(devinfo);
         brcmf_pcie_hostready(devinfo);
-        if (brcmf_attach(&devinfo->pdev->dev, devinfo->settings) == 0)
-                return;
+
+        ret = brcmf_attach(&devinfo->pdev->dev);
+        if (ret)
+                goto fail;
 
         brcmf_pcie_bus_console_read(devinfo, false);
 
+        return;
+
 fail:
         device_release_driver(dev);
 }
@@ -1923,6 +1927,10 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         bus->wowl_supported = pci_pme_capable(pdev, PCI_D3hot);
         dev_set_drvdata(&pdev->dev, bus);
 
+        ret = brcmf_alloc(&devinfo->pdev->dev, devinfo->settings);
+        if (ret)
+                goto fail_bus;
+
         fwreq = brcmf_pcie_prepare_fw_request(devinfo);
         if (!fwreq) {
                 ret = -ENOMEM;
@@ -1971,6 +1979,7 @@ brcmf_pcie_remove(struct pci_dev *pdev)
                 brcmf_pcie_intr_disable(devinfo);
 
         brcmf_detach(&pdev->dev);
+        brcmf_free(&pdev->dev);
 
         kfree(bus->bus_priv.pcie);
         kfree(bus->msgbuf->flowrings);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 629140b6d7e2..264ad63232f8 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -4247,17 +4247,26 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
         sdiod->bus_if->chip = bus->ci->chip;
         sdiod->bus_if->chiprev = bus->ci->chiprev;
 
+        err = brcmf_alloc(sdiod->dev, sdiod->settings);
+        if (err) {
+                brcmf_err("brcmf_alloc failed\n");
+                goto claim;
+        }
+
         /* Attach to the common layer, reserve hdr space */
-        err = brcmf_attach(sdiod->dev, sdiod->settings);
+        err = brcmf_attach(sdiod->dev);
         if (err != 0) {
                 brcmf_err("brcmf_attach failed\n");
-                sdio_claim_host(sdiod->func1);
-                goto checkdied;
+                goto free;
         }
 
         /* ready */
         return;
 
+free:
+        brcmf_free(sdiod->dev);
+claim:
+        sdio_claim_host(sdiod->func1);
 checkdied:
         brcmf_sdio_checkdied(bus);
 release:
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
index d33628b79a3a..06f3c01f10b3 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
@@ -1178,8 +1178,12 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,
         if (ret)
                 goto error;
 
+        ret = brcmf_alloc(devinfo->dev, devinfo->settings);
+        if (ret)
+                goto error;
+
         /* Attach to the common driver interface */
-        ret = brcmf_attach(devinfo->dev, devinfo->settings);
+        ret = brcmf_attach(devinfo->dev);
         if (ret)
                 goto error;
 
@@ -1251,7 +1255,10 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
         }
 
         if (!brcmf_usb_dlneeded(devinfo)) {
-                ret = brcmf_attach(devinfo->dev, devinfo->settings);
+                ret = brcmf_alloc(devinfo->dev, devinfo->settings);
+                if (ret)
+                        goto fail;
+                ret = brcmf_attach(devinfo->dev);
                 if (ret)
                         goto fail;
                 /* we are done */
@@ -1279,6 +1286,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
 
 fail:
         /* Release resources in reverse order */
+        brcmf_free(devinfo->dev);
         kfree(bus);
         brcmf_usb_detach(devinfo);
         return ret;
@@ -1292,6 +1300,7 @@ brcmf_usb_disconnect_cb(struct brcmf_usbdev_info *devinfo)
         brcmf_dbg(USB, "Enter, bus_pub %p\n", devinfo);
 
         brcmf_detach(devinfo->dev);
+        brcmf_free(devinfo->dev);
         kfree(devinfo->bus_pub.bus);
         brcmf_usb_detach(devinfo);
 }
@@ -1435,10 +1444,12 @@ static int brcmf_usb_suspend(struct usb_interface *intf, pm_message_t state)
 
         brcmf_dbg(USB, "Enter\n");
         devinfo->bus_pub.state = BRCMFMAC_USB_STATE_SLEEP;
-        if (devinfo->wowl_enabled)
+        if (devinfo->wowl_enabled) {
                 brcmf_cancel_all_urbs(devinfo);
-        else
+        } else {
                 brcmf_detach(&usb->dev);
+                brcmf_free(&usb->dev);
+        }
         return 0;
 }
 
@@ -1451,8 +1462,19 @@ static int brcmf_usb_resume(struct usb_interface *intf)
         struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(&usb->dev);
 
         brcmf_dbg(USB, "Enter\n");
-        if (!devinfo->wowl_enabled)
-                return brcmf_attach(devinfo->dev, devinfo->settings);
+        if (!devinfo->wowl_enabled) {
+                int err;
+
+                err = brcmf_alloc(&usb->dev, devinfo->settings);
+                if (err)
+                        return err;
+
+                err = brcmf_attach(devinfo->dev);
+                if (err) {
+                        brcmf_free(devinfo->dev);
+                        return err;
+                }
+        }
 
         devinfo->bus_pub.state = BRCMFMAC_USB_STATE_UP;
         brcmf_usb_rx_fill_all(devinfo);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
index 0c57d48f47b1..a3f094568cfb 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
@@ -17748,7 +17748,7 @@ static void wlc_phy_txpwrctrl_pwr_setup_nphy(struct brcms_phy *pi)
                         num = 8 *
                               (16 * b0[tbl_id - 26] + b1[tbl_id - 26] * idx);
                         den = 32768 + a1[tbl_id - 26] * idx;
-                        pwr_est = max(((4 * num + den / 2) / den), -8);
+                        pwr_est = max(DIV_ROUND_CLOSEST(4 * num, den), -8);
                         if (NREV_LT(pi->pubpi.phy_rev, 3)) {
                                 if (idx <=
                                     (uint) (31 - idle_tssi[tbl_id - 26] + 1))
@@ -26990,8 +26990,8 @@ wlc_phy_rxcal_gainctrl_nphy_rev5(struct brcms_phy *pi, u8 rx_core,
                                      NPHY_RXCAL_TONEAMP, 0, cal_type, false);
 
                 wlc_phy_rx_iq_est_nphy(pi, est, num_samps, 32, 0);
-                i_pwr = (est[rx_core].i_pwr + num_samps / 2) / num_samps;
-                q_pwr = (est[rx_core].q_pwr + num_samps / 2) / num_samps;
+                i_pwr = DIV_ROUND_CLOSEST(est[rx_core].i_pwr, num_samps);
+                q_pwr = DIV_ROUND_CLOSEST(est[rx_core].q_pwr, num_samps);
                 curr_pwr = i_pwr + q_pwr;
 
                 switch (gainctrl_dirn) {
@@ -27673,10 +27673,10 @@ wlc_phy_cal_rxiq_nphy_rev2(struct brcms_phy *pi,
                                         wlc_phy_rx_iq_est_nphy(pi, est,
                                                                num_samps, 32,
                                                                0);
-                                        i_pwr = (est[rx_core].i_pwr +
-                                                 num_samps / 2) / num_samps;
-                                        q_pwr = (est[rx_core].q_pwr +
-                                                 num_samps / 2) / num_samps;
+                                        i_pwr = DIV_ROUND_CLOSEST(est[rx_core].i_pwr,
+                                                                         num_samps);
+                                        q_pwr = DIV_ROUND_CLOSEST(est[rx_core].q_pwr,
+                                                                         num_samps);
                                         tot_pwr[gain_pass] = i_pwr + q_pwr;
                                 } else {
 
diff --git a/drivers/net/wireless/marvell/libertas/dev.h b/drivers/net/wireless/marvell/libertas/dev.h
index 469134930026..4b6e05a8e5d5 100644
--- a/drivers/net/wireless/marvell/libertas/dev.h
+++ b/drivers/net/wireless/marvell/libertas/dev.h
@@ -58,8 +58,6 @@ struct lbs_private {
 #ifdef CONFIG_LIBERTAS_MESH
         struct lbs_mesh_stats mstats;
         uint16_t mesh_tlv;
-        u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
-        u8 mesh_ssid_len;
         u8 mesh_channel;
 #endif
 
diff --git a/drivers/net/wireless/marvell/libertas/mesh.c b/drivers/net/wireless/marvell/libertas/mesh.c
index 2315fdff56c2..2747c957d18c 100644
--- a/drivers/net/wireless/marvell/libertas/mesh.c
+++ b/drivers/net/wireless/marvell/libertas/mesh.c
@@ -86,6 +86,7 @@ static int lbs_mesh_config_send(struct lbs_private *priv,
 static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
                 uint16_t chan)
 {
+        struct wireless_dev *mesh_wdev;
         struct cmd_ds_mesh_config cmd;
         struct mrvl_meshie *ie;
 
@@ -105,10 +106,17 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
                 ie->val.active_protocol_id = MARVELL_MESH_PROTO_ID_HWMP;
                 ie->val.active_metric_id = MARVELL_MESH_METRIC_ID;
                 ie->val.mesh_capability = MARVELL_MESH_CAPABILITY;
-                ie->val.mesh_id_len = priv->mesh_ssid_len;
-                memcpy(ie->val.mesh_id, priv->mesh_ssid, priv->mesh_ssid_len);
+
+                if (priv->mesh_dev) {
+                        mesh_wdev = priv->mesh_dev->ieee80211_ptr;
+                        ie->val.mesh_id_len = mesh_wdev->mesh_id_up_len;
+                        memcpy(ie->val.mesh_id, mesh_wdev->ssid,
+                                                mesh_wdev->mesh_id_up_len);
+                }
+
                 ie->len = sizeof(struct mrvl_meshie_val) -
-                        IEEE80211_MAX_SSID_LEN + priv->mesh_ssid_len;
+                        IEEE80211_MAX_SSID_LEN + ie->val.mesh_id_len;
+
                 cmd.length = cpu_to_le16(sizeof(struct mrvl_meshie_val));
                 break;
         case CMD_ACT_MESH_CONFIG_STOP:
@@ -117,8 +125,8 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
                 return -1;
         }
         lbs_deb_cmd("mesh config action %d type %x channel %d SSID %*pE\n",
-                    action, priv->mesh_tlv, chan, priv->mesh_ssid_len,
-                    priv->mesh_ssid);
+                    action, priv->mesh_tlv, chan, ie->val.mesh_id_len,
+                    ie->val.mesh_id);
 
         return __lbs_mesh_config_send(priv, &cmd, action, priv->mesh_tlv);
 }
@@ -863,12 +871,6 @@ int lbs_init_mesh(struct lbs_private *priv)
         /* Stop meshing until interface is brought up */
         lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_STOP, 1);
 
-        if (priv->mesh_tlv) {
-                sprintf(priv->mesh_ssid, "mesh");
-                priv->mesh_ssid_len = 4;
-                ret = 1;
-        }
-
         return ret;
 }
 
@@ -997,6 +999,13 @@ static int lbs_add_mesh(struct lbs_private *priv)
 
         mesh_wdev->iftype = NL80211_IFTYPE_MESH_POINT;
         mesh_wdev->wiphy = priv->wdev->wiphy;
+
+        if (priv->mesh_tlv) {
+                sprintf(mesh_wdev->ssid, "mesh");
+                mesh_wdev->mesh_id_up_len = 4;
+                ret = 1;
+        }
+
         mesh_wdev->netdev = mesh_dev;
 
         mesh_dev->ml_priv = priv;
diff --git a/drivers/net/wireless/marvell/libertas/mesh.h b/drivers/net/wireless/marvell/libertas/mesh.h
index dfe22c91aade..1561018f226f 100644
--- a/drivers/net/wireless/marvell/libertas/mesh.h
+++ b/drivers/net/wireless/marvell/libertas/mesh.h
@@ -24,8 +24,7 @@ void lbs_remove_mesh(struct lbs_private *priv);
 
 static inline bool lbs_mesh_activated(struct lbs_private *priv)
 {
-        /* Mesh SSID is only programmed after successful init */
-        return priv->mesh_ssid_len != 0;
+        return !!priv->mesh_tlv;
 }
 
 int lbs_mesh_set_channel(struct lbs_private *priv, u8 channel);
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h
index 99565ad09cdc..e4a7e074ae3f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.h
+++ b/drivers/net/wireless/realtek/rtlwifi/base.h
@@ -46,15 +46,6 @@ enum ap_peer {
 #define MAX_LISTEN_INTERVAL             10
 #define MAX_RATE_TRIES                  4
 
-#define SET_80211_HDR_FRAME_CONTROL(_hdr, _val)         \
-        WRITEEF2BYTE(_hdr, _val)
-#define SET_80211_HDR_TYPE_AND_SUBTYPE(_hdr, _val)      \
-        WRITEEF1BYTE(_hdr, _val)
-#define SET_80211_HDR_PWR_MGNT(_hdr, _val)              \
-        SET_BITS_TO_LE_2BYTE(_hdr, 12, 1, _val)
-#define SET_80211_HDR_TO_DS(_hdr, _val)                 \
-        SET_BITS_TO_LE_2BYTE(_hdr, 8, 1, _val)
-
 #define SET_80211_PS_POLL_AID(_hdr, _val)               \
         (*(u16 *)((u8 *)(_hdr) + 2) = _val)
 #define SET_80211_PS_POLL_BSSID(_hdr, _val)             \
@@ -62,30 +53,12 @@ enum ap_peer {
 #define SET_80211_PS_POLL_TA(_hdr, _val)                \
         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))
 #define SET_80211_HDR_ADDRESS1(_hdr, _val)      \
         CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS1, (u8 *)(_val))
 #define SET_80211_HDR_ADDRESS2(_hdr, _val)      \
         CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS2, (u8 *)(_val))
 #define SET_80211_HDR_ADDRESS3(_hdr, _val)      \
         CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS3, (u8 *)(_val))
-#define SET_80211_HDR_FRAGMENT_SEQUENCE(_hdr, _val)  \
-        WRITEEF2BYTE((u8 *)(_hdr)+FRAME_OFFSET_SEQUENCE, _val)
-
-#define SET_BEACON_PROBE_RSP_TIME_STAMP_LOW(__phdr, __val)      \
-        WRITEEF4BYTE(((u8 *)(__phdr)) + 24, __val)
-#define SET_BEACON_PROBE_RSP_TIME_STAMP_HIGH(__phdr, __val) \
-        WRITEEF4BYTE(((u8 *)(__phdr)) + 28, __val)
-#define SET_BEACON_PROBE_RSP_BEACON_INTERVAL(__phdr, __val) \
-        WRITEEF2BYTE(((u8 *)(__phdr)) + 32, __val)
-#define GET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr)            \
-        READEF2BYTE(((u8 *)(__phdr)) + 34)
-#define SET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, __val) \
-        WRITEEF2BYTE(((u8 *)(__phdr)) + 34, __val)
-#define MASK_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, __val) \
-        SET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, \
-        (GET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr) & (~(__val))))
 
 #define SET_TX_DESC_SPE_RPT(__pdesc, __val)                     \
         SET_BITS_TO_LE_4BYTE((__pdesc) + 8, 19, 1, __val)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
index fa2e1b063f68..edcca42c7464 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
@@ -12,35 +12,6 @@
 #define RX_CMD_QUEUE                                    1
 
 #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)
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h
index 147bf2407f8f..34486bd3e109 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h
@@ -17,39 +17,6 @@
 #define RX_MPDU_QUEUE                                   0
 #define RX_CMD_QUEUE                                    1
 
-#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 GET_RX_STATUS_DESC_BUFF_ADDR(__pdesc)                   \
-        SHIFT_AND_MASK_LE(__pdesc + 24, 0, 32)
-
 #define CHIP_VER_B                      BIT(4)
 #define CHIP_BONDING_IDENTIFIER(_value) (((_value) >> 22) & 0x3)
 #define CHIP_BONDING_92C_1T2R           0x1
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
index 123dbf0903a1..fc9a3aae047f 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
@@ -33,27 +33,6 @@ static u8 _rtl92c_query_rxpwrpercentage(s8 antpower)
                 return 100 + antpower;
 }
 
-static u8 _rtl92c_evm_db_to_percentage(s8 value)
-{
-        s8 ret_val;
-
-        ret_val = value;
-
-        if (ret_val >= 0)
-                ret_val = 0;
-
-        if (ret_val <= -33)
-                ret_val = -33;
-
-        ret_val = 0 - ret_val;
-        ret_val *= 3;
-
-        if (ret_val == 99)
-                ret_val = 100;
-
-        return ret_val;
-}
-
 static long _rtl92ce_signal_scale_mapping(struct ieee80211_hw *hw,
                 long currsig)
 {
@@ -243,7 +222,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
                         max_spatial_stream = 1;
 
                 for (i = 0; i < max_spatial_stream; i++) {
-                        evm = _rtl92c_evm_db_to_percentage(p_drvinfo->rxevm[i]);
+                        evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]);
 
                         if (packet_match_bssid) {
                                 /* Fill value in RFD, Get the first
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c
index c8daad1e749f..cec19b32c7e2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c
@@ -577,22 +577,6 @@ static u8 _rtl92c_query_rxpwrpercentage(s8 antpower)
                 return 100 + antpower;
 }
 
-static u8 _rtl92c_evm_db_to_percentage(s8 value)
-{
-        s8 ret_val;
-
-        ret_val = value;
-        if (ret_val >= 0)
-                ret_val = 0;
-        if (ret_val <= -33)
-                ret_val = -33;
-        ret_val = 0 - ret_val;
-        ret_val *= 3;
-        if (ret_val == 99)
-                ret_val = 100;
-        return ret_val;
-}
-
 static long _rtl92c_signal_scale_mapping(struct ieee80211_hw *hw,
                 long currsig)
 {
@@ -743,7 +727,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,
                 else
                         max_spatial_stream = 1;
                 for (i = 0; i < max_spatial_stream; i++) {
-                        evm = _rtl92c_evm_db_to_percentage(p_drvinfo->rxevm[i]);
+                        evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]);
                         if (packet_match_bssid) {
                                 if (i == 0)
                                         pstats->signalquality =
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h
index fa33b05db052..21726d9b4aef 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h
@@ -26,37 +26,6 @@
 #define RX_MPDU_QUEUE                                   0
 #define RX_CMD_QUEUE                                    1
 
-#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)
-
 enum version_8192d {
         VERSION_TEST_CHIP_88C = 0x0000,
         VERSION_TEST_CHIP_92C = 0x0020,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
index d162884a9e00..2494e1f118f8 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
@@ -4,6 +4,7 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
+#include "../stats.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -32,21 +33,6 @@ static u8 _rtl92d_query_rxpwrpercentage(s8 antpower)
                 return 100 + antpower;
 }
 
-static u8 _rtl92d_evm_db_to_percentage(s8 value)
-{
-        s8 ret_val = value;
-
-        if (ret_val >= 0)
-                ret_val = 0;
-        if (ret_val <= -33)
-                ret_val = -33;
-        ret_val = 0 - ret_val;
-        ret_val *= 3;
-        if (ret_val == 99)
-                ret_val = 100;
-        return ret_val;
-}
-
 static long _rtl92de_translate_todbm(struct ieee80211_hw *hw,
                                      u8 signal_strength_index)
 {
@@ -215,7 +201,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
                 else
                         max_spatial_stream = 1;
                 for (i = 0; i < max_spatial_stream; i++) {
-                        evm = _rtl92d_evm_db_to_percentage(p_drvinfo->rxevm[i]);
+                        evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]);
                         if (packet_match_bssid) {
                                 if (i == 0)
                                         pstats->signalquality =
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
index 42958df6b5d4..84505a8500c0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
@@ -11,37 +11,6 @@
 #define RX_MPDU_QUEUE                                           0
 #define RX_CMD_QUEUE                                            1
 
-#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
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
index 90dc91b0d35b..a04ce15d5538 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
@@ -260,28 +260,29 @@ static void translate_rx_signal_stuff(struct ieee80211_hw *hw,
 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)
+                            u8 *pdesc8, struct sk_buff *skb)
 {
         struct rx_fwinfo_8723e *p_drvinfo;
         struct ieee80211_hdr *hdr;
-        u32 phystatus = GET_RX_DESC_PHYST(pdesc);
+        __le32 *pdesc = (__le32 *)pdesc8;
+        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) *
+        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->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->timestamp_low = GET_RX_DESC_TSFL(pdesc);
-        status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
-        status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
+        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->timestamp_low = get_rx_desc_tsfl(pdesc);
+        status->rx_is40mhzpacket = (bool)get_rx_desc_bw(pdesc);
+        status->is_ht = (bool)get_rx_desc_rxht(pdesc);
 
         status->is_cck = RX_HAL_IS_CCK_RATE(status->rate);
 
@@ -331,7 +332,7 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
                 p_drvinfo = (struct rx_fwinfo_8723e *)(skb->data +
                                                      status->rx_bufshift);
 
-                translate_rx_signal_stuff(hw, skb, status, pdesc, p_drvinfo);
+                translate_rx_signal_stuff(hw, skb, status, pdesc8, p_drvinfo);
         }
         rx_status->signal = status->recvsignalpower + 10;
         return true;
@@ -350,7 +351,8 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         bool b_defaultadapter = true;
         /* bool b_trigger_ac = false; */
-        u8 *pdesc = (u8 *)pdesc_tx;
+        u8 *pdesc8 = (u8 *)pdesc_tx;
+        __le32 *pdesc = (__le32 *)pdesc8;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         u8 fw_qsel = _rtl8723e_map_hwqueue_to_fwqueue(skb, hw_queue);
@@ -383,7 +385,7 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
 
         rtl_get_tcb_desc(hw, info, sta, skb, ptcb_desc);
 
-        CLEAR_PCI_TX_DESC_CONTENT(pdesc, sizeof(struct tx_desc_8723e));
+        clear_pci_tx_desc_content(pdesc, sizeof(struct tx_desc_8723e));
 
         if (ieee80211_is_nullfunc(fc) || ieee80211_is_ctl(fc)) {
                 firstseg = true;
@@ -391,58 +393,58 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
         }
 
         if (firstseg) {
-                SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+                set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);
 
-                SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
+                set_tx_desc_tx_rate(pdesc, ptcb_desc->hw_rate);
 
                 if (ptcb_desc->use_shortgi || ptcb_desc->use_shortpreamble)
-                        SET_TX_DESC_DATA_SHORTGI(pdesc, 1);
+                        set_tx_desc_data_shortgi(pdesc, 1);
 
                 if (info->flags & IEEE80211_TX_CTL_AMPDU) {
-                        SET_TX_DESC_AGG_BREAK(pdesc, 1);
-                        SET_TX_DESC_MAX_AGG_NUM(pdesc, 0x14);
+                        set_tx_desc_agg_break(pdesc, 1);
+                        set_tx_desc_max_agg_num(pdesc, 0x14);
                 }
-                SET_TX_DESC_SEQ(pdesc, seq_number);
+                set_tx_desc_seq(pdesc, seq_number);
 
-                SET_TX_DESC_RTS_ENABLE(pdesc,
+                set_tx_desc_rts_enable(pdesc,
                                        ((ptcb_desc->rts_enable &&
                                         !ptcb_desc->cts_enable) ? 1 : 0));
-                SET_TX_DESC_HW_RTS_ENABLE(pdesc,
+                set_tx_desc_hw_rts_enable(pdesc,
                                           ((ptcb_desc->rts_enable ||
                                           ptcb_desc->cts_enable) ? 1 : 0));
-                SET_TX_DESC_CTS2SELF(pdesc,
+                set_tx_desc_cts2self(pdesc,
                                      ((ptcb_desc->cts_enable) ? 1 : 0));
-                SET_TX_DESC_RTS_STBC(pdesc,
+                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, ptcb_desc->rts_sc);
-                SET_TX_DESC_RTS_SHORT(pdesc,
+                set_tx_desc_rts_rate(pdesc, ptcb_desc->rts_rate);
+                set_tx_desc_rts_bw(pdesc, 0);
+                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 (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);
+                                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,
+                                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_data_bw(pdesc, 0);
+                        set_tx_desc_tx_sub_carrier(pdesc, 0);
                 }
 
-                SET_TX_DESC_LINIP(pdesc, 0);
-                SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb->len);
+                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);
+                        set_tx_desc_ampdu_density(pdesc, ampdu_density);
                 }
 
                 if (info->control.hw_key) {
@@ -453,78 +455,79 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
                         case WLAN_CIPHER_SUITE_WEP40:
                         case WLAN_CIPHER_SUITE_WEP104:
                         case WLAN_CIPHER_SUITE_TKIP:
-                                SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
+                                set_tx_desc_sec_type(pdesc, 0x1);
                                 break;
                         case WLAN_CIPHER_SUITE_CCMP:
-                                SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
+                                set_tx_desc_sec_type(pdesc, 0x3);
                                 break;
                         default:
-                                SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
+                                set_tx_desc_sec_type(pdesc, 0x0);
                                 break;
 
                         }
                 }
 
-                SET_TX_DESC_PKT_ID(pdesc, 0);
-                SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
+                set_tx_desc_pkt_id(pdesc, 0);
+                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, 0);
-                SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
+                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, 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_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_first_seg(pdesc, (firstseg ? 1 : 0));
+        set_tx_desc_last_seg(pdesc, (lastseg ? 1 : 0));
 
-        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) skb->len);
+        set_tx_desc_tx_buffer_size(pdesc, (u16)skb->len);
 
-        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+        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);
+                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_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); */
+                set_tx_desc_hwseq_en_8723(pdesc, 1);
+                /* set_tx_desc_hwseq_en(pdesc, 1); */
+                /* set_tx_desc_pkt_id(pdesc, 8); */
 
                 if (!b_defaultadapter)
-                        SET_TX_DESC_HWSEQ_SEL_8723(pdesc, 1);
-        /* SET_TX_DESC_QOS(pdesc, 1); */
+                        set_tx_desc_hwseq_sel_8723(pdesc, 1);
+        /* set_tx_desc_qos(pdesc, 1); */
         }
 
-        SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 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))) {
-                SET_TX_DESC_BMC(pdesc, 1);
+                set_tx_desc_bmc(pdesc, 1);
         }
 
         RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw,
-                              u8 *pdesc, bool firstseg,
+                              u8 *pdesc8, 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;
+        __le32 *pdesc = (__le32 *)pdesc8;
 
         dma_addr_t mapping = pci_map_single(rtlpci->pdev,
                                             skb->data, skb->len,
@@ -538,44 +541,44 @@ void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw,
                          "DMA mapping error\n");
                 return;
         }
-        CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE);
+        clear_pci_tx_desc_content(pdesc, TX_DESC_SIZE);
 
         if (firstseg)
-                SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+                set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);
 
-        SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
+        set_tx_desc_tx_rate(pdesc, DESC92C_RATE1M);
 
-        SET_TX_DESC_SEQ(pdesc, 0);
+        set_tx_desc_seq(pdesc, 0);
 
-        SET_TX_DESC_LINIP(pdesc, 0);
+        set_tx_desc_linip(pdesc, 0);
 
-        SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
+        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_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_size(pdesc, (u16)(skb->len));
 
-        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+        set_tx_desc_tx_buffer_address(pdesc, mapping);
 
-        SET_TX_DESC_RATE_ID(pdesc, 7);
-        SET_TX_DESC_MACID(pdesc, 0);
+        set_tx_desc_rate_id(pdesc, 7);
+        set_tx_desc_macid(pdesc, 0);
 
-        SET_TX_DESC_OWN(pdesc, 1);
+        set_tx_desc_own(pdesc, 1);
 
-        SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
+        set_tx_desc_pkt_size(pdesc, (u16)(skb->len));
 
-        SET_TX_DESC_FIRST_SEG(pdesc, 1);
-        SET_TX_DESC_LAST_SEG(pdesc, 1);
+        set_tx_desc_first_seg(pdesc, 1);
+        set_tx_desc_last_seg(pdesc, 1);
 
-        SET_TX_DESC_OFFSET(pdesc, 0x20);
+        set_tx_desc_offset(pdesc, 0x20);
 
-        SET_TX_DESC_USE_RATE(pdesc, 1);
+        set_tx_desc_use_rate(pdesc, 1);
 
         if (!ieee80211_is_data_qos(fc)) {
-                SET_TX_DESC_HWSEQ_EN_8723(pdesc, 1);
-                /* SET_TX_DESC_HWSEQ_EN(pdesc, 1); */
-                /* SET_TX_DESC_PKT_ID(pdesc, 8); */
+                set_tx_desc_hwseq_en_8723(pdesc, 1);
+                /* set_tx_desc_hwseq_en(pdesc, 1); */
+                /* set_tx_desc_pkt_id(pdesc, 8); */
         }
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
@@ -583,16 +586,18 @@ void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw,
                       pdesc, TX_DESC_SIZE);
 }
 
-void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
+void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc8,
                        bool istx, u8 desc_name, u8 *val)
 {
+        __le32 *pdesc = (__le32 *)pdesc8;
+
         if (istx == true) {
                 switch (desc_name) {
                 case HW_DESC_OWN:
-                        SET_TX_DESC_OWN(pdesc, 1);
+                        set_tx_desc_own(pdesc, 1);
                         break;
                 case HW_DESC_TX_NEXTDESC_ADDR:
-                        SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
+                        set_tx_desc_next_desc_address(pdesc, *(u32 *)val);
                         break;
                 default:
                         WARN_ONCE(true, "rtl8723ae: ERR txdesc :%d not processed\n",
@@ -602,16 +607,16 @@ void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
         } else {
                 switch (desc_name) {
                 case HW_DESC_RXOWN:
-                        SET_RX_DESC_OWN(pdesc, 1);
+                        set_rx_desc_own(pdesc, 1);
                         break;
                 case HW_DESC_RXBUFF_ADDR:
-                        SET_RX_DESC_BUFF_ADDR(pdesc, *(u32 *) val);
+                        set_rx_desc_buff_addr(pdesc, *(u32 *)val);
                         break;
                 case HW_DESC_RXPKT_LEN:
-                        SET_RX_DESC_PKT_LEN(pdesc, *(u32 *) val);
+                        set_rx_desc_pkt_len(pdesc, *(u32 *)val);
                         break;
                 case HW_DESC_RXERO:
-                        SET_RX_DESC_EOR(pdesc, 1);
+                        set_rx_desc_eor(pdesc, 1);
                         break;
                 default:
                         WARN_ONCE(true, "rtl8723ae: ERR rxdesc :%d not processed\n",
@@ -622,17 +627,18 @@ void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
 }
 
 u64 rtl8723e_get_desc(struct ieee80211_hw *hw,
-                      u8 *pdesc, bool istx, u8 desc_name)
+                      u8 *pdesc8, bool istx, u8 desc_name)
 {
         u32 ret = 0;
+        __le32 *pdesc = (__le32 *)pdesc8;
 
         if (istx == true) {
                 switch (desc_name) {
                 case HW_DESC_OWN:
-                        ret = GET_TX_DESC_OWN(pdesc);
+                        ret = get_tx_desc_own(pdesc);
                         break;
                 case HW_DESC_TXBUFF_ADDR:
-                        ret = GET_TX_DESC_TX_BUFFER_ADDRESS(pdesc);
+                        ret = get_tx_desc_tx_buffer_address(pdesc);
                         break;
                 default:
                         WARN_ONCE(true, "rtl8723ae: ERR txdesc :%d not processed\n",
@@ -642,13 +648,13 @@ u64 rtl8723e_get_desc(struct ieee80211_hw *hw,
         } else {
                 switch (desc_name) {
                 case HW_DESC_OWN:
-                        ret = GET_RX_DESC_OWN(pdesc);
+                        ret = get_rx_desc_own(pdesc);
                         break;
                 case HW_DESC_RXPKT_LEN:
-                        ret = GET_RX_DESC_PKT_LEN(pdesc);
+                        ret = get_rx_desc_pkt_len(pdesc);
                         break;
                 case HW_DESC_RXBUFF_ADDR:
-                        ret = GET_RX_DESC_BUFF_ADDR(pdesc);
+                        ret = get_rx_desc_buff_addr(pdesc);
                         break;
                 default:
                         WARN_ONCE(true, "rtl8723ae: ERR rxdesc :%d not processed\n",
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
index 4a19ea76b290..2d25f62a4d52 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
@@ -14,486 +14,324 @@
 #define USB_HWDESC_HEADER_LEN                   32
 #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, 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)                          \
-        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)         \
-        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, 4, __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)
-#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, 8, __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, 8)
-
-#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)
-#define SET_TX_DESC_BAR_RTY_TH(__pdesc, __val)          \
-        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)                         \
-        SET_BITS_TO_LE_4BYTE(__pdesc+8, 18, 1, __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)
-#define SET_TX_DESC_ANTSEL_A(__pdesc, __val)            \
-        SET_BITS_TO_LE_4BYTE(__pdesc+8, 24, 1, __val)
-#define SET_TX_DESC_ANTSEL_B(__pdesc, __val)            \
-        SET_BITS_TO_LE_4BYTE(__pdesc+8, 25, 1, __val)
-#define SET_TX_DESC_TX_ANT_CCK(__pdesc, __val)          \
-        SET_BITS_TO_LE_4BYTE(__pdesc+8, 26, 2, __val)
-#define SET_TX_DESC_TX_ANTL(__pdesc, __val)             \
-        SET_BITS_TO_LE_4BYTE(__pdesc+8, 28, 2, __val)
-#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)                             \
-        LE_BITS_TO_4BYTE(__pdesc+8, 0, 6)
-#define GET_TX_DESC_DATA_RC(__pdesc)                            \
-        LE_BITS_TO_4BYTE(__pdesc+8, 6, 6)
-#define GET_TX_DESC_BAR_RTY_TH(__pdesc)                         \
-        LE_BITS_TO_4BYTE(__pdesc+8, 14, 2)
-#define GET_TX_DESC_MORE_FRAG(__pdesc)                          \
-        LE_BITS_TO_4BYTE(__pdesc+8, 17, 1)
-#define GET_TX_DESC_RAW(__pdesc)                                \
-        LE_BITS_TO_4BYTE(__pdesc+8, 18, 1)
-#define GET_TX_DESC_CCX(__pdesc)                                \
-        LE_BITS_TO_4BYTE(__pdesc+8, 19, 1)
-#define GET_TX_DESC_AMPDU_DENSITY(__pdesc)                      \
-        LE_BITS_TO_4BYTE(__pdesc+8, 20, 3)
-#define GET_TX_DESC_ANTSEL_A(__pdesc)                           \
-        LE_BITS_TO_4BYTE(__pdesc+8, 24, 1)
-#define GET_TX_DESC_ANTSEL_B(__pdesc)                           \
-        LE_BITS_TO_4BYTE(__pdesc+8, 25, 1)
-#define GET_TX_DESC_TX_ANT_CCK(__pdesc)                         \
-        LE_BITS_TO_4BYTE(__pdesc+8, 26, 2)
-#define GET_TX_DESC_TX_ANTL(__pdesc)                            \
-        LE_BITS_TO_4BYTE(__pdesc+8, 28, 2)
-#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)                         \
-        SET_BITS_TO_LE_4BYTE(__pdesc+12, 16, 12, __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)                          \
-        LE_BITS_TO_4BYTE(__pdesc+12, 8, 8)
-#define GET_TX_DESC_SEQ(__pdesc)                                \
-        LE_BITS_TO_4BYTE(__pdesc+12, 16, 12)
-#define GET_TX_DESC_PKT_ID(__pdesc)                             \
-        LE_BITS_TO_4BYTE(__pdesc+12, 28, 4)
+static inline void set_tx_desc_pkt_size(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, GENMASK(15, 0));
+}
+
+static inline void set_tx_desc_offset(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, GENMASK(23, 16));
+}
+
+static inline void set_tx_desc_bmc(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(24));
+}
+
+static inline void set_tx_desc_htc(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(25));
+}
+
+static inline void set_tx_desc_last_seg(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(26));
+}
+
+static inline void set_tx_desc_first_seg(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(27));
+}
+
+static inline void set_tx_desc_linip(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(28));
+}
+
+static inline void set_tx_desc_own(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(31));
+}
+
+static inline u32 get_tx_desc_own(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(31));
+}
+
+static inline void set_tx_desc_macid(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(4, 0));
+}
+
+static inline void set_tx_desc_agg_break(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, BIT(5));
+}
+
+static inline void set_tx_desc_rdg_enable(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, BIT(7));
+}
+
+static inline void set_tx_desc_queue_sel(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(12, 8));
+}
+
+static inline void set_tx_desc_rate_id(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(19, 16));
+}
+
+static inline void set_tx_desc_sec_type(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(23, 22));
+}
+
+static inline void set_tx_desc_more_frag(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 2), __val, BIT(17));
+}
+
+static inline void set_tx_desc_ampdu_density(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 2), __val, GENMASK(22, 20));
+}
+
+static inline void set_tx_desc_seq(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, GENMASK(27, 16));
+}
+
+static inline void set_tx_desc_pkt_id(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, GENMASK(31, 28));
+}
 
 /* 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)   \
-        SET_BITS_TO_LE_4BYTE(__pdesc+12, 31, 1, __val)
-#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)                         \
-        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)
-#define SET_TX_DESC_USE_RATE(__pdesc, __val)            \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 8, 1, __val)
-#define SET_TX_DESC_DISABLE_RTS_FB(__pdesc, __val)      \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 9, 1, __val)
-#define SET_TX_DESC_DISABLE_FB(__pdesc, __val)          \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 10, 1, __val)
-#define SET_TX_DESC_CTS2SELF(__pdesc, __val)            \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 11, 1, __val)
-#define SET_TX_DESC_RTS_ENABLE(__pdesc, __val)          \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 12, 1, __val)
-#define SET_TX_DESC_HW_RTS_ENABLE(__pdesc, __val)       \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 13, 1, __val)
-#define SET_TX_DESC_PORT_ID(__pdesc, __val)             \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 14, 1, __val)
-#define SET_TX_DESC_WAIT_DCTS(__pdesc, __val)           \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 18, 1, __val)
-#define SET_TX_DESC_CTS2AP_EN(__pdesc, __val)           \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 19, 1, __val)
-#define SET_TX_DESC_TX_SUB_CARRIER(__pdesc, __val)      \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 20, 2, __val)
-#define SET_TX_DESC_TX_STBC(__pdesc, __val)             \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 22, 2, __val)
-#define SET_TX_DESC_DATA_SHORT(__pdesc, __val)          \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 24, 1, __val)
-#define SET_TX_DESC_DATA_BW(__pdesc, __val)             \
-        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)                      \
-        SET_BITS_TO_LE_4BYTE(__pdesc+16, 27, 1, __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)                           \
-        LE_BITS_TO_4BYTE(__pdesc+16, 0, 5)
-#define GET_TX_DESC_AP_DCFE(__pdesc)                            \
-        LE_BITS_TO_4BYTE(__pdesc+16, 5, 1)
-#define GET_TX_DESC_QOS(__pdesc)                                \
-        LE_BITS_TO_4BYTE(__pdesc+16, 6, 1)
-#define GET_TX_DESC_HWSEQ_EN(__pdesc)                           \
-        LE_BITS_TO_4BYTE(__pdesc+16, 7, 1)
-#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)                         \
-        LE_BITS_TO_4BYTE(__pdesc+16, 10, 1)
-#define GET_TX_DESC_CTS2SELF(__pdesc)                           \
-        LE_BITS_TO_4BYTE(__pdesc+16, 11, 1)
-#define GET_TX_DESC_RTS_ENABLE(__pdesc)                         \
-        LE_BITS_TO_4BYTE(__pdesc+16, 12, 1)
-#define GET_TX_DESC_HW_RTS_ENABLE(__pdesc)                      \
-        LE_BITS_TO_4BYTE(__pdesc+16, 13, 1)
-#define GET_TX_DESC_PORT_ID(__pdesc)                            \
-        LE_BITS_TO_4BYTE(__pdesc+16, 14, 1)
-#define GET_TX_DESC_WAIT_DCTS(__pdesc)                          \
-        LE_BITS_TO_4BYTE(__pdesc+16, 18, 1)
-#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)                            \
-        LE_BITS_TO_4BYTE(__pdesc+16, 22, 2)
-#define GET_TX_DESC_DATA_SHORT(__pdesc)                         \
-        LE_BITS_TO_4BYTE(__pdesc+16, 24, 1)
-#define GET_TX_DESC_DATA_BW(__pdesc)                            \
-        LE_BITS_TO_4BYTE(__pdesc+16, 25, 1)
-#define GET_TX_DESC_RTS_SHORT(__pdesc)                          \
-        LE_BITS_TO_4BYTE(__pdesc+16, 26, 1)
-#define GET_TX_DESC_RTS_BW(__pdesc)                             \
-        LE_BITS_TO_4BYTE(__pdesc+16, 27, 1)
-#define GET_TX_DESC_RTS_SC(__pdesc)                             \
-        LE_BITS_TO_4BYTE(__pdesc+16, 28, 2)
-#define GET_TX_DESC_RTS_STBC(__pdesc)                           \
-        LE_BITS_TO_4BYTE(__pdesc+16, 30, 2)
-
-#define SET_TX_DESC_TX_RATE(__pdesc, __val)             \
-        SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 6, __val)
-#define SET_TX_DESC_DATA_SHORTGI(__pdesc, __val)        \
-        SET_BITS_TO_LE_4BYTE(__pdesc+20, 6, 1, __val)
-#define SET_TX_DESC_CCX_TAG(__pdesc, __val)             \
-        SET_BITS_TO_LE_4BYTE(__pdesc+20, 7, 1, __val)
-#define SET_TX_DESC_DATA_RATE_FB_LIMIT(__pdesc, __val)  \
-        SET_BITS_TO_LE_4BYTE(__pdesc+20, 8, 5, __val)
-#define SET_TX_DESC_RTS_RATE_FB_LIMIT(__pdesc, __val)   \
-        SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val)
-#define SET_TX_DESC_RETRY_LIMIT_ENABLE(__pdesc, __val)  \
-        SET_BITS_TO_LE_4BYTE(__pdesc+20, 17, 1, __val)
-#define SET_TX_DESC_DATA_RETRY_LIMIT(__pdesc, __val)    \
-        SET_BITS_TO_LE_4BYTE(__pdesc+20, 18, 6, __val)
-#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)                            \
-        LE_BITS_TO_4BYTE(__pdesc+20, 0, 6)
-#define GET_TX_DESC_DATA_SHORTGI(__pdesc)                       \
-        LE_BITS_TO_4BYTE(__pdesc+20, 6, 1)
-#define GET_TX_DESC_CCX_TAG(__pdesc)                            \
-        LE_BITS_TO_4BYTE(__pdesc+20, 7, 1)
-#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)         \
-        LE_BITS_TO_4BYTE(__pdesc+20, 17, 1)
-#define GET_TX_DESC_DATA_RETRY_LIMIT(__pdesc)           \
-        LE_BITS_TO_4BYTE(__pdesc+20, 18, 6)
-#define GET_TX_DESC_USB_TXAGG_NUM(__pdesc)                      \
-        LE_BITS_TO_4BYTE(__pdesc+20, 24, 8)
-
-#define SET_TX_DESC_TXAGC_A(__pdesc, __val)             \
-        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)         \
-        SET_BITS_TO_LE_4BYTE(__pdesc+24, 10, 1, __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)
-#define SET_TX_DESC_MCSG2_MAX_LEN(__pdesc, __val)       \
-        SET_BITS_TO_LE_4BYTE(__pdesc+24, 20, 4, __val)
-#define SET_TX_DESC_MCSG3_MAX_LEN(__pdesc, __val)       \
-        SET_BITS_TO_LE_4BYTE(__pdesc+24, 24, 4, __val)
-#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)                            \
-        LE_BITS_TO_4BYTE(__pdesc+24, 0, 5)
-#define GET_TX_DESC_TXAGC_B(__pdesc)                            \
-        LE_BITS_TO_4BYTE(__pdesc+24, 5, 5)
-#define GET_TX_DESC_USE_MAX_LEN(__pdesc)                        \
-        LE_BITS_TO_4BYTE(__pdesc+24, 10, 1)
-#define GET_TX_DESC_MAX_AGG_NUM(__pdesc)                        \
-        LE_BITS_TO_4BYTE(__pdesc+24, 11, 5)
-#define GET_TX_DESC_MCSG1_MAX_LEN(__pdesc)                      \
-        LE_BITS_TO_4BYTE(__pdesc+24, 16, 4)
-#define GET_TX_DESC_MCSG2_MAX_LEN(__pdesc)                      \
-        LE_BITS_TO_4BYTE(__pdesc+24, 20, 4)
-#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)
-
-#define SET_TX_DESC_TX_BUFFER_SIZE(__pdesc, __val)      \
-        SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val)
-#define SET_TX_DESC_MCSG4_MAX_LEN(__pdesc, __val)       \
-        SET_BITS_TO_LE_4BYTE(__pdesc+28, 16, 4, __val)
-#define SET_TX_DESC_MCSG5_MAX_LEN(__pdesc, __val)       \
-        SET_BITS_TO_LE_4BYTE(__pdesc+28, 20, 4, __val)
-#define SET_TX_DESC_MCSG6_MAX_LEN(__pdesc, __val)       \
-        SET_BITS_TO_LE_4BYTE(__pdesc+28, 24, 4, __val)
-#define SET_TX_DESC_MCS15_SGI_MAX_LEN(__pdesc, __val)   \
-        SET_BITS_TO_LE_4BYTE(__pdesc+28, 28, 4, __val)
-
-#define GET_TX_DESC_TX_BUFFER_SIZE(__pdesc)             \
-        LE_BITS_TO_4BYTE(__pdesc+28, 0, 16)
-#define GET_TX_DESC_MCSG4_MAX_LEN(__pdesc)                      \
-        LE_BITS_TO_4BYTE(__pdesc+28, 16, 4)
-#define GET_TX_DESC_MCSG5_MAX_LEN(__pdesc)                      \
-        LE_BITS_TO_4BYTE(__pdesc+28, 20, 4)
-#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)
-
-#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) \
-        SET_BITS_TO_LE_4BYTE(__pdesc+36, 0, 32, __val)
-
-#define GET_TX_DESC_TX_BUFFER_ADDRESS(__pdesc)          \
-        LE_BITS_TO_4BYTE(__pdesc+32, 0, 32)
-#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)   \
-        SET_BITS_TO_LE_4BYTE(__pdesc+40, 0, 32, __val)
-#define SET_TX_DESC_NEXT_DESC_ADDRESS64(__pdesc, __val) \
-        SET_BITS_TO_LE_4BYTE(__pdesc+44, 0, 32, __val)
-
-#define GET_TX_DESC_NEXT_DESC_ADDRESS(__pdesc)          \
-        LE_BITS_TO_4BYTE(__pdesc+40, 0, 32)
-#define GET_TX_DESC_NEXT_DESC_ADDRESS64(__pdesc)        \
-        LE_BITS_TO_4BYTE(__pdesc+44, 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, 5)
-#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)                              \
-        LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)
-#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)                                \
-        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_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)                               \
-        LE_BITS_TO_4BYTE(__pdesc+8, 31, 1)
-
-#define GET_RX_DESC_RXMCS(__pdesc)                              \
-        LE_BITS_TO_4BYTE(__pdesc+12, 0, 6)
-#define GET_RX_DESC_RXHT(__pdesc)                               \
-        LE_BITS_TO_4BYTE(__pdesc+12, 6, 1)
-#define GET_RX_DESC_SPLCP(__pdesc)                              \
-        LE_BITS_TO_4BYTE(__pdesc+12, 8, 1)
-#define GET_RX_DESC_BW(__pdesc)                                 \
-        LE_BITS_TO_4BYTE(__pdesc+12, 9, 1)
-#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)                                \
-        LE_BITS_TO_4BYTE(__pdesc+12, 16, 16)
-
-#define GET_RX_DESC_IV1(__pdesc)                                \
-        LE_BITS_TO_4BYTE(__pdesc+16, 0, 32)
-#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)
-
-#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)
+static inline void set_tx_desc_hwseq_en_8723(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, BIT(31));
+}
+
+static inline void set_tx_desc_hwseq_sel_8723(__le32 *__txdesc, u32 __value)
+{
+        le32p_replace_bits((__txdesc + 4), __value, GENMASK(7, 6));
+}
+
+static inline void set_tx_desc_rts_rate(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, GENMASK(4, 0));
+}
+
+static inline void set_tx_desc_use_rate(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, BIT(8));
+}
+
+static inline void set_tx_desc_disable_fb(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, BIT(10));
+}
+
+static inline void set_tx_desc_cts2self(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, BIT(11));
+}
+
+static inline void set_tx_desc_rts_enable(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, BIT(12));
+}
+
+static inline void set_tx_desc_hw_rts_enable(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, BIT(13));
+}
+
+static inline void set_tx_desc_tx_sub_carrier(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, GENMASK(21, 20));
+}
+
+static inline void set_tx_desc_data_bw(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, BIT(25));
+}
+
+static inline void set_tx_desc_rts_short(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, BIT(26));
+}
+
+static inline void set_tx_desc_rts_bw(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, BIT(27));
+}
+
+static inline void set_tx_desc_rts_sc(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, GENMASK(29, 28));
+}
+
+static inline void set_tx_desc_rts_stbc(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, GENMASK(31, 30));
+}
+
+static inline void set_tx_desc_tx_rate(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, GENMASK(5, 0));
+}
+
+static inline void set_tx_desc_data_shortgi(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, BIT(6));
+}
+
+static inline void set_tx_desc_data_rate_fb_limit(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, GENMASK(12, 8));
+}
+
+static inline void set_tx_desc_rts_rate_fb_limit(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, GENMASK(16, 13));
+}
+
+static inline void set_tx_desc_max_agg_num(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 6), __val, GENMASK(15, 11));
+}
+
+static inline void set_tx_desc_tx_buffer_size(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 7), __val, GENMASK(15, 0));
+}
+
+static inline void set_tx_desc_tx_buffer_address(__le32 *__pdesc, u32 __val)
+{
+        *(__pdesc + 8) = cpu_to_le32(__val);
+}
+
+static inline u32 get_tx_desc_tx_buffer_address(__le32 *__pdesc)
+{
+        return le32_to_cpu(*(__pdesc + 8));
+}
+
+static inline void set_tx_desc_next_desc_address(__le32 *__pdesc, u32 __val)
+{
+        *(__pdesc + 10) = cpu_to_le32(__val);
+}
+
+static inline u32 get_rx_desc_pkt_len(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, GENMASK(13, 0));
+}
+
+static inline u32 get_rx_desc_crc32(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(14));
+}
+
+static inline u32 get_rx_desc_icv(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(15));
+}
+
+static inline u32 get_rx_desc_drv_info_size(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, GENMASK(19, 16));
+}
+
+static inline u32 get_rx_desc_shift(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, GENMASK(25, 24));
+}
+
+static inline u32 get_rx_desc_physt(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(26));
+}
+
+static inline u32 get_rx_desc_swdec(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(27));
+}
+
+static inline u32 get_rx_desc_own(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(31));
+}
+
+static inline void set_rx_desc_pkt_len(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, GENMASK(13, 0));
+}
+
+static inline void set_rx_desc_eor(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(30));
+}
+
+static inline void set_rx_desc_own(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(31));
+}
+
+static inline u32 get_rx_desc_paggr(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 1), BIT(14));
+}
+
+static inline u32 get_rx_desc_faggr(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 1), BIT(15));
+}
+
+static inline u32 get_rx_desc_rxmcs(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), GENMASK(5, 0));
+}
+
+static inline u32 get_rx_desc_rxht(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), BIT(6));
+}
+
+static inline u32 get_rx_desc_splcp(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), BIT(8));
+}
+
+static inline u32 get_rx_desc_bw(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), BIT(9));
+}
+
+static inline u32 get_rx_desc_tsfl(__le32 *__pdesc)
+{
+        return le32_to_cpu(*(__pdesc + 5));
+}
+
+static inline u32 get_rx_desc_buff_addr(__le32 *__pdesc)
+{
+        return le32_to_cpu(*(__pdesc + 6));
+}
+
+static inline void set_rx_desc_buff_addr(__le32 *__pdesc, u32 __val)
+{
+        *(__pdesc + 6) = cpu_to_le32(__val);
+}
+
+static inline void clear_pci_tx_desc_content(__le32 *__pdesc, u32 _size)
+{
+        if (_size > TX_DESC_NEXT_DESC_OFFSET)
+                memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);
+        else
+                memset(__pdesc, 0, _size);
+}
 
 struct rx_fwinfo_8723e {
         u8 gain_trsw[4];
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
index d87ba03fe78f..b8081e196cdf 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
@@ -26,7 +26,8 @@ static u8 _rtl8723be_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
 }
 
 static void _rtl8723be_query_rxphystatus(struct ieee80211_hw *hw,
-                                         struct rtl_stats *pstatus, u8 *pdesc,
+                                         struct rtl_stats *pstatus,
+                                         __le32 *pdesc,
                                          struct rx_fwinfo_8723be *p_drvinfo,
                                          bool bpacket_match_bssid,
                                          bool bpacket_toself,
@@ -189,7 +190,7 @@ static void _rtl8723be_query_rxphystatus(struct ieee80211_hw *hw,
 static void _rtl8723be_translate_rx_signal_stuff(struct ieee80211_hw *hw,
                                         struct sk_buff *skb,
                                         struct rtl_stats *pstatus,
-                                        u8 *pdesc,
+                                        __le32 *pdesc,
                                         struct rx_fwinfo_8723be *p_drvinfo)
 {
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -242,12 +243,12 @@ static void _rtl8723be_translate_rx_signal_stuff(struct ieee80211_hw *hw,
 }
 
 static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
-                                        u8 *virtualaddress)
+                                        __le32 *virtualaddress)
 {
         u32 dwtmp = 0;
         memset(virtualaddress, 0, 8);
 
-        SET_EARLYMODE_PKTNUM(virtualaddress, ptcb_desc->empkt_num);
+        set_earlymode_pktnum(virtualaddress, ptcb_desc->empkt_num);
         if (ptcb_desc->empkt_num == 1) {
                 dwtmp = ptcb_desc->empkt_len[0];
         } else {
@@ -255,7 +256,7 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
                 dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
                 dwtmp += ptcb_desc->empkt_len[1];
         }
-        SET_EARLYMODE_LEN0(virtualaddress, dwtmp);
+        set_earlymode_len0(virtualaddress, dwtmp);
 
         if (ptcb_desc->empkt_num <= 3) {
                 dwtmp = ptcb_desc->empkt_len[2];
@@ -264,7 +265,7 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
                 dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
                 dwtmp += ptcb_desc->empkt_len[3];
         }
-        SET_EARLYMODE_LEN1(virtualaddress, dwtmp);
+        set_earlymode_len1(virtualaddress, dwtmp);
         if (ptcb_desc->empkt_num <= 5) {
                 dwtmp = ptcb_desc->empkt_len[4];
         } else {
@@ -272,8 +273,8 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
                 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);
+        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 {
@@ -281,7 +282,7 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
                 dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
                 dwtmp += ptcb_desc->empkt_len[7];
         }
-        SET_EARLYMODE_LEN3(virtualaddress, dwtmp);
+        set_earlymode_len3(virtualaddress, dwtmp);
         if (ptcb_desc->empkt_num <= 9) {
                 dwtmp = ptcb_desc->empkt_len[8];
         } else {
@@ -289,51 +290,52 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
                 dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
                 dwtmp += ptcb_desc->empkt_len[9];
         }
-        SET_EARLYMODE_LEN4(virtualaddress, dwtmp);
+        set_earlymode_len4(virtualaddress, dwtmp);
 }
 
 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)
+                             u8 *pdesc8, struct sk_buff *skb)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rx_fwinfo_8723be *p_drvinfo;
         struct ieee80211_hdr *hdr;
         u8 wake_match;
-        u32 phystatus = GET_RX_DESC_PHYST(pdesc);
+        __le32 *pdesc = (__le32 *)pdesc8;
+        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) *
+        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->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_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->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_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 = RX_HAL_IS_CCK_RATE(status->rate);
 
-        if (GET_RX_STATUS_DESC_RPT_SEL(pdesc))
+        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))
+        if (get_rx_status_desc_pattern_match(pdesc))
                 wake_match = BIT(2);
-        else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
+        else if (get_rx_status_desc_magic_match(pdesc))
                 wake_match = BIT(1);
-        else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))
+        else if (get_rx_status_desc_unicast_match(pdesc))
                 wake_match = BIT(0);
         else
                 wake_match = 0;
@@ -392,15 +394,15 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
         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,
+                            struct ieee80211_hdr *hdr, u8 *pdesc8,
                             u8 *txbd, struct ieee80211_tx_info *info,
                             struct ieee80211_sta *sta, struct sk_buff *skb,
                             u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)
@@ -410,7 +412,7 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtlwifi_tx_info *tx_info = rtl_tx_skb_cb_info(skb);
-        u8 *pdesc = (u8 *)pdesc_tx;
+        __le32 *pdesc = (__le32 *)pdesc8;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         unsigned int buf_len = 0;
@@ -446,78 +448,78 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "DMA mapping error\n");
                 return;
         }
-        CLEAR_PCI_TX_DESC_CONTENT(pdesc, sizeof(struct tx_desc_8723be));
+        clear_pci_tx_desc_content(pdesc, sizeof(struct tx_desc_8723be));
         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 +
+                        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);
                                 _rtl8723be_insert_emcontent(ptcb_desc,
-                                                            (u8 *)(skb->data));
+                                                            (__le32 *)(skb->data));
                         }
                 } else {
-                        SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+                        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);
+                set_tx_desc_tx_rate(pdesc, ptcb_desc->hw_rate);
                 if (ptcb_desc->hw_rate > DESC92C_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);
+                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, 0x14);
+                        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 &&
+                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) ?
+                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_rate(pdesc, ptcb_desc->rts_rate);
 
-                SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
-                SET_TX_DESC_RTS_SHORT(pdesc,
+                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);
+                        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);
+                                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);
+                                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_data_bw(pdesc, 0);
+                        set_tx_desc_tx_sub_carrier(pdesc, 0);
                 }
 
-                SET_TX_DESC_LINIP(pdesc, 0);
-                SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb_len);
+                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);
+                        set_tx_desc_ampdu_density(pdesc, ampdu_density);
                 }
                 if (info->control.hw_key) {
                         struct ieee80211_key_conf *keyconf =
@@ -526,23 +528,23 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                         case WLAN_CIPHER_SUITE_WEP40:
                         case WLAN_CIPHER_SUITE_WEP104:
                         case WLAN_CIPHER_SUITE_TKIP:
-                                SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
+                                set_tx_desc_sec_type(pdesc, 0x1);
                                 break;
                         case WLAN_CIPHER_SUITE_CCMP:
-                                SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
+                                set_tx_desc_sec_type(pdesc, 0x3);
                                 break;
                         default:
-                                SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
+                                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 ?
+                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_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 */
@@ -551,46 +553,47 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                         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_rdg_enable(pdesc, 1);
+                                set_tx_desc_htc(pdesc, 1);
                         }
                 }
                 /* tx report */
-                rtl_set_tx_report(ptcb_desc, pdesc, hw, tx_info);
+                rtl_set_tx_report(ptcb_desc, pdesc8, hw, tx_info);
         }
 
-        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);
+        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);
+                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);
+                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_hwseq_en(pdesc, 1);
+                set_tx_desc_hwseq_sel(pdesc, 0);
         }
-        SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 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))) {
-                SET_TX_DESC_BMC(pdesc, 1);
+                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,
+void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc8,
                                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;
+        __le32 *pdesc = (__le32 *)pdesc8;
 
         dma_addr_t mapping = pci_map_single(rtlpci->pdev,
                                             skb->data, skb->len,
@@ -601,51 +604,53 @@ void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
                          "DMA mapping error\n");
                 return;
         }
-        CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE);
+        clear_pci_tx_desc_content(pdesc, TX_DESC_SIZE);
 
-        SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
+        set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);
 
-        SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
+        set_tx_desc_tx_rate(pdesc, DESC92C_RATE1M);
 
-        SET_TX_DESC_SEQ(pdesc, 0);
+        set_tx_desc_seq(pdesc, 0);
 
-        SET_TX_DESC_LINIP(pdesc, 0);
+        set_tx_desc_linip(pdesc, 0);
 
-        SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
+        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_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_size(pdesc, (u16)(skb->len));
 
-        SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+        set_tx_desc_tx_buffer_address(pdesc, mapping);
 
-        SET_TX_DESC_RATE_ID(pdesc, 0);
-        SET_TX_DESC_MACID(pdesc, 0);
+        set_tx_desc_rate_id(pdesc, 0);
+        set_tx_desc_macid(pdesc, 0);
 
-        SET_TX_DESC_OWN(pdesc, 1);
+        set_tx_desc_own(pdesc, 1);
 
-        SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
+        set_tx_desc_pkt_size(pdesc, (u16)(skb->len));
 
-        SET_TX_DESC_FIRST_SEG(pdesc, 1);
-        SET_TX_DESC_LAST_SEG(pdesc, 1);
+        set_tx_desc_first_seg(pdesc, 1);
+        set_tx_desc_last_seg(pdesc, 1);
 
-        SET_TX_DESC_USE_RATE(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,
+void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc8,
                         bool istx, u8 desc_name, u8 *val)
 {
+        __le32 *pdesc = (__le32 *)pdesc8;
+
         if (istx) {
                 switch (desc_name) {
                 case HW_DESC_OWN:
-                        SET_TX_DESC_OWN(pdesc, 1);
+                        set_tx_desc_own(pdesc, 1);
                         break;
                 case HW_DESC_TX_NEXTDESC_ADDR:
-                        SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *)val);
+                        set_tx_desc_next_desc_address(pdesc, *(u32 *)val);
                         break;
                 default:
                         WARN_ONCE(true, "rtl8723be: ERR txdesc :%d not processed\n",
@@ -655,16 +660,16 @@ void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
         } else {
                 switch (desc_name) {
                 case HW_DESC_RXOWN:
-                        SET_RX_DESC_OWN(pdesc, 1);
+                        set_rx_desc_own(pdesc, 1);
                         break;
                 case HW_DESC_RXBUFF_ADDR:
-                        SET_RX_DESC_BUFF_ADDR(pdesc, *(u32 *)val);
+                        set_rx_desc_buff_addr(pdesc, *(u32 *)val);
                         break;
                 case HW_DESC_RXPKT_LEN:
-                        SET_RX_DESC_PKT_LEN(pdesc, *(u32 *)val);
+                        set_rx_desc_pkt_len(pdesc, *(u32 *)val);
                         break;
                 case HW_DESC_RXERO:
-                        SET_RX_DESC_EOR(pdesc, 1);
+                        set_rx_desc_eor(pdesc, 1);
                         break;
                 default:
                         WARN_ONCE(true, "rtl8723be: ERR rxdesc :%d not process\n",
@@ -675,17 +680,18 @@ void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
 }
 
 u64 rtl8723be_get_desc(struct ieee80211_hw *hw,
-                       u8 *pdesc, bool istx, u8 desc_name)
+                       u8 *pdesc8, bool istx, u8 desc_name)
 {
         u32 ret = 0;
+        __le32 *pdesc = (__le32 *)pdesc8;
 
         if (istx) {
                 switch (desc_name) {
                 case HW_DESC_OWN:
-                        ret = GET_TX_DESC_OWN(pdesc);
+                        ret = get_tx_desc_own(pdesc);
                         break;
                 case HW_DESC_TXBUFF_ADDR:
-                        ret = GET_TX_DESC_TX_BUFFER_ADDRESS(pdesc);
+                        ret = get_tx_desc_tx_buffer_address(pdesc);
                         break;
                 default:
                         WARN_ONCE(true, "rtl8723be: ERR txdesc :%d not process\n",
@@ -695,13 +701,13 @@ u64 rtl8723be_get_desc(struct ieee80211_hw *hw,
         } else {
                 switch (desc_name) {
                 case HW_DESC_OWN:
-                        ret = GET_RX_DESC_OWN(pdesc);
+                        ret = get_rx_desc_own(pdesc);
                         break;
                 case HW_DESC_RXPKT_LEN:
-                        ret = GET_RX_DESC_PKT_LEN(pdesc);
+                        ret = get_rx_desc_pkt_len(pdesc);
                         break;
                 case HW_DESC_RXBUFF_ADDR:
-                        ret = GET_RX_DESC_BUFF_ADDR(pdesc);
+                        ret = get_rx_desc_buff_addr(pdesc);
                         break;
                 default:
                         WARN_ONCE(true, "rtl8723be: ERR rxdesc :%d not processed\n",
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h
index 11e75a4e68bd..174aca20c7e1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h
@@ -14,351 +14,385 @@
 #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_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_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_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_SW_DEFINE(__pdesc, __val)   \
-        SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 0, 12, __val)
-#define SET_TX_DESC_MBSSID(__pdesc, __val)              \
-        SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 12, 4, __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)
-
-#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_RXHT(__pdesc)                       \
-        LE_BITS_TO_4BYTE(__pdesc+12, 6, 1)
-#define GET_RX_STATUS_DESC_RX_GF(__pdesc)               \
-        LE_BITS_TO_4BYTE(__pdesc+12, 7, 1)
-#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)
-
+static inline void set_tx_desc_pkt_size(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, GENMASK(15, 0));
+}
+
+static inline void set_tx_desc_offset(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, GENMASK(23, 16));
+}
+
+static inline void set_tx_desc_bmc(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(24));
+}
+
+static inline void set_tx_desc_htc(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(25));
+}
+
+static inline void set_tx_desc_last_seg(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(26));
+}
+
+static inline void set_tx_desc_first_seg(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(27));
+}
+
+static inline void set_tx_desc_linip(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(28));
+}
+
+static inline void set_tx_desc_own(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(31));
+}
+
+static inline u32 get_tx_desc_own(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(31));
+}
+
+static inline void set_tx_desc_macid(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(6, 0));
+}
+
+static inline void set_tx_desc_queue_sel(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(12, 8));
+}
+
+static inline void set_tx_desc_rate_id(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(20, 16));
+}
+
+static inline void set_tx_desc_sec_type(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(23, 22));
+}
+
+static inline void set_tx_desc_pkt_offset(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 1), __val, GENMASK(28, 24));
+}
+
+static inline void set_tx_desc_agg_enable(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 2), __val, BIT(12));
+}
+
+static inline void set_tx_desc_rdg_enable(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 2), __val, BIT(13));
+}
+
+static inline void set_tx_desc_more_frag(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 2), __val, BIT(17));
+}
+
+static inline void set_tx_desc_ampdu_density(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 2), __val, GENMASK(22, 20));
+}
+
+static inline void set_tx_desc_hwseq_sel(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, GENMASK(7, 6));
+}
+
+static inline void set_tx_desc_use_rate(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, BIT(8));
+}
+
+static inline void set_tx_desc_disable_fb(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, BIT(10));
+}
+
+static inline void set_tx_desc_cts2self(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, BIT(11));
+}
+
+static inline void set_tx_desc_rts_enable(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, BIT(12));
+}
+
+static inline void set_tx_desc_hw_rts_enable(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, BIT(13));
+}
+
+static inline void set_tx_desc_nav_use_hdr(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, BIT(15));
+}
+
+static inline void set_tx_desc_max_agg_num(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 3), __val, GENMASK(21, 17));
+}
+
+static inline void set_tx_desc_tx_rate(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, GENMASK(6, 0));
+}
+
+static inline void set_tx_desc_data_rate_fb_limit(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, GENMASK(12, 8));
+}
+
+static inline void set_tx_desc_rts_rate_fb_limit(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, GENMASK(16, 13));
+}
+
+static inline void set_tx_desc_rts_rate(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 4), __val, GENMASK(28, 24));
+}
+
+static inline void set_tx_desc_tx_sub_carrier(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, GENMASK(3, 0));
+}
+
+static inline void set_tx_desc_data_shortgi(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, BIT(4));
+}
+
+static inline void set_tx_desc_data_bw(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, GENMASK(6, 5));
+}
+
+static inline void set_tx_desc_rts_short(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, BIT(12));
+}
+
+static inline void set_tx_desc_rts_sc(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 5), __val, GENMASK(16, 13));
+}
+
+static inline void set_tx_desc_tx_buffer_size(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 7), __val, GENMASK(15, 0));
+}
+
+static inline void set_tx_desc_hwseq_en(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 8), __val, BIT(15));
+}
+
+static inline void set_tx_desc_seq(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits((__pdesc + 9), __val, GENMASK(23, 12));
+}
+
+static inline void set_tx_desc_tx_buffer_address(__le32 *__pdesc, u32 __val)
+{
+        *(__pdesc + 10) = cpu_to_le32(__val);
+}
+
+static inline u32 get_tx_desc_tx_buffer_address(__le32 *__pdesc)
+{
+        return le32_to_cpu(*((__pdesc + 10)));
+}
+
+static inline void set_tx_desc_next_desc_address(__le32 *__pdesc, u32 __val)
+{
+        *(__pdesc + 12) = cpu_to_le32(__val);
+}
+
+static inline u32 get_rx_desc_pkt_len(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, GENMASK(13, 0));
+}
+
+static inline u32 get_rx_desc_crc32(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(14));
+}
+
+static inline u32 get_rx_desc_icv(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(15));
+}
+
+static inline u32 get_rx_desc_drv_info_size(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, GENMASK(19, 16));
+}
+
+static inline u32 get_rx_desc_shift(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, GENMASK(25, 24));
+}
+
+static inline u32 get_rx_desc_physt(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(26));
+}
+
+static inline u32 get_rx_desc_swdec(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(27));
+}
+
+static inline u32 get_rx_desc_own(__le32 *__pdesc)
+{
+        return le32_get_bits(*__pdesc, BIT(31));
+}
+
+static inline void set_rx_desc_pkt_len(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, GENMASK(13, 0));
+}
+
+static inline void set_rx_desc_eor(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(30));
+}
+
+static inline void set_rx_desc_own(__le32 *__pdesc, u32 __val)
+{
+        le32p_replace_bits(__pdesc, __val, BIT(31));
+}
+
+static inline u32 get_rx_desc_macid(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 1), GENMASK(6, 0));
+}
+
+static inline u32 get_rx_desc_paggr(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 1), BIT(15));
+}
+
+static inline u32 get_rx_status_desc_rpt_sel(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 2), BIT(28));
+}
+
+static inline u32 get_rx_desc_rxmcs(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), GENMASK(6, 0));
+}
+
+static inline u32 get_rx_desc_rxht(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), BIT(6));
+}
+
+static inline u32 get_rx_status_desc_pattern_match(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), BIT(29));
+}
+
+static inline u32 get_rx_status_desc_unicast_match(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), BIT(30));
+}
+
+static inline u32 get_rx_status_desc_magic_match(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 3), BIT(31));
+}
+
+static inline u32 get_rx_desc_splcp(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 4), BIT(0));
+}
+
+static inline u32 get_rx_desc_bw(__le32 *__pdesc)
+{
+        return le32_get_bits(*(__pdesc + 4), GENMASK(5, 4));
+}
+
+static inline u32 get_rx_desc_tsfl(__le32 *__pdesc)
+{
+        return le32_to_cpu(*((__pdesc + 5)));
+}
+
+static inline u32 get_rx_desc_buff_addr(__le32 *__pdesc)
+{
+        return le32_to_cpu(*((__pdesc + 6)));
+}
+
+static inline void set_rx_desc_buff_addr(__le32 *__pdesc, u32 __val)
+{
+        *(__pdesc + 6) = cpu_to_le32(__val);
+}
 
 /* TX report 2 format in Rx desc*/
 
-#define GET_RX_RPT2_DESC_PKT_LEN(__rxstatusdesc)        \
-        LE_BITS_TO_4BYTE(__rxstatusdesc, 0, 9)
-#define GET_RX_RPT2_DESC_MACID_VALID_1(__rxstatusdesc)  \
-        LE_BITS_TO_4BYTE(__rxstatusdesc+16, 0, 32)
-#define GET_RX_RPT2_DESC_MACID_VALID_2(__rxstatusdesc)  \
-        LE_BITS_TO_4BYTE(__rxstatusdesc+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)
+static inline u32 get_rx_rpt2_desc_macid_valid_1(__le32 *__rxstatusdesc)
+{
+        return le32_to_cpu(*((__rxstatusdesc + 4)));
+}
+
+static inline u32 get_rx_rpt2_desc_macid_valid_2(__le32 *__rxstatusdesc)
+{
+        return le32_to_cpu(*((__rxstatusdesc + 5)));
+}
+
+static inline void set_earlymode_pktnum(__le32 *__paddr, u32 __value)
+{
+        le32p_replace_bits(__paddr, __value, GENMASK(3, 0));
+}
+
+static inline void set_earlymode_len0(__le32 *__paddr, u32 __value)
+{
+        le32p_replace_bits(__paddr, __value, GENMASK(15, 4));
+}
+
+static inline void set_earlymode_len1(__le32 *__paddr, u32 __value)
+{
+        le32p_replace_bits(__paddr, __value, GENMASK(27, 16));
+}
+
+static inline void set_earlymode_len2_1(__le32 *__paddr, u32 __value)
+{
+        le32p_replace_bits(__paddr, __value, GENMASK(31, 28));
+}
+
+static inline void set_earlymode_len2_2(__le32 *__paddr, u32 __value)
+{
+        le32p_replace_bits((__paddr + 1), __value, GENMASK(7, 0));
+}
+
+static inline void set_earlymode_len3(__le32 *__paddr, u32 __value)
+{
+        le32p_replace_bits((__paddr + 1), __value, GENMASK(19, 8));
+}
+
+static inline void set_earlymode_len4(__le32 *__paddr, u32 __value)
+{
+        le32p_replace_bits((__paddr + 1), __value, GENMASK(31, 20));
+}
+
+static inline void clear_pci_tx_desc_content(__le32 *__pdesc, u32 _size)
+{
+        if (_size > TX_DESC_NEXT_DESC_OFFSET)
+                memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);
+        else
+                memset(__pdesc, 0, _size);
+}
 
 struct phy_rx_agc_info_t {
         #ifdef __LITTLE_ENDIAN
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
index 827bc5f35d2a..235a7965675c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
@@ -107,37 +107,6 @@
 
 #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)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
index 408af144098e..979e434a4e73 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
@@ -3613,14 +3613,14 @@ u8 rtl8821ae_phy_sw_chnl(struct ieee80211_hw *hw)
 
 u8 _rtl8812ae_get_right_chnl_place_for_iqk(u8 chnl)
 {
-        u8 channel_all[TARGET_CHNL_NUM_2G_5G_8812] = {
+        static const 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;
+        u8 place;
 
         if (chnl > 14) {
                 for (place = 14; place < sizeof(channel_all); place++)
diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c
index 26e16ad5892a..793b40bdbf7c 100644
--- a/drivers/net/wireless/realtek/rtw88/coex.c
+++ b/drivers/net/wireless/realtek/rtw88/coex.c
@@ -721,7 +721,7 @@ static void rtw_coex_set_rf_para(struct rtw_dev *rtwdev,
         rtw_coex_set_bt_rx_gain(rtwdev, para.bt_lna_lvl);
 }
 
-static u32 rtw_coex_read_indirect_reg(struct rtw_dev *rtwdev, u16 addr)
+u32 rtw_coex_read_indirect_reg(struct rtw_dev *rtwdev, u16 addr)
 {
         u32 val;
 
diff --git a/drivers/net/wireless/realtek/rtw88/coex.h b/drivers/net/wireless/realtek/rtw88/coex.h
index 56e871b2d6c2..008d1af5996b 100644
--- a/drivers/net/wireless/realtek/rtw88/coex.h
+++ b/drivers/net/wireless/realtek/rtw88/coex.h
@@ -346,6 +346,7 @@ void rtw_coex_set_wl_rx_gain(struct rtw_dev *rtwdev, bool low_gain)
 }
 
 void rtw_coex_info_response(struct rtw_dev *rtwdev, struct sk_buff *skb);
+u32 rtw_coex_read_indirect_reg(struct rtw_dev *rtwdev, u16 addr);
 void rtw_coex_write_indirect_reg(struct rtw_dev *rtwdev, u16 addr,
                                  u32 mask, u32 val);
 void rtw_coex_write_scbd(struct rtw_dev *rtwdev, u16 bitpos, bool set);
diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index fedea28c7a97..e5e3605bb693 100644
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -256,7 +256,7 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
                 if (conf->assoc) {
                         rtw_coex_connect_notify(rtwdev, COEX_ASSOCIATE_FINISH);
                         net_type = RTW_NET_MGD_LINKED;
-                        chip->ops->do_iqk(rtwdev);
+                        chip->ops->phy_calibration(rtwdev);
 
                         rtwvif->aid = conf->aid;
                         rtw_add_rsvd_page(rtwdev, RSVD_PS_POLL, true);
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index e5a6bc094808..fc8f6213fc8f 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -1236,6 +1236,7 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)
         ieee80211_hw_set(hw, SUPPORTS_PS);
         ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);
         ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);
+        ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);
 
         hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
                                      BIT(NL80211_IFTYPE_AP) |
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 9208b9ce5513..bede3f38516e 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -640,7 +640,9 @@ struct rtw_chip_ops {
                             u8 antenna_rx);
         void (*cfg_ldo25)(struct rtw_dev *rtwdev, bool enable);
         void (*false_alarm_statistics)(struct rtw_dev *rtwdev);
-        void (*do_iqk)(struct rtw_dev *rtwdev);
+        void (*phy_calibration)(struct rtw_dev *rtwdev);
+        void (*dpk_track)(struct rtw_dev *rtwdev);
+        void (*cck_pd_set)(struct rtw_dev *rtwdev, u8 level);
 
         /* for coex */
         void (*coex_set_init)(struct rtw_dev *rtwdev);
@@ -864,6 +866,9 @@ struct rtw_chip_info {
         const struct rtw_rfe_def *rfe_defs;
         u32 rfe_defs_size;
 
+        bool en_dis_dpd;
+        u16 dpd_ratemask;
+
         /* coex paras */
         u32 coex_para_ver;
         u8 bt_desired_ver;
@@ -1075,6 +1080,44 @@ struct rtw_coex {
         struct delayed_work defreeze_work;
 };
 
+#define DPK_RF_REG_NUM 7
+#define DPK_RF_PATH_NUM 2
+#define DPK_BB_REG_NUM 18
+#define DPK_CHANNEL_WIDTH_80 1
+
+DECLARE_EWMA(thermal, 10, 4);
+
+struct rtw_dpk_info {
+        bool is_dpk_pwr_on;
+        bool is_reload;
+
+        DECLARE_BITMAP(dpk_path_ok, DPK_RF_PATH_NUM);
+
+        u8 thermal_dpk[DPK_RF_PATH_NUM];
+        struct ewma_thermal avg_thermal[DPK_RF_PATH_NUM];
+
+        u32 gnt_control;
+        u32 gnt_value;
+
+        u8 result[RTW_RF_PATH_MAX];
+        u8 dpk_txagc[RTW_RF_PATH_MAX];
+        u32 coef[RTW_RF_PATH_MAX][20];
+        u16 dpk_gs[RTW_RF_PATH_MAX];
+        u8 thermal_dpk_delta[RTW_RF_PATH_MAX];
+        u8 pre_pwsf[RTW_RF_PATH_MAX];
+
+        u8 dpk_band;
+        u8 dpk_ch;
+        u8 dpk_bw;
+};
+
+struct rtw_phy_cck_pd_reg {
+        u32 reg_pd;
+        u32 mask_pd;
+        u32 reg_cs;
+        u32 mask_cs;
+};
+
 #define DACK_MSBK_BACKUP_NUM    0xf
 #define DACK_DCK_BACKUP_NUM     0x2
 
@@ -1108,6 +1151,12 @@ struct rtw_dm_info {
         u32 dack_adck[RTW_RF_PATH_MAX];
         u16 dack_msbk[RTW_RF_PATH_MAX][2][DACK_MSBK_BACKUP_NUM];
         u8 dack_dck[RTW_RF_PATH_MAX][2][DACK_DCK_BACKUP_NUM];
+
+        struct rtw_dpk_info dpk_info;
+
+        /* [bandwidth 0:20M/1:40M][number of path] */
+        u8 cck_pd_lv[2][RTW_RF_PATH_MAX];
+        u32 cck_fa_avg;
 };
 
 struct rtw_efuse {
@@ -1344,6 +1393,11 @@ static inline void rtw_flag_set(struct rtw_dev *rtwdev, enum rtw_flags flag)
         set_bit(flag, rtwdev->flags);
 }
 
+static inline bool rtw_is_assoc(struct rtw_dev *rtwdev)
+{
+        return !!rtwdev->sta_cnt;
+}
+
 void rtw_get_channel_params(struct cfg80211_chan_def *chandef,
                             struct rtw_channel_params *ch_param);
 bool check_hw_ready(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 target);
diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c
index 528ee1ee2fd2..d3d3f40de75e 100644
--- a/drivers/net/wireless/realtek/rtw88/phy.c
+++ b/drivers/net/wireless/realtek/rtw88/phy.c
@@ -111,6 +111,19 @@ enum rtw_phy_band_type {
         PHY_BAND_5G     = 1,
 };
 
+static void rtw_phy_cck_pd_init(struct rtw_dev *rtwdev)
+{
+        struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+        u8 i, j;
+
+        for (i = 0; i <= RTW_CHANNEL_WIDTH_40; i++) {
+                for (j = 0; j < RTW_RF_PATH_MAX; j++)
+                        dm_info->cck_pd_lv[i][j] = 0;
+        }
+
+        dm_info->cck_fa_avg = CCK_FA_AVG_RESET;
+}
+
 void rtw_phy_init(struct rtw_dev *rtwdev)
 {
         struct rtw_chip_info *chip = rtwdev->chip;
@@ -129,6 +142,7 @@ void rtw_phy_init(struct rtw_dev *rtwdev)
         addr = chip->dig[0].addr;
         mask = chip->dig[0].mask;
         dm_info->igi_history[0] = rtw_read32_mask(rtwdev, addr, mask);
+        rtw_phy_cck_pd_init(rtwdev);
 }
 
 void rtw_phy_dig_write(struct rtw_dev *rtwdev, u8 igi)
@@ -439,12 +453,100 @@ static void rtw_phy_ra_info_update(struct rtw_dev *rtwdev)
         rtw_iterate_stas_atomic(rtwdev, rtw_phy_ra_info_update_iter, rtwdev);
 }
 
+static void rtw_phy_dpk_track(struct rtw_dev *rtwdev)
+{
+        struct rtw_chip_info *chip = rtwdev->chip;
+
+        if (chip->ops->dpk_track)
+                chip->ops->dpk_track(rtwdev);
+}
+
+#define CCK_PD_LV_MAX           5
+#define CCK_PD_FA_LV1_MIN       1000
+#define CCK_PD_FA_LV0_MAX       500
+
+static u8 rtw_phy_cck_pd_lv_unlink(struct rtw_dev *rtwdev)
+{
+        struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+        u32 cck_fa_avg = dm_info->cck_fa_avg;
+
+        if (cck_fa_avg > CCK_PD_FA_LV1_MIN)
+                return 1;
+
+        if (cck_fa_avg < CCK_PD_FA_LV0_MAX)
+                return 0;
+
+        return CCK_PD_LV_MAX;
+}
+
+#define CCK_PD_IGI_LV4_VAL 0x38
+#define CCK_PD_IGI_LV3_VAL 0x2a
+#define CCK_PD_IGI_LV2_VAL 0x24
+#define CCK_PD_RSSI_LV4_VAL 32
+#define CCK_PD_RSSI_LV3_VAL 32
+#define CCK_PD_RSSI_LV2_VAL 24
+
+static u8 rtw_phy_cck_pd_lv_link(struct rtw_dev *rtwdev)
+{
+        struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+        u8 igi = dm_info->igi_history[0];
+        u8 rssi = dm_info->min_rssi;
+        u32 cck_fa_avg = dm_info->cck_fa_avg;
+
+        if (igi > CCK_PD_IGI_LV4_VAL && rssi > CCK_PD_RSSI_LV4_VAL)
+                return 4;
+        if (igi > CCK_PD_IGI_LV3_VAL && rssi > CCK_PD_RSSI_LV3_VAL)
+                return 3;
+        if (igi > CCK_PD_IGI_LV2_VAL || rssi > CCK_PD_RSSI_LV2_VAL)
+                return 2;
+        if (cck_fa_avg > CCK_PD_FA_LV1_MIN)
+                return 1;
+        if (cck_fa_avg < CCK_PD_FA_LV0_MAX)
+                return 0;
+
+        return CCK_PD_LV_MAX;
+}
+
+static u8 rtw_phy_cck_pd_lv(struct rtw_dev *rtwdev)
+{
+        if (!rtw_is_assoc(rtwdev))
+                return rtw_phy_cck_pd_lv_unlink(rtwdev);
+        else
+                return rtw_phy_cck_pd_lv_link(rtwdev);
+}
+
+static void rtw_phy_cck_pd(struct rtw_dev *rtwdev)
+{
+        struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+        struct rtw_chip_info *chip = rtwdev->chip;
+        u32 cck_fa = dm_info->cck_fa_cnt;
+        u8 level;
+
+        if (rtwdev->hal.current_band_type != RTW_BAND_2G)
+                return;
+
+        if (dm_info->cck_fa_avg == CCK_FA_AVG_RESET)
+                dm_info->cck_fa_avg = cck_fa;
+        else
+                dm_info->cck_fa_avg = (dm_info->cck_fa_avg * 3 + cck_fa) >> 2;
+
+        level = rtw_phy_cck_pd_lv(rtwdev);
+
+        if (level >= CCK_PD_LV_MAX)
+                return;
+
+        if (chip->ops->cck_pd_set)
+                chip->ops->cck_pd_set(rtwdev, level);
+}
+
 void rtw_phy_dynamic_mechanism(struct rtw_dev *rtwdev)
 {
         /* for further calculation */
         rtw_phy_statistics(rtwdev);
         rtw_phy_dig(rtwdev);
+        rtw_phy_cck_pd(rtwdev);
         rtw_phy_ra_info_update(rtwdev);
+        rtw_phy_dpk_track(rtwdev);
 }
 
 #define FRAC_BITS 3
@@ -1316,11 +1418,20 @@ void rtw_phy_cfg_rf(struct rtw_dev *rtwdev, const struct rtw_table *tbl,
 static void rtw_load_rfk_table(struct rtw_dev *rtwdev)
 {
         struct rtw_chip_info *chip = rtwdev->chip;
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
 
         if (!chip->rfk_init_tbl)
                 return;
 
+        rtw_write32_mask(rtwdev, 0x1e24, BIT(17), 0x1);
+        rtw_write32_mask(rtwdev, 0x1cd0, BIT(28), 0x1);
+        rtw_write32_mask(rtwdev, 0x1cd0, BIT(29), 0x1);
+        rtw_write32_mask(rtwdev, 0x1cd0, BIT(30), 0x1);
+        rtw_write32_mask(rtwdev, 0x1cd0, BIT(31), 0x0);
+
         rtw_load_table(rtwdev, chip->rfk_init_tbl);
+
+        dpk_info->is_dpk_pwr_on = 1;
 }
 
 void rtw_phy_load_tables(struct rtw_dev *rtwdev)
@@ -1430,6 +1541,37 @@ static u8 rtw_get_channel_group(u8 channel)
         }
 }
 
+static s8 rtw_phy_get_dis_dpd_by_rate_diff(struct rtw_dev *rtwdev, u16 rate)
+{
+        struct rtw_chip_info *chip = rtwdev->chip;
+        s8 dpd_diff = 0;
+
+        if (!chip->en_dis_dpd)
+                return 0;
+
+#define RTW_DPD_RATE_CHECK(_rate)                                       \
+        case DESC_RATE ## _rate:                                        \
+        if (DIS_DPD_RATE ## _rate & chip->dpd_ratemask)                 \
+                dpd_diff = -6 * chip->txgi_factor;                      \
+        break
+
+        switch (rate) {
+        RTW_DPD_RATE_CHECK(6M);
+        RTW_DPD_RATE_CHECK(9M);
+        RTW_DPD_RATE_CHECK(MCS0);
+        RTW_DPD_RATE_CHECK(MCS1);
+        RTW_DPD_RATE_CHECK(MCS8);
+        RTW_DPD_RATE_CHECK(MCS9);
+        RTW_DPD_RATE_CHECK(VHT1SS_MCS0);
+        RTW_DPD_RATE_CHECK(VHT1SS_MCS1);
+        RTW_DPD_RATE_CHECK(VHT2SS_MCS0);
+        RTW_DPD_RATE_CHECK(VHT2SS_MCS1);
+        }
+#undef RTW_DPD_RATE_CHECK
+
+        return dpd_diff;
+}
+
 static u8 rtw_phy_get_2g_tx_power_index(struct rtw_dev *rtwdev,
                                         struct rtw_2g_txpwr_idx *pwr_idx_2g,
                                         enum rtw_bandwidth bandwidth,
@@ -1638,6 +1780,9 @@ rtw_phy_get_tx_power_index(struct rtw_dev *rtwdev, u8 rf_path, u8 rate,
         tx_power = pwr_param.pwr_base;
         offset = min_t(s8, pwr_param.pwr_offset, pwr_param.pwr_limit);
 
+        if (rtwdev->chip->en_dis_dpd)
+                offset += rtw_phy_get_dis_dpd_by_rate_diff(rtwdev, rate);
+
         tx_power += offset;
 
         if (tx_power > rtwdev->chip->max_power_index)
diff --git a/drivers/net/wireless/realtek/rtw88/phy.h b/drivers/net/wireless/realtek/rtw88/phy.h
index cc87b157f23e..e79b084628e7 100644
--- a/drivers/net/wireless/realtek/rtw88/phy.h
+++ b/drivers/net/wireless/realtek/rtw88/phy.h
@@ -146,4 +146,6 @@ rtw_get_tx_power_params(struct rtw_dev *rtwdev, u8 path,
 #define MASKBYTE3LOWNIBBLE      0x0f000000
 #define MASKL3BYTES             0x00ffffff
 
+#define CCK_FA_AVG_RESET 0xffffffff
+
 #endif
diff --git a/drivers/net/wireless/realtek/rtw88/reg.h b/drivers/net/wireless/realtek/rtw88/reg.h
index 0bd0717baa8b..fe793e270d22 100644
--- a/drivers/net/wireless/realtek/rtw88/reg.h
+++ b/drivers/net/wireless/realtek/rtw88/reg.h
@@ -193,6 +193,8 @@
 #define REG_H2C_READ_ADDR       0x024C
 #define REG_H2C_INFO            0x0254
 
+#define REG_INT_MIG             0x0304
+
 #define REG_FWHW_TXQ_CTRL       0x0420
 #define BIT_EN_BCNQ_DL          BIT(22)
 #define BIT_EN_WR_FREE_TAIL     BIT(20)
@@ -339,6 +341,20 @@
 
 #define REG_RFE_CTRL_E          0x0974
 
+#define REG_DIS_DPD             0x0a70
+#define DIS_DPD_MASK            GENMASK(9, 0)
+#define DIS_DPD_RATE6M          BIT(0)
+#define DIS_DPD_RATE9M          BIT(1)
+#define DIS_DPD_RATEMCS0        BIT(2)
+#define DIS_DPD_RATEMCS1        BIT(3)
+#define DIS_DPD_RATEMCS8        BIT(4)
+#define DIS_DPD_RATEMCS9        BIT(5)
+#define DIS_DPD_RATEVHT1SS_MCS0 BIT(6)
+#define DIS_DPD_RATEVHT1SS_MCS1 BIT(7)
+#define DIS_DPD_RATEVHT2SS_MCS0 BIT(8)
+#define DIS_DPD_RATEVHT2SS_MCS1 BIT(9)
+#define DIS_DPD_RATEALL         GENMASK(9, 0)
+
 #define REG_RFE_CTRL8           0x0cb4
 #define BIT_MASK_RFE_SEL89      GENMASK(7, 0)
 #define REG_RFE_INV8            0x0cbd
@@ -469,6 +485,7 @@
 #define RF_LUTWA        0x33
 #define RF_LUTWD1       0x3e
 #define RF_LUTWD0       0x3f
+#define RF_T_METER      0x42
 #define RF_XTALX2       0xb8
 #define RF_MALSEL       0xbe
 #define RF_RCKD         0xde
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index 568033afb024..63abda3b0ebf 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -766,6 +766,7 @@ static void query_phy_status_page0(struct rtw_dev *rtwdev, u8 *phy_status,
         s8 min_rx_power = -120;
         u8 pwdb = GET_PHY_STAT_P0_PWDB(phy_status);
 
+        /* 8822B uses only 1 antenna to RX CCK rates */
         pkt_stat->rx_power[RF_PATH_A] = pwdb - 110;
         pkt_stat->rssi = rtw_phy_rf_power_2_rssi(pkt_stat->rx_power, 1);
         pkt_stat->bw = RTW_CHANNEL_WIDTH_20;
@@ -1001,6 +1002,11 @@ static void rtw8822b_do_iqk(struct rtw_dev *rtwdev)
                 counter, reload, ++do_iqk_cnt, iqk_fail_mask);
 }
 
+static void rtw8822b_phy_calibration(struct rtw_dev *rtwdev)
+{
+        rtw8822b_do_iqk(rtwdev);
+}
+
 static void rtw8822b_coex_cfg_init(struct rtw_dev *rtwdev)
 {
         /* enable TBTT nterrupt */
@@ -1794,7 +1800,7 @@ static struct rtw_chip_ops rtw8822b_ops = {
         .set_antenna            = rtw8822b_set_antenna,
         .cfg_ldo25              = rtw8822b_cfg_ldo25,
         .false_alarm_statistics = rtw8822b_false_alarm_statistics,
-        .do_iqk                 = rtw8822b_do_iqk,
+        .phy_calibration        = rtw8822b_phy_calibration,
 
         .coex_set_init          = rtw8822b_coex_cfg_init,
         .coex_set_ant_switch    = rtw8822b_coex_cfg_ant_switch,
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 207f64cc3e55..c2f6cd76a658 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -13,6 +13,7 @@
 #include "mac.h"
 #include "reg.h"
 #include "debug.h"
+#include "util.h"
 
 static void rtw8822c_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path,
                                      u8 rx_path, bool is_tx2_path);
@@ -1017,6 +1018,9 @@ static void rtw8822c_phy_set_param(struct rtw_dev *rtwdev)
                        BIT_RF_EN | BIT_RF_RSTB | BIT_RF_SDM_RSTB);
         rtw_write32_set(rtwdev, REG_WLRF1, BIT_WLRF1_BBRF_EN);
 
+        /* disable low rate DPD */
+        rtw_write32_mask(rtwdev, REG_DIS_DPD, DIS_DPD_MASK, DIS_DPD_RATEALL);
+
         /* pre init before header files config */
         rtw8822c_header_file_init(rtwdev, true);
 
@@ -1114,6 +1118,7 @@ static void rtw8822c_phy_set_param(struct rtw_dev *rtwdev)
 #define WLAN_MAC_OPT_NORM_FUNC1         0x98
 #define WLAN_MAC_OPT_LB_FUNC1           0x80
 #define WLAN_MAC_OPT_FUNC2              0x30810041
+#define WLAN_MAC_INT_MIG_CFG            0x33330000
 
 #define WLAN_SIFS_CFG   (WLAN_SIFS_CCK_CONT_TX | \
                         (WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \
@@ -1251,6 +1256,9 @@ static int rtw8822c_mac_init(struct rtw_dev *rtwdev)
         value16 = BIT_SET_RXPSF_ERRTHR(value16, 0x07);
         rtw_write16(rtwdev, REG_RXPSF_CTRL, value16);
 
+        /* Interrupt migration configuration */
+        rtw_write32(rtwdev, REG_INT_MIG, WLAN_MAC_INT_MIG_CFG);
+
         return 0;
 }
 
@@ -1620,16 +1628,16 @@ static void query_phy_status_page0(struct rtw_dev *rtwdev, u8 *phy_status,
         else if (gain_a > u_bnd)
                 rx_power[RF_PATH_A] -= (gain_a - u_bnd) << 1;
         if (gain_b < l_bnd)
-                rx_power[RF_PATH_A] += (l_bnd - gain_b) << 1;
+                rx_power[RF_PATH_B] += (l_bnd - gain_b) << 1;
         else if (gain_b > u_bnd)
-                rx_power[RF_PATH_A] -= (gain_b - u_bnd) << 1;
+                rx_power[RF_PATH_B] -= (gain_b - u_bnd) << 1;
 
         rx_power[RF_PATH_A] -= 110;
         rx_power[RF_PATH_B] -= 110;
 
-        pkt_stat->rx_power[RF_PATH_A] = max3(rx_power[RF_PATH_A],
-                                             rx_power[RF_PATH_B],
-                                             min_rx_power);
+        pkt_stat->rx_power[RF_PATH_A] = rx_power[RF_PATH_A];
+        pkt_stat->rx_power[RF_PATH_B] = rx_power[RF_PATH_B];
+
         pkt_stat->rssi = rtw_phy_rf_power_2_rssi(pkt_stat->rx_power, 1);
         pkt_stat->bw = RTW_CHANNEL_WIDTH_20;
         pkt_stat->signal_power = max(pkt_stat->rx_power[RF_PATH_A],
@@ -1872,6 +1880,22 @@ static void rtw8822c_false_alarm_statistics(struct rtw_dev *rtwdev)
 
 static void rtw8822c_do_iqk(struct rtw_dev *rtwdev)
 {
+        struct rtw_iqk_para para = {0};
+        u8 iqk_chk;
+        int counter;
+
+        para.clear = 1;
+        rtw_fw_do_iqk(rtwdev, &para);
+
+        for (counter = 0; counter < 300; counter++) {
+                iqk_chk = rtw_read8(rtwdev, REG_RPT_CIP);
+                if (iqk_chk == 0xaa)
+                        break;
+                msleep(20);
+        }
+        rtw_write8(rtwdev, REG_IQKSTAT, 0x0);
+
+        rtw_dbg(rtwdev, RTW_DBG_RFK, "iqk counter=%d\n", counter);
 }
 
 /* for coex */
@@ -2029,6 +2053,1144 @@ static void rtw8822c_coex_cfg_wl_rx_gain(struct rtw_dev *rtwdev, bool low_gain)
         }
 }
 
+struct dpk_cfg_pair {
+        u32 addr;
+        u32 bitmask;
+        u32 data;
+};
+
+void rtw8822c_parse_tbl_dpk(struct rtw_dev *rtwdev,
+                            const struct rtw_table *tbl)
+{
+        const struct dpk_cfg_pair *p = tbl->data;
+        const struct dpk_cfg_pair *end = p + tbl->size / 3;
+
+        BUILD_BUG_ON(sizeof(struct dpk_cfg_pair) != sizeof(u32) * 3);
+
+        for (; p < end; p++)
+                rtw_write32_mask(rtwdev, p->addr, p->bitmask, p->data);
+}
+
+static void rtw8822c_dpk_set_gnt_wl(struct rtw_dev *rtwdev, bool is_before_k)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+
+        if (is_before_k) {
+                dpk_info->gnt_control = rtw_read32(rtwdev, 0x70);
+                dpk_info->gnt_value = rtw_coex_read_indirect_reg(rtwdev, 0x38);
+                rtw_write32_mask(rtwdev, 0x70, BIT(26), 0x1);
+                rtw_coex_write_indirect_reg(rtwdev, 0x38, MASKBYTE1, 0x77);
+        } else {
+                rtw_coex_write_indirect_reg(rtwdev, 0x38, MASKDWORD,
+                                            dpk_info->gnt_value);
+                rtw_write32(rtwdev, 0x70, dpk_info->gnt_control);
+        }
+}
+
+static void
+rtw8822c_dpk_restore_registers(struct rtw_dev *rtwdev, u32 reg_num,
+                               struct rtw_backup_info *bckp)
+{
+        rtw_restore_reg(rtwdev, bckp, reg_num);
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0xc);
+        rtw_write32_mask(rtwdev, REG_RXSRAM_CTL, BIT_DPD_CLK, 0x4);
+}
+
+static void
+rtw8822c_dpk_backup_registers(struct rtw_dev *rtwdev, u32 *reg,
+                              u32 reg_num, struct rtw_backup_info *bckp)
+{
+        u32 i;
+
+        for (i = 0; i < reg_num; i++) {
+                bckp[i].len = 4;
+                bckp[i].reg = reg[i];
+                bckp[i].val = rtw_read32(rtwdev, reg[i]);
+        }
+}
+
+static void rtw8822c_dpk_backup_rf_registers(struct rtw_dev *rtwdev,
+                                             u32 *rf_reg,
+                                             u32 rf_reg_bak[][2])
+{
+        u32 i;
+
+        for (i = 0; i < DPK_RF_REG_NUM; i++) {
+                rf_reg_bak[i][RF_PATH_A] = rtw_read_rf(rtwdev, RF_PATH_A,
+                                                       rf_reg[i], RFREG_MASK);
+                rf_reg_bak[i][RF_PATH_B] = rtw_read_rf(rtwdev, RF_PATH_B,
+                                                       rf_reg[i], RFREG_MASK);
+        }
+}
+
+static void rtw8822c_dpk_reload_rf_registers(struct rtw_dev *rtwdev,
+                                             u32 *rf_reg,
+                                             u32 rf_reg_bak[][2])
+{
+        u32 i;
+
+        for (i = 0; i < DPK_RF_REG_NUM; i++) {
+                rtw_write_rf(rtwdev, RF_PATH_A, rf_reg[i], RFREG_MASK,
+                             rf_reg_bak[i][RF_PATH_A]);
+                rtw_write_rf(rtwdev, RF_PATH_B, rf_reg[i], RFREG_MASK,
+                             rf_reg_bak[i][RF_PATH_B]);
+        }
+}
+
+static void rtw8822c_dpk_information(struct rtw_dev *rtwdev)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u32  reg;
+        u8 band_shift;
+
+        reg = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK);
+
+        band_shift = FIELD_GET(BIT(16), reg);
+        dpk_info->dpk_band = 1 << band_shift;
+        dpk_info->dpk_ch = FIELD_GET(0xff, reg);
+        dpk_info->dpk_bw = FIELD_GET(0x3000, reg);
+}
+
+static void rtw8822c_dpk_rxbb_dc_cal(struct rtw_dev *rtwdev, u8 path)
+{
+        rtw_write_rf(rtwdev, path, 0x92, RFREG_MASK, 0x84800);
+        udelay(5);
+        rtw_write_rf(rtwdev, path, 0x92, RFREG_MASK, 0x84801);
+        usleep_range(600, 610);
+        rtw_write_rf(rtwdev, path, 0x92, RFREG_MASK, 0x84800);
+}
+
+static u8 rtw8822c_dpk_dc_corr_check(struct rtw_dev *rtwdev, u8 path)
+{
+        u16 dc_i, dc_q;
+        u8 corr_val, corr_idx;
+
+        rtw_write32(rtwdev, REG_RXSRAM_CTL, 0x000900f0);
+        dc_i = (u16)rtw_read32_mask(rtwdev, REG_STAT_RPT, GENMASK(27, 16));
+        dc_q = (u16)rtw_read32_mask(rtwdev, REG_STAT_RPT, GENMASK(11, 0));
+
+        if (dc_i & BIT(11))
+                dc_i = 0x1000 - dc_i;
+        if (dc_q & BIT(11))
+                dc_q = 0x1000 - dc_q;
+
+        rtw_write32(rtwdev, REG_RXSRAM_CTL, 0x000000f0);
+        corr_idx = (u8)rtw_read32_mask(rtwdev, REG_STAT_RPT, GENMASK(7, 0));
+        corr_val = (u8)rtw_read32_mask(rtwdev, REG_STAT_RPT, GENMASK(15, 8));
+
+        if (dc_i > 200 || dc_q > 200 || corr_idx < 40 || corr_idx > 65)
+                return 1;
+        else
+                return 0;
+
+}
+
+static void rtw8822c_dpk_tx_pause(struct rtw_dev *rtwdev)
+{
+        u8 reg_a, reg_b;
+        u16 count = 0;
+
+        rtw_write8(rtwdev, 0x522, 0xff);
+        rtw_write32_mask(rtwdev, 0x1e70, 0xf, 0x2);
+
+        do {
+                reg_a = (u8)rtw_read_rf(rtwdev, RF_PATH_A, 0x00, 0xf0000);
+                reg_b = (u8)rtw_read_rf(rtwdev, RF_PATH_B, 0x00, 0xf0000);
+                udelay(2);
+                count++;
+        } while ((reg_a == 2 || reg_b == 2) && count < 2500);
+}
+
+static void rtw8822c_dpk_mac_bb_setting(struct rtw_dev *rtwdev)
+{
+        rtw8822c_dpk_tx_pause(rtwdev);
+        rtw_load_table(rtwdev, &rtw8822c_dpk_mac_bb_tbl);
+}
+
+static void rtw8822c_dpk_afe_setting(struct rtw_dev *rtwdev, bool is_do_dpk)
+{
+        if (is_do_dpk)
+                rtw_load_table(rtwdev, &rtw8822c_dpk_afe_is_dpk_tbl);
+        else
+                rtw_load_table(rtwdev, &rtw8822c_dpk_afe_no_dpk_tbl);
+}
+
+static void rtw8822c_dpk_pre_setting(struct rtw_dev *rtwdev)
+{
+        u8 path;
+
+        for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
+                rtw_write_rf(rtwdev, path, RF_RXAGC_OFFSET, RFREG_MASK, 0x0);
+                rtw_write32(rtwdev, REG_NCTL0, 0x8 | (path << 1));
+                if (rtwdev->dm_info.dpk_info.dpk_band == RTW_BAND_2G)
+                        rtw_write32(rtwdev, REG_DPD_LUT3, 0x1f100000);
+                else
+                        rtw_write32(rtwdev, REG_DPD_LUT3, 0x1f0d0000);
+                rtw_write32_mask(rtwdev, REG_DPD_LUT0, BIT_GLOSS_DB, 0x4);
+                rtw_write32_mask(rtwdev, REG_IQK_CTL1, BIT_TX_CFIR, 0x3);
+        }
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0xc);
+        rtw_write32(rtwdev, REG_DPD_CTL11, 0x3b23170b);
+        rtw_write32(rtwdev, REG_DPD_CTL12, 0x775f5347);
+}
+
+static u32 rtw8822c_dpk_rf_setting(struct rtw_dev *rtwdev, u8 path)
+{
+        u32 ori_txbb;
+
+        rtw_write_rf(rtwdev, path, RF_MODE_TRXAGC, RFREG_MASK, 0x50017);
+        ori_txbb = rtw_read_rf(rtwdev, path, RF_TX_GAIN, RFREG_MASK);
+
+        rtw_write_rf(rtwdev, path, RF_DEBUG, BIT_DE_TX_GAIN, 0x1);
+        rtw_write_rf(rtwdev, path, RF_DEBUG, BIT_DE_PWR_TRIM, 0x1);
+        rtw_write_rf(rtwdev, path, RF_TX_GAIN_OFFSET, BIT_TX_OFFSET_VAL, 0x0);
+        rtw_write_rf(rtwdev, path, RF_TX_GAIN, RFREG_MASK, ori_txbb);
+
+        if (rtwdev->dm_info.dpk_info.dpk_band == RTW_BAND_2G) {
+                rtw_write_rf(rtwdev, path, RF_TX_GAIN_OFFSET, BIT_LB_ATT, 0x1);
+                rtw_write_rf(rtwdev, path, RF_RXG_GAIN, BIT_RXG_GAIN, 0x0);
+        } else {
+                rtw_write_rf(rtwdev, path, RF_TXA_LB_SW, BIT_TXA_LB_ATT, 0x0);
+                rtw_write_rf(rtwdev, path, RF_TXA_LB_SW, BIT_LB_ATT, 0x6);
+                rtw_write_rf(rtwdev, path, RF_TXA_LB_SW, BIT_LB_SW, 0x1);
+                rtw_write_rf(rtwdev, path, RF_RXA_MIX_GAIN, BIT_RXA_MIX_GAIN, 0);
+        }
+
+        rtw_write_rf(rtwdev, path, RF_MODE_TRXAGC, BIT_RXAGC, 0xf);
+        rtw_write_rf(rtwdev, path, RF_DEBUG, BIT_DE_TRXBW, 0x1);
+        rtw_write_rf(rtwdev, path, RF_BW_TRXBB, BIT_BW_RXBB, 0x0);
+
+        if (rtwdev->dm_info.dpk_info.dpk_bw == DPK_CHANNEL_WIDTH_80)
+                rtw_write_rf(rtwdev, path, RF_BW_TRXBB, BIT_BW_TXBB, 0x2);
+        else
+                rtw_write_rf(rtwdev, path, RF_BW_TRXBB, BIT_BW_TXBB, 0x1);
+
+        rtw_write_rf(rtwdev, path, RF_EXT_TIA_BW, BIT(1), 0x1);
+
+        usleep_range(100, 110);
+
+        return ori_txbb & 0x1f;
+}
+
+static u16 rtw8822c_dpk_get_cmd(struct rtw_dev *rtwdev, u8 action, u8 path)
+{
+        u16 cmd;
+        u8 bw = rtwdev->dm_info.dpk_info.dpk_bw == DPK_CHANNEL_WIDTH_80 ? 2 : 0;
+
+        switch (action) {
+        case RTW_DPK_GAIN_LOSS:
+                cmd = 0x14 + path;
+                break;
+        case RTW_DPK_DO_DPK:
+                cmd = 0x16 + path + bw;
+                break;
+        case RTW_DPK_DPK_ON:
+                cmd = 0x1a + path;
+                break;
+        case RTW_DPK_DAGC:
+                cmd = 0x1c + path + bw;
+                break;
+        default:
+                return 0;
+        }
+
+        return (cmd << 8) | 0x48;
+}
+
+static u8 rtw8822c_dpk_one_shot(struct rtw_dev *rtwdev, u8 path, u8 action)
+{
+        u16 dpk_cmd;
+        u8 result = 0;
+
+        rtw8822c_dpk_set_gnt_wl(rtwdev, true);
+
+        if (action == RTW_DPK_CAL_PWR) {
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0, BIT(12), 0x1);
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0, BIT(12), 0x0);
+                rtw_write32_mask(rtwdev, REG_RXSRAM_CTL, BIT_RPT_SEL, 0x0);
+                msleep(10);
+                if (!check_hw_ready(rtwdev, REG_STAT_RPT, BIT(31), 0x1)) {
+                        result = 1;
+                        rtw_dbg(rtwdev, RTW_DBG_RFK, "[DPK] one-shot over 20ms\n");
+                }
+        } else {
+                rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE,
+                                 0x8 | (path << 1));
+                rtw_write32_mask(rtwdev, REG_R_CONFIG, BIT_IQ_SWITCH, 0x9);
+
+                dpk_cmd = rtw8822c_dpk_get_cmd(rtwdev, action, path);
+                rtw_write32(rtwdev, REG_NCTL0, dpk_cmd);
+                rtw_write32(rtwdev, REG_NCTL0, dpk_cmd + 1);
+                msleep(10);
+                if (!check_hw_ready(rtwdev, 0x2d9c, 0xff, 0x55)) {
+                        result = 1;
+                        rtw_dbg(rtwdev, RTW_DBG_RFK, "[DPK] one-shot over 20ms\n");
+                }
+                rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE,
+                                 0x8 | (path << 1));
+                rtw_write32_mask(rtwdev, REG_R_CONFIG, BIT_IQ_SWITCH, 0x0);
+        }
+
+        rtw8822c_dpk_set_gnt_wl(rtwdev, false);
+
+        rtw_write8(rtwdev, 0x1b10, 0x0);
+
+        return result;
+}
+
+static u16 rtw8822c_dpk_dgain_read(struct rtw_dev *rtwdev, u8 path)
+{
+        u16 dgain;
+
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0xc);
+        rtw_write32_mask(rtwdev, REG_RXSRAM_CTL, 0x00ff0000, 0x0);
+
+        dgain = (u16)rtw_read32_mask(rtwdev, REG_STAT_RPT, GENMASK(27, 16));
+
+        return dgain;
+}
+
+static u8 rtw8822c_dpk_thermal_read(struct rtw_dev *rtwdev, u8 path)
+{
+        rtw_write_rf(rtwdev, path, RF_T_METER, BIT(19), 0x1);
+        rtw_write_rf(rtwdev, path, RF_T_METER, BIT(19), 0x0);
+        rtw_write_rf(rtwdev, path, RF_T_METER, BIT(19), 0x1);
+        udelay(15);
+
+        return (u8)rtw_read_rf(rtwdev, path, RF_T_METER, 0x0007e);
+}
+
+static u32 rtw8822c_dpk_pas_read(struct rtw_dev *rtwdev, u8 path)
+{
+        u32 i_val, q_val;
+
+        rtw_write32(rtwdev, REG_NCTL0, 0x8 | (path << 1));
+        rtw_write32_mask(rtwdev, 0x1b48, BIT(14), 0x0);
+        rtw_write32(rtwdev, REG_RXSRAM_CTL, 0x00060001);
+        rtw_write32(rtwdev, 0x1b4c, 0x00000000);
+        rtw_write32(rtwdev, 0x1b4c, 0x00080000);
+
+        q_val = rtw_read32_mask(rtwdev, REG_STAT_RPT, MASKHWORD);
+        i_val = rtw_read32_mask(rtwdev, REG_STAT_RPT, MASKLWORD);
+
+        if (i_val & BIT(15))
+                i_val = 0x10000 - i_val;
+        if (q_val & BIT(15))
+                q_val = 0x10000 - q_val;
+
+        rtw_write32(rtwdev, 0x1b4c, 0x00000000);
+
+        return i_val * i_val + q_val * q_val;
+}
+
+static u32 rtw8822c_psd_log2base(u32 val)
+{
+        u32 tmp, val_integerd_b, tindex;
+        u32 result, val_fractiond_b;
+        u32 table_fraction[21] = {0, 432, 332, 274, 232, 200, 174,
+                                  151, 132, 115, 100, 86, 74, 62, 51,
+                                  42, 32, 23, 15, 7, 0};
+
+        if (val == 0)
+                return 0;
+
+        val_integerd_b = __fls(val) + 1;
+
+        tmp = (val * 100) / (1 << val_integerd_b);
+        tindex = tmp / 5;
+
+        if (tindex >= ARRAY_SIZE(table_fraction))
+                tindex = ARRAY_SIZE(table_fraction) - 1;
+
+        val_fractiond_b = table_fraction[tindex];
+
+        result = val_integerd_b * 100 - val_fractiond_b;
+
+        return result;
+}
+
+static u8 rtw8822c_dpk_gainloss_result(struct rtw_dev *rtwdev, u8 path)
+{
+        u8 result;
+
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x8 | (path << 1));
+        rtw_write32_mask(rtwdev, 0x1b48, BIT(14), 0x1);
+        rtw_write32(rtwdev, REG_RXSRAM_CTL, 0x00060000);
+
+        result = (u8)rtw_read32_mask(rtwdev, REG_STAT_RPT, 0x000000f0);
+
+        rtw_write32_mask(rtwdev, 0x1b48, BIT(14), 0x0);
+
+        return result;
+}
+
+static u8 rtw8822c_dpk_agc_gain_chk(struct rtw_dev *rtwdev, u8 path,
+                                    u8 limited_pga)
+{
+        u8 result = 0;
+        u16 dgain;
+
+        rtw8822c_dpk_one_shot(rtwdev, path, RTW_DPK_DAGC);
+        dgain = rtw8822c_dpk_dgain_read(rtwdev, path);
+
+        if (dgain > 1535 && !limited_pga)
+                return RTW_DPK_GAIN_LESS;
+        else if (dgain < 768 && !limited_pga)
+                return RTW_DPK_GAIN_LARGE;
+        else
+                return result;
+}
+
+static u8 rtw8822c_dpk_agc_loss_chk(struct rtw_dev *rtwdev, u8 path)
+{
+        u32 loss, loss_db;
+
+        loss = rtw8822c_dpk_pas_read(rtwdev, path);
+        if (loss < 0x4000000)
+                return RTW_DPK_GL_LESS;
+        loss_db = 3 * rtw8822c_psd_log2base(loss >> 13) - 3870;
+
+        if (loss_db > 1000)
+                return RTW_DPK_GL_LARGE;
+        else if (loss_db < 250)
+                return RTW_DPK_GL_LESS;
+        else
+                return RTW_DPK_AGC_OUT;
+}
+
+struct rtw8822c_dpk_data {
+        u8 txbb;
+        u8 pga;
+        u8 limited_pga;
+        u8 agc_cnt;
+        bool loss_only;
+        bool gain_only;
+        u8 path;
+};
+
+static u8 rtw8822c_gain_check_state(struct rtw_dev *rtwdev,
+                                    struct rtw8822c_dpk_data *data)
+{
+        u8 state;
+
+        data->txbb = (u8)rtw_read_rf(rtwdev, data->path, RF_TX_GAIN,
+                                     BIT_GAIN_TXBB);
+        data->pga = (u8)rtw_read_rf(rtwdev, data->path, RF_MODE_TRXAGC,
+                                    BIT_RXAGC);
+
+        if (data->loss_only) {
+                state = RTW_DPK_LOSS_CHECK;
+                goto check_end;
+        }
+
+        state = rtw8822c_dpk_agc_gain_chk(rtwdev, data->path,
+                                          data->limited_pga);
+        if (state == RTW_DPK_GAIN_CHECK && data->gain_only)
+                state = RTW_DPK_AGC_OUT;
+        else if (state == RTW_DPK_GAIN_CHECK)
+                state = RTW_DPK_LOSS_CHECK;
+
+check_end:
+        data->agc_cnt++;
+        if (data->agc_cnt >= 6)
+                state = RTW_DPK_AGC_OUT;
+
+        return state;
+}
+
+static u8 rtw8822c_gain_large_state(struct rtw_dev *rtwdev,
+                                    struct rtw8822c_dpk_data *data)
+{
+        u8 pga = data->pga;
+
+        if (pga > 0xe)
+                rtw_write_rf(rtwdev, data->path, RF_MODE_TRXAGC, BIT_RXAGC, 0xc);
+        else if (pga > 0xb && pga < 0xf)
+                rtw_write_rf(rtwdev, data->path, RF_MODE_TRXAGC, BIT_RXAGC, 0x0);
+        else if (pga < 0xc)
+                data->limited_pga = 1;
+
+        return RTW_DPK_GAIN_CHECK;
+}
+
+static u8 rtw8822c_gain_less_state(struct rtw_dev *rtwdev,
+                                   struct rtw8822c_dpk_data *data)
+{
+        u8 pga = data->pga;
+
+        if (pga < 0xc)
+                rtw_write_rf(rtwdev, data->path, RF_MODE_TRXAGC, BIT_RXAGC, 0xc);
+        else if (pga > 0xb && pga < 0xf)
+                rtw_write_rf(rtwdev, data->path, RF_MODE_TRXAGC, BIT_RXAGC, 0xf);
+        else if (pga > 0xe)
+                data->limited_pga = 1;
+
+        return RTW_DPK_GAIN_CHECK;
+}
+
+static u8 rtw8822c_gl_state(struct rtw_dev *rtwdev,
+                            struct rtw8822c_dpk_data *data, u8 is_large)
+{
+        u8 txbb_bound[] = {0x1f, 0};
+
+        if (data->txbb == txbb_bound[is_large])
+                return RTW_DPK_AGC_OUT;
+
+        if (is_large == 1)
+                data->txbb -= 2;
+        else
+                data->txbb += 3;
+
+        rtw_write_rf(rtwdev, data->path, RF_TX_GAIN, BIT_GAIN_TXBB, data->txbb);
+        data->limited_pga = 0;
+
+        return RTW_DPK_GAIN_CHECK;
+}
+
+static u8 rtw8822c_gl_large_state(struct rtw_dev *rtwdev,
+                                  struct rtw8822c_dpk_data *data)
+{
+        return rtw8822c_gl_state(rtwdev, data, 1);
+}
+
+static u8 rtw8822c_gl_less_state(struct rtw_dev *rtwdev,
+                                 struct rtw8822c_dpk_data *data)
+{
+        return rtw8822c_gl_state(rtwdev, data, 0);
+}
+
+static u8 rtw8822c_loss_check_state(struct rtw_dev *rtwdev,
+                                    struct rtw8822c_dpk_data *data)
+{
+        u8 path = data->path;
+        u8 state;
+
+        rtw8822c_dpk_one_shot(rtwdev, path, RTW_DPK_GAIN_LOSS);
+        state = rtw8822c_dpk_agc_loss_chk(rtwdev, path);
+
+        return state;
+}
+
+static u8 (*dpk_state[])(struct rtw_dev *rtwdev,
+                          struct rtw8822c_dpk_data *data) = {
+        rtw8822c_gain_check_state, rtw8822c_gain_large_state,
+        rtw8822c_gain_less_state, rtw8822c_gl_large_state,
+        rtw8822c_gl_less_state, rtw8822c_loss_check_state };
+
+static u8 rtw8822c_dpk_pas_agc(struct rtw_dev *rtwdev, u8 path,
+                               bool gain_only, bool loss_only)
+{
+        struct rtw8822c_dpk_data data = {0};
+        u8 (*func)(struct rtw_dev *rtwdev, struct rtw8822c_dpk_data *data);
+        u8 state = RTW_DPK_GAIN_CHECK;
+
+        data.loss_only = loss_only;
+        data.gain_only = gain_only;
+        data.path = path;
+
+        for (;;) {
+                func = dpk_state[state];
+                state = func(rtwdev, &data);
+                if (state == RTW_DPK_AGC_OUT)
+                        break;
+        }
+
+        return data.txbb;
+}
+
+static bool rtw8822c_dpk_coef_iq_check(struct rtw_dev *rtwdev,
+                                       u16 coef_i, u16 coef_q)
+{
+        if (coef_i == 0x1000 || coef_i == 0x0fff ||
+            coef_q == 0x1000 || coef_q == 0x0fff)
+                return 1;
+        else
+                return 0;
+}
+
+static u32 rtw8822c_dpk_coef_transfer(struct rtw_dev *rtwdev)
+{
+        u32 reg = 0;
+        u16 coef_i = 0, coef_q = 0;
+
+        reg = rtw_read32(rtwdev, REG_STAT_RPT);
+
+        coef_i = (u16)rtw_read32_mask(rtwdev, REG_STAT_RPT, MASKHWORD) & 0x1fff;
+        coef_q = (u16)rtw_read32_mask(rtwdev, REG_STAT_RPT, MASKLWORD) & 0x1fff;
+
+        coef_q = ((0x2000 - coef_q) & 0x1fff) - 1;
+
+        reg = (coef_i << 16) | coef_q;
+
+        return reg;
+}
+
+static const u32 rtw8822c_dpk_get_coef_tbl[] = {
+        0x000400f0, 0x040400f0, 0x080400f0, 0x010400f0, 0x050400f0,
+        0x090400f0, 0x020400f0, 0x060400f0, 0x0a0400f0, 0x030400f0,
+        0x070400f0, 0x0b0400f0, 0x0c0400f0, 0x100400f0, 0x0d0400f0,
+        0x110400f0, 0x0e0400f0, 0x120400f0, 0x0f0400f0, 0x130400f0,
+};
+
+static void rtw8822c_dpk_coef_tbl_apply(struct rtw_dev *rtwdev, u8 path)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        int i;
+
+        for (i = 0; i < 20; i++) {
+                rtw_write32(rtwdev, REG_RXSRAM_CTL,
+                            rtw8822c_dpk_get_coef_tbl[i]);
+                dpk_info->coef[path][i] = rtw8822c_dpk_coef_transfer(rtwdev);
+        }
+}
+
+static void rtw8822c_dpk_get_coef(struct rtw_dev *rtwdev, u8 path)
+{
+        rtw_write32(rtwdev, REG_NCTL0, 0x0000000c);
+
+        if (path == RF_PATH_A) {
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0, BIT(24), 0x0);
+                rtw_write32(rtwdev, REG_DPD_CTL0_S0, 0x30000080);
+        } else if (path == RF_PATH_B) {
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0, BIT(24), 0x1);
+                rtw_write32(rtwdev, REG_DPD_CTL0_S1, 0x30000080);
+        }
+
+        rtw8822c_dpk_coef_tbl_apply(rtwdev, path);
+}
+
+static u8 rtw8822c_dpk_coef_read(struct rtw_dev *rtwdev, u8 path)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u8 addr, result = 1;
+        u16 coef_i, coef_q;
+
+        for (addr = 0; addr < 20; addr++) {
+                coef_i = FIELD_GET(0x1fff0000, dpk_info->coef[path][addr]);
+                coef_q = FIELD_GET(0x1fff, dpk_info->coef[path][addr]);
+
+                if (rtw8822c_dpk_coef_iq_check(rtwdev, coef_i, coef_q)) {
+                        result = 0;
+                        break;
+                }
+        }
+        return result;
+}
+
+static void rtw8822c_dpk_coef_write(struct rtw_dev *rtwdev, u8 path, u8 result)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u16 reg[DPK_RF_PATH_NUM] = {0x1b0c, 0x1b64};
+        u32 coef;
+        u8 addr;
+
+        rtw_write32(rtwdev, REG_NCTL0, 0x0000000c);
+        rtw_write32(rtwdev, REG_RXSRAM_CTL, 0x000000f0);
+
+        for (addr = 0; addr < 20; addr++) {
+                if (result == 0) {
+                        if (addr == 3)
+                                coef = 0x04001fff;
+                        else
+                                coef = 0x00001fff;
+                } else {
+                        coef = dpk_info->coef[path][addr];
+                }
+                rtw_write32(rtwdev, reg[path] + addr * 4, coef);
+        }
+}
+
+static void rtw8822c_dpk_fill_result(struct rtw_dev *rtwdev, u32 dpk_txagc,
+                                     u8 path, u8 result)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x8 | (path << 1));
+
+        if (result)
+                rtw_write8(rtwdev, REG_DPD_AGC, (u8)(dpk_txagc - 6));
+        else
+                rtw_write8(rtwdev, REG_DPD_AGC, 0x00);
+
+        dpk_info->result[path] = result;
+        dpk_info->dpk_txagc[path] = rtw_read8(rtwdev, REG_DPD_AGC);
+
+        rtw8822c_dpk_coef_write(rtwdev, path, result);
+}
+
+static u32 rtw8822c_dpk_gainloss(struct rtw_dev *rtwdev, u8 path)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u8 tx_agc, tx_bb, ori_txbb, ori_txagc, tx_agc_search, t1, t2;
+
+        ori_txbb = rtw8822c_dpk_rf_setting(rtwdev, path);
+        ori_txagc = (u8)rtw_read_rf(rtwdev, path, RF_MODE_TRXAGC, BIT_TXAGC);
+
+        rtw8822c_dpk_rxbb_dc_cal(rtwdev, path);
+        rtw8822c_dpk_one_shot(rtwdev, path, RTW_DPK_DAGC);
+        rtw8822c_dpk_dgain_read(rtwdev, path);
+
+        if (rtw8822c_dpk_dc_corr_check(rtwdev, path)) {
+                rtw8822c_dpk_rxbb_dc_cal(rtwdev, path);
+                rtw8822c_dpk_one_shot(rtwdev, path, RTW_DPK_DAGC);
+                rtw8822c_dpk_dc_corr_check(rtwdev, path);
+        }
+
+        t1 = rtw8822c_dpk_thermal_read(rtwdev, path);
+        tx_bb = rtw8822c_dpk_pas_agc(rtwdev, path, false, true);
+        tx_agc_search = rtw8822c_dpk_gainloss_result(rtwdev, path);
+
+        if (tx_bb < tx_agc_search)
+                tx_bb = 0;
+        else
+                tx_bb = tx_bb - tx_agc_search;
+
+        rtw_write_rf(rtwdev, path, RF_TX_GAIN, BIT_GAIN_TXBB, tx_bb);
+
+        tx_agc = ori_txagc - (ori_txbb - tx_bb);
+
+        t2 = rtw8822c_dpk_thermal_read(rtwdev, path);
+
+        dpk_info->thermal_dpk_delta[path] = abs(t2 - t1);
+
+        return tx_agc;
+}
+
+static u8 rtw8822c_dpk_by_path(struct rtw_dev *rtwdev, u32 tx_agc, u8 path)
+{
+        u8 result;
+
+        result = rtw8822c_dpk_one_shot(rtwdev, path, RTW_DPK_DO_DPK);
+
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x8 | (path << 1));
+
+        result = result | (u8)rtw_read32_mask(rtwdev, REG_DPD_CTL1_S0, BIT(26));
+
+        rtw_write_rf(rtwdev, path, RF_MODE_TRXAGC, RFREG_MASK, 0x33e14);
+
+        rtw8822c_dpk_get_coef(rtwdev, path);
+
+        return result;
+}
+
+static void rtw8822c_dpk_cal_gs(struct rtw_dev *rtwdev, u8 path)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u32 tmp_gs = 0;
+
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x8 | (path << 1));
+        rtw_write32_mask(rtwdev, REG_IQK_CTL1, BIT_BYPASS_DPD, 0x0);
+        rtw_write32_mask(rtwdev, REG_IQK_CTL1, BIT_TX_CFIR, 0x0);
+        rtw_write32_mask(rtwdev, REG_R_CONFIG, BIT_IQ_SWITCH, 0x9);
+        rtw_write32_mask(rtwdev, REG_R_CONFIG, BIT_INNER_LB, 0x1);
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0xc);
+        rtw_write32_mask(rtwdev, REG_RXSRAM_CTL, BIT_DPD_CLK, 0xf);
+
+        if (path == RF_PATH_A) {
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S0, BIT_GS_PWSF,
+                                 0x1066680);
+                rtw_write32_mask(rtwdev, REG_DPD_CTL1_S0, BIT_DPD_EN, 0x1);
+        } else {
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S1, BIT_GS_PWSF,
+                                 0x1066680);
+                rtw_write32_mask(rtwdev, REG_DPD_CTL1_S1, BIT_DPD_EN, 0x1);
+        }
+
+        if (dpk_info->dpk_bw == DPK_CHANNEL_WIDTH_80) {
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x80001310);
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x00001310);
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x810000db);
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x010000db);
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x0000b428);
+                rtw_write32(rtwdev, REG_DPD_CTL15,
+                            0x05020000 | (BIT(path) << 28));
+        } else {
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x8200190c);
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x0200190c);
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x8301ee14);
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x0301ee14);
+                rtw_write32(rtwdev, REG_DPD_CTL16, 0x0000b428);
+                rtw_write32(rtwdev, REG_DPD_CTL15,
+                            0x05020008 | (BIT(path) << 28));
+        }
+
+        rtw_write32_mask(rtwdev, REG_DPD_CTL0, MASKBYTE3, 0x8 | path);
+
+        rtw8822c_dpk_one_shot(rtwdev, path, RTW_DPK_CAL_PWR);
+
+        rtw_write32_mask(rtwdev, REG_DPD_CTL15, MASKBYTE3, 0x0);
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x8 | (path << 1));
+        rtw_write32_mask(rtwdev, REG_R_CONFIG, BIT_IQ_SWITCH, 0x0);
+        rtw_write32_mask(rtwdev, REG_R_CONFIG, BIT_INNER_LB, 0x0);
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0xc);
+
+        if (path == RF_PATH_A)
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S0, BIT_GS_PWSF, 0x5b);
+        else
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S1, BIT_GS_PWSF, 0x5b);
+
+        rtw_write32_mask(rtwdev, REG_RXSRAM_CTL, BIT_RPT_SEL, 0x0);
+
+        tmp_gs = (u16)rtw_read32_mask(rtwdev, REG_STAT_RPT, BIT_RPT_DGAIN);
+        tmp_gs = (tmp_gs * 910) >> 10;
+        tmp_gs = DIV_ROUND_CLOSEST(tmp_gs, 10);
+
+        if (path == RF_PATH_A)
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S0, BIT_GS_PWSF, tmp_gs);
+        else
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S1, BIT_GS_PWSF, tmp_gs);
+
+        dpk_info->dpk_gs[path] = tmp_gs;
+}
+
+void rtw8822c_dpk_cal_coef1(struct rtw_dev *rtwdev)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u32 offset[DPK_RF_PATH_NUM] = {0, 0x58};
+        u32 i_scaling;
+        u8 path;
+
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x0000000c);
+        rtw_write32(rtwdev, REG_RXSRAM_CTL, 0x000000f0);
+        rtw_write32(rtwdev, REG_NCTL0, 0x00001148);
+        rtw_write32(rtwdev, REG_NCTL0, 0x00001149);
+
+        check_hw_ready(rtwdev, 0x2d9c, MASKBYTE0, 0x55);
+
+        rtw_write8(rtwdev, 0x1b10, 0x0);
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x0000000c);
+
+        for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
+                i_scaling = 0x16c00 / dpk_info->dpk_gs[path];
+
+                rtw_write32_mask(rtwdev, 0x1b18 + offset[path], MASKHWORD,
+                                 i_scaling);
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S0 + offset[path],
+                                 GENMASK(31, 28), 0x9);
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S0 + offset[path],
+                                 GENMASK(31, 28), 0x1);
+                rtw_write32_mask(rtwdev, REG_DPD_CTL0_S0 + offset[path],
+                                 GENMASK(31, 28), 0x0);
+                rtw_write32_mask(rtwdev, REG_DPD_CTL1_S0 + offset[path],
+                                 BIT(14), 0x0);
+        }
+}
+
+static void rtw8822c_dpk_on(struct rtw_dev *rtwdev, u8 path)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+
+        rtw8822c_dpk_one_shot(rtwdev, path, RTW_DPK_DPK_ON);
+
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x8 | (path << 1));
+        rtw_write32_mask(rtwdev, REG_IQK_CTL1, BIT_TX_CFIR, 0x0);
+
+        if (test_bit(path, dpk_info->dpk_path_ok))
+                rtw8822c_dpk_cal_gs(rtwdev, path);
+}
+
+static bool rtw8822c_dpk_check_pass(struct rtw_dev *rtwdev, bool is_fail,
+                                    u32 dpk_txagc, u8 path)
+{
+        bool result;
+
+        if (!is_fail) {
+                if (rtw8822c_dpk_coef_read(rtwdev, path))
+                        result = true;
+                else
+                        result = false;
+        } else {
+                result = false;
+        }
+
+        rtw8822c_dpk_fill_result(rtwdev, dpk_txagc, path, result);
+
+        return result;
+}
+
+static void rtw8822c_dpk_result_reset(struct rtw_dev *rtwdev)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u8 path;
+
+        for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
+                clear_bit(path, dpk_info->dpk_path_ok);
+                rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE,
+                                 0x8 | (path << 1));
+                rtw_write32_mask(rtwdev, 0x1b58, 0x0000007f, 0x0);
+
+                dpk_info->dpk_txagc[path] = 0;
+                dpk_info->result[path] = 0;
+                dpk_info->dpk_gs[path] = 0x5b;
+                dpk_info->pre_pwsf[path] = 0;
+                dpk_info->thermal_dpk[path] = rtw8822c_dpk_thermal_read(rtwdev,
+                                                                        path);
+        }
+}
+
+static void rtw8822c_dpk_calibrate(struct rtw_dev *rtwdev, u8 path)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u32 dpk_txagc;
+        u8 dpk_fail;
+
+        rtw_dbg(rtwdev, RTW_DBG_RFK, "[DPK] s%d dpk start\n", path);
+
+        dpk_txagc = rtw8822c_dpk_gainloss(rtwdev, path);
+
+        dpk_fail = rtw8822c_dpk_by_path(rtwdev, dpk_txagc, path);
+
+        if (!rtw8822c_dpk_check_pass(rtwdev, dpk_fail, dpk_txagc, path))
+                rtw_err(rtwdev, "failed to do dpk calibration\n");
+
+        rtw_dbg(rtwdev, RTW_DBG_RFK, "[DPK] s%d dpk finish\n", path);
+
+        if (dpk_info->result[path])
+                set_bit(path, dpk_info->dpk_path_ok);
+}
+
+static void rtw8822c_dpk_path_select(struct rtw_dev *rtwdev)
+{
+        rtw8822c_dpk_calibrate(rtwdev, RF_PATH_A);
+        rtw8822c_dpk_calibrate(rtwdev, RF_PATH_B);
+        rtw8822c_dpk_on(rtwdev, RF_PATH_A);
+        rtw8822c_dpk_on(rtwdev, RF_PATH_B);
+        rtw8822c_dpk_cal_coef1(rtwdev);
+}
+
+static void rtw8822c_dpk_enable_disable(struct rtw_dev *rtwdev)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u32 mask = BIT(15) | BIT(14);
+
+        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0xc);
+
+        rtw_write32_mask(rtwdev, REG_DPD_CTL1_S0, BIT_DPD_EN,
+                         dpk_info->is_dpk_pwr_on);
+        rtw_write32_mask(rtwdev, REG_DPD_CTL1_S1, BIT_DPD_EN,
+                         dpk_info->is_dpk_pwr_on);
+
+        if (test_bit(RF_PATH_A, dpk_info->dpk_path_ok)) {
+                rtw_write32_mask(rtwdev, REG_DPD_CTL1_S0, mask, 0x0);
+                rtw_write8(rtwdev, REG_DPD_CTL0_S0, dpk_info->dpk_gs[RF_PATH_A]);
+        }
+        if (test_bit(RF_PATH_B, dpk_info->dpk_path_ok)) {
+                rtw_write32_mask(rtwdev, REG_DPD_CTL1_S1, mask, 0x0);
+                rtw_write8(rtwdev, REG_DPD_CTL0_S1, dpk_info->dpk_gs[RF_PATH_B]);
+        }
+}
+
+static void rtw8822c_dpk_reload_data(struct rtw_dev *rtwdev)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u8 path;
+
+        if (!test_bit(RF_PATH_A, dpk_info->dpk_path_ok) &&
+            !test_bit(RF_PATH_B, dpk_info->dpk_path_ok) &&
+            dpk_info->dpk_ch == 0)
+                return;
+
+        for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
+                rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE,
+                                 0x8 | (path << 1));
+                if (dpk_info->dpk_band == RTW_BAND_2G)
+                        rtw_write32(rtwdev, REG_DPD_LUT3, 0x1f100000);
+                else
+                        rtw_write32(rtwdev, REG_DPD_LUT3, 0x1f0d0000);
+
+                rtw_write8(rtwdev, REG_DPD_AGC, dpk_info->dpk_txagc[path]);
+
+                rtw8822c_dpk_coef_write(rtwdev, path,
+                                        test_bit(path, dpk_info->dpk_path_ok));
+
+                rtw8822c_dpk_one_shot(rtwdev, path, RTW_DPK_DPK_ON);
+
+                rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0xc);
+
+                if (path == RF_PATH_A)
+                        rtw_write32_mask(rtwdev, REG_DPD_CTL0_S0, BIT_GS_PWSF,
+                                         dpk_info->dpk_gs[path]);
+                else
+                        rtw_write32_mask(rtwdev, REG_DPD_CTL0_S1, BIT_GS_PWSF,
+                                         dpk_info->dpk_gs[path]);
+        }
+        rtw8822c_dpk_cal_coef1(rtwdev);
+}
+
+static bool rtw8822c_dpk_reload(struct rtw_dev *rtwdev)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u8 channel;
+
+        dpk_info->is_reload = false;
+
+        channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK) & 0xff);
+
+        if (channel == dpk_info->dpk_ch) {
+                rtw_dbg(rtwdev, RTW_DBG_RFK,
+                        "[DPK] DPK reload for CH%d!!\n", dpk_info->dpk_ch);
+                rtw8822c_dpk_reload_data(rtwdev);
+                dpk_info->is_reload = true;
+        }
+
+        return dpk_info->is_reload;
+}
+
+static void rtw8822c_do_dpk(struct rtw_dev *rtwdev)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        struct rtw_backup_info bckp[DPK_BB_REG_NUM];
+        u32 rf_reg_backup[DPK_RF_REG_NUM][DPK_RF_PATH_NUM];
+        u32 bb_reg[DPK_BB_REG_NUM] = {
+                0x520, 0x820, 0x824, 0x1c3c, 0x1d58, 0x1864,
+                0x4164, 0x180c, 0x410c, 0x186c, 0x416c,
+                0x1a14, 0x1e70, 0x80c, 0x1d70, 0x1e7c, 0x18a4, 0x41a4};
+        u32 rf_reg[DPK_RF_REG_NUM] = {
+                0x0, 0x1a, 0x55, 0x63, 0x87, 0x8f, 0xde};
+        u8 path;
+
+        if (!dpk_info->is_dpk_pwr_on) {
+                rtw_dbg(rtwdev, RTW_DBG_RFK, "[DPK] Skip DPK due to DPD PWR off\n");
+                return;
+        } else if (rtw8822c_dpk_reload(rtwdev)) {
+                return;
+        }
+
+        for (path = RF_PATH_A; path < DPK_RF_PATH_NUM; path++)
+                ewma_thermal_init(&dpk_info->avg_thermal[path]);
+
+        rtw8822c_dpk_information(rtwdev);
+
+        rtw8822c_dpk_backup_registers(rtwdev, bb_reg, DPK_BB_REG_NUM, bckp);
+        rtw8822c_dpk_backup_rf_registers(rtwdev, rf_reg, rf_reg_backup);
+
+        rtw8822c_dpk_mac_bb_setting(rtwdev);
+        rtw8822c_dpk_afe_setting(rtwdev, true);
+        rtw8822c_dpk_pre_setting(rtwdev);
+        rtw8822c_dpk_result_reset(rtwdev);
+        rtw8822c_dpk_path_select(rtwdev);
+        rtw8822c_dpk_afe_setting(rtwdev, false);
+        rtw8822c_dpk_enable_disable(rtwdev);
+
+        rtw8822c_dpk_reload_rf_registers(rtwdev, rf_reg, rf_reg_backup);
+        for (path = 0; path < rtwdev->hal.rf_path_num; path++)
+                rtw8822c_dpk_rxbb_dc_cal(rtwdev, path);
+        rtw8822c_dpk_restore_registers(rtwdev, DPK_BB_REG_NUM, bckp);
+}
+
+static void rtw8822c_phy_calibration(struct rtw_dev *rtwdev)
+{
+        rtw8822c_do_iqk(rtwdev);
+        rtw8822c_do_dpk(rtwdev);
+}
+
+void rtw8822c_dpk_track(struct rtw_dev *rtwdev)
+{
+        struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
+        u8 path;
+        u8 thermal_value[DPK_RF_PATH_NUM] = {0};
+        s8 offset[DPK_RF_PATH_NUM], delta_dpk[DPK_RF_PATH_NUM];
+
+        if (dpk_info->thermal_dpk[0] == 0 && dpk_info->thermal_dpk[1] == 0)
+                return;
+
+        for (path = 0; path < DPK_RF_PATH_NUM; path++) {
+                thermal_value[path] = rtw8822c_dpk_thermal_read(rtwdev, path);
+                ewma_thermal_add(&dpk_info->avg_thermal[path],
+                                 thermal_value[path]);
+                thermal_value[path] =
+                        ewma_thermal_read(&dpk_info->avg_thermal[path]);
+                delta_dpk[path] = dpk_info->thermal_dpk[path] -
+                                  thermal_value[path];
+                offset[path] = delta_dpk[path] -
+                               dpk_info->thermal_dpk_delta[path];
+                offset[path] &= 0x7f;
+
+                if (offset[path] != dpk_info->pre_pwsf[path]) {
+                        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE,
+                                         0x8 | (path << 1));
+                        rtw_write32_mask(rtwdev, 0x1b58, GENMASK(6, 0),
+                                         offset[path]);
+                        dpk_info->pre_pwsf[path] = offset[path];
+                }
+        }
+}
+
+static const struct rtw_phy_cck_pd_reg
+rtw8822c_cck_pd_reg[RTW_CHANNEL_WIDTH_40 + 1][RTW_RF_PATH_MAX] = {
+        {
+                {0x1ac8, 0x00ff, 0x1ad0, 0x01f},
+                {0x1ac8, 0xff00, 0x1ad0, 0x3e0}
+        },
+        {
+                {0x1acc, 0x00ff, 0x1ad0, 0x01F00000},
+                {0x1acc, 0xff00, 0x1ad0, 0x3E000000}
+        },
+};
+
+#define RTW_CCK_PD_MAX 255
+#define RTW_CCK_CS_MAX 31
+#define RTW_CCK_CS_ERR1 27
+#define RTW_CCK_CS_ERR2 29
+static void
+rtw8822c_phy_cck_pd_set_reg(struct rtw_dev *rtwdev,
+                            s8 pd_diff, s8 cs_diff, u8 bw, u8 nrx)
+{
+        u32 pd, cs;
+
+        if (WARN_ON(bw > RTW_CHANNEL_WIDTH_40 || nrx >= RTW_RF_PATH_MAX))
+                return;
+
+        pd = rtw_read32_mask(rtwdev,
+                             rtw8822c_cck_pd_reg[bw][nrx].reg_pd,
+                             rtw8822c_cck_pd_reg[bw][nrx].mask_pd);
+        cs = rtw_read32_mask(rtwdev,
+                             rtw8822c_cck_pd_reg[bw][nrx].reg_cs,
+                             rtw8822c_cck_pd_reg[bw][nrx].mask_cs);
+        pd += pd_diff;
+        cs += cs_diff;
+        if (pd > RTW_CCK_PD_MAX)
+                pd = RTW_CCK_PD_MAX;
+        if (cs == RTW_CCK_CS_ERR1 || cs == RTW_CCK_CS_ERR2)
+                cs++;
+        else if (cs > RTW_CCK_CS_MAX)
+                cs = RTW_CCK_CS_MAX;
+        rtw_write32_mask(rtwdev,
+                         rtw8822c_cck_pd_reg[bw][nrx].reg_pd,
+                         rtw8822c_cck_pd_reg[bw][nrx].mask_pd,
+                         pd);
+        rtw_write32_mask(rtwdev,
+                         rtw8822c_cck_pd_reg[bw][nrx].reg_cs,
+                         rtw8822c_cck_pd_reg[bw][nrx].mask_cs,
+                         cs);
+}
+
+static void rtw8822c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl)
+{
+        struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+        s8 pd_lvl[4] = {2, 4, 6, 8};
+        s8 cs_lvl[4] = {2, 2, 2, 4};
+        u8 cur_lvl;
+        u8 nrx, bw;
+
+        nrx = (u8)rtw_read32_mask(rtwdev, 0x1a2c, 0x60000);
+        bw = (u8)rtw_read32_mask(rtwdev, 0x9b0, 0xc);
+
+        if (dm_info->cck_pd_lv[bw][nrx] == new_lvl)
+                return;
+
+        cur_lvl = dm_info->cck_pd_lv[bw][nrx];
+
+        /* update cck pd info */
+        dm_info->cck_fa_avg = CCK_FA_AVG_RESET;
+
+        rtw8822c_phy_cck_pd_set_reg(rtwdev,
+                                    pd_lvl[new_lvl] - pd_lvl[cur_lvl],
+                                    cs_lvl[new_lvl] - cs_lvl[cur_lvl],
+                                    bw, nrx);
+        dm_info->cck_pd_lv[bw][nrx] = new_lvl;
+}
+
 static struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822c[] = {
         {0x0086,
          RTW_PWR_CUT_ALL_MSK,
@@ -2275,6 +3437,16 @@ static struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8822c[] = {
          RTW_PWR_INTF_ALL_MSK,
          RTW_PWR_ADDR_MAC,
          RTW_PWR_CMD_WRITE, BIT(1), 0},
+        {0x0092,
+         RTW_PWR_CUT_ALL_MSK,
+         RTW_PWR_INTF_PCI_MSK,
+         RTW_PWR_ADDR_MAC,
+         RTW_PWR_CMD_WRITE, 0xFF, 0x20},
+        {0x0093,
+         RTW_PWR_CUT_ALL_MSK,
+         RTW_PWR_INTF_PCI_MSK,
+         RTW_PWR_ADDR_MAC,
+         RTW_PWR_CMD_WRITE, 0xFF, 0x04},
         {0x0005,
          RTW_PWR_CUT_ALL_MSK,
          RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,
@@ -2396,7 +3568,9 @@ static struct rtw_chip_ops rtw8822c_ops = {
         .set_tx_power_index     = rtw8822c_set_tx_power_index,
         .cfg_ldo25              = rtw8822c_cfg_ldo25,
         .false_alarm_statistics = rtw8822c_false_alarm_statistics,
-        .do_iqk                 = rtw8822c_do_iqk,
+        .dpk_track              = rtw8822c_dpk_track,
+        .phy_calibration        = rtw8822c_phy_calibration,
+        .cck_pd_set             = rtw8822c_phy_cck_pd_set,
 
         .coex_set_init          = rtw8822c_coex_cfg_init,
         .coex_set_ant_switch    = NULL,
@@ -2589,6 +3763,8 @@ struct rtw_chip_info rtw8822c_hw_spec = {
         .rf_tbl = {&rtw8822c_rf_a_tbl, &rtw8822c_rf_b_tbl},
         .rfe_defs = rtw8822c_rfe_defs,
         .rfe_defs_size = ARRAY_SIZE(rtw8822c_rfe_defs),
+        .en_dis_dpd = true,
+        .dpd_ratemask = DIS_DPD_RATEALL,
 
         .coex_para_ver = 0x19062706,
         .bt_desired_ver = 0x6,
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
index 5ee1de41504d..438db74d8e7a 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
@@ -96,6 +96,35 @@ struct rtw8822c_efuse {
         };
 };
 
+enum rtw8822c_dpk_agc_phase {
+        RTW_DPK_GAIN_CHECK,
+        RTW_DPK_GAIN_LARGE,
+        RTW_DPK_GAIN_LESS,
+        RTW_DPK_GL_LARGE,
+        RTW_DPK_GL_LESS,
+        RTW_DPK_LOSS_CHECK,
+        RTW_DPK_AGC_OUT,
+};
+
+enum rtw8822c_dpk_one_shot_action {
+        RTW_DPK_CAL_PWR,
+        RTW_DPK_GAIN_LOSS,
+        RTW_DPK_DO_DPK,
+        RTW_DPK_DPK_ON,
+        RTW_DPK_DAGC,
+        RTW_DPK_ACTION_MAX
+};
+
+void rtw8822c_parse_tbl_dpk(struct rtw_dev *rtwdev,
+                            const struct rtw_table *tbl);
+
+#define RTW_DECL_TABLE_DPK(name)                        \
+const struct rtw_table name ## _tbl = {                 \
+        .data = name,                                   \
+        .size = ARRAY_SIZE(name),                       \
+        .parse = rtw8822c_parse_tbl_dpk,                \
+}
+
 #define DACK_PATH_8822C         2
 #define DACK_REG_8822C          16
 #define DACK_RF_8822C           1
@@ -176,6 +205,7 @@ struct rtw8822c_efuse {
 #define REG_TXF7        0x1ab0
 #define REG_CCK_SOURCE  0x1abc
 #define BIT_NBI_EN              BIT(30)
+#define REG_IQKSTAT     0x1b10
 #define REG_TXANT       0x1c28
 #define REG_ENCCK       0x1c3c
 #define BIT_CCK_BLK_EN          BIT(1)
@@ -197,6 +227,7 @@ struct rtw8822c_efuse {
 #define REG_OFDM_FACNT3 0x2d0c
 #define REG_OFDM_FACNT4 0x2d10
 #define REG_OFDM_FACNT5 0x2d20
+#define REG_RPT_CIP     0x2d9c
 #define REG_OFDM_TXCNT  0x2de0
 #define REG_ORITXCODE2  0x4100
 #define REG_3WIRE2      0x410c
@@ -206,4 +237,59 @@ struct rtw8822c_efuse {
 #define REG_DCKB_Q_0    0x41d8
 #define REG_DCKB_Q_1    0x41dc
 
+#define RF_MODE_TRXAGC          0x00
+#define RF_RXAGC_OFFSET         0x19
+#define RF_BW_TRXBB             0x1a
+#define RF_TX_GAIN_OFFSET       0x55
+#define RF_TX_GAIN              0x56
+#define RF_TXA_LB_SW            0x63
+#define RF_RXG_GAIN             0x87
+#define RF_RXA_MIX_GAIN         0x8a
+#define RF_EXT_TIA_BW           0x8f
+#define RF_DEBUG                0xde
+
+#define REG_NCTL0               0x1b00
+#define REG_DPD_CTL0_S0         0x1b04
+#define REG_DPD_CTL1_S0         0x1b08
+#define REG_IQK_CTL1            0x1b20
+#define REG_DPD_LUT0            0x1b44
+#define REG_DPD_CTL0_S1         0x1b5c
+#define REG_DPD_LUT3            0x1b60
+#define REG_DPD_CTL1_S1         0x1b60
+#define REG_DPD_AGC             0x1b67
+#define REG_DPD_CTL0            0x1bb4
+#define REG_R_CONFIG            0x1bcc
+#define REG_RXSRAM_CTL          0x1bd4
+#define REG_DPD_CTL11           0x1be4
+#define REG_DPD_CTL12           0x1be8
+#define REG_DPD_CTL15           0x1bf4
+#define REG_DPD_CTL16           0x1bf8
+#define REG_STAT_RPT            0x1bfc
+
+#define BIT_EXT_TIA_BW          BIT(1)
+#define BIT_DE_TRXBW            BIT(2)
+#define BIT_DE_TX_GAIN          BIT(16)
+#define BIT_RXG_GAIN            BIT(18)
+#define BIT_DE_PWR_TRIM         BIT(19)
+#define BIT_INNER_LB            BIT(21)
+#define BIT_BYPASS_DPD          BIT(25)
+#define BIT_DPD_EN              BIT(31)
+#define BIT_SUBPAGE             GENMASK(3, 0)
+#define BIT_TXAGC               GENMASK(4, 0)
+#define BIT_GAIN_TXBB           GENMASK(4, 0)
+#define BIT_LB_ATT              GENMASK(4, 2)
+#define BIT_RXA_MIX_GAIN        GENMASK(4, 3)
+#define BIT_IQ_SWITCH           GENMASK(5, 0)
+#define BIT_DPD_CLK             GENMASK(7, 4)
+#define BIT_RXAGC               GENMASK(9, 5)
+#define BIT_BW_RXBB             GENMASK(11, 10)
+#define BIT_LB_SW               GENMASK(13, 12)
+#define BIT_BW_TXBB             GENMASK(14, 12)
+#define BIT_GLOSS_DB            GENMASK(14, 12)
+#define BIT_TXA_LB_ATT          GENMASK(15, 14)
+#define BIT_TX_OFFSET_VAL       GENMASK(18, 14)
+#define BIT_RPT_SEL             GENMASK(20, 16)
+#define BIT_GS_PWSF             GENMASK(27, 0)
+#define BIT_RPT_DGAIN           GENMASK(27, 16)
+#define BIT_TX_CFIR             GENMASK(31, 30)
 #endif
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c
index 6c7eaa75b98b..e2dd4c766077 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c
@@ -4,6 +4,7 @@
 
 #include "main.h"
 #include "phy.h"
+#include "rtw8822c.h"
 #include "rtw8822c_table.h"
 
 static const u32 rtw8822c_mac[] = {
@@ -13,69 +14,69 @@ RTW_DECL_TABLE_PHY_COND(rtw8822c_mac, rtw_phy_cfg_mac);
 
 static const u32 rtw8822c_agc[] = {
                 0x1D90, 0x300001FF,
-                0x1D90, 0x300101FF,
-                0x1D90, 0x300201FE,
-                0x1D90, 0x300301FD,
-                0x1D90, 0x300401FC,
-                0x1D90, 0x300501FB,
-                0x1D90, 0x300601FA,
-                0x1D90, 0x300701F9,
-                0x1D90, 0x300801F8,
-                0x1D90, 0x300901F7,
-                0x1D90, 0x300A01F6,
-                0x1D90, 0x300B01F5,
-                0x1D90, 0x300C01F4,
-                0x1D90, 0x300D01F3,
-                0x1D90, 0x300E01F2,
-                0x1D90, 0x300F01F1,
-                0x1D90, 0x301001F0,
-                0x1D90, 0x301101EF,
-                0x1D90, 0x301201EE,
-                0x1D90, 0x301301ED,
-                0x1D90, 0x301401EC,
-                0x1D90, 0x301501EB,
-                0x1D90, 0x30160192,
-                0x1D90, 0x30170191,
-                0x1D90, 0x30180190,
-                0x1D90, 0x3019018F,
-                0x1D90, 0x301A018E,
-                0x1D90, 0x301B018D,
-                0x1D90, 0x301C018C,
-                0x1D90, 0x301D018B,
-                0x1D90, 0x301E018A,
-                0x1D90, 0x301F0189,
-                0x1D90, 0x30200188,
-                0x1D90, 0x30210187,
-                0x1D90, 0x30220186,
-                0x1D90, 0x30230185,
-                0x1D90, 0x3024014B,
-                0x1D90, 0x3025014A,
-                0x1D90, 0x30260149,
-                0x1D90, 0x30270148,
-                0x1D90, 0x30280147,
-                0x1D90, 0x30290146,
-                0x1D90, 0x302A0145,
-                0x1D90, 0x302B0144,
-                0x1D90, 0x302C0143,
-                0x1D90, 0x302D0142,
-                0x1D90, 0x302E00C8,
-                0x1D90, 0x302F00C7,
-                0x1D90, 0x303000C6,
-                0x1D90, 0x303100C5,
-                0x1D90, 0x303200C4,
-                0x1D90, 0x30330088,
-                0x1D90, 0x30340087,
-                0x1D90, 0x30350086,
+                0x1D90, 0x300101FE,
+                0x1D90, 0x300201FD,
+                0x1D90, 0x300301FC,
+                0x1D90, 0x300401FB,
+                0x1D90, 0x300501FA,
+                0x1D90, 0x300601F9,
+                0x1D90, 0x300701F8,
+                0x1D90, 0x300801F7,
+                0x1D90, 0x300901F6,
+                0x1D90, 0x300A01F5,
+                0x1D90, 0x300B01F4,
+                0x1D90, 0x300C01F3,
+                0x1D90, 0x300D01F2,
+                0x1D90, 0x300E01F1,
+                0x1D90, 0x300F01F0,
+                0x1D90, 0x301001EF,
+                0x1D90, 0x301101EE,
+                0x1D90, 0x301201ED,
+                0x1D90, 0x301301EC,
+                0x1D90, 0x301401EB,
+                0x1D90, 0x301501EA,
+                0x1D90, 0x301601E9,
+                0x1D90, 0x301701E8,
+                0x1D90, 0x301801E7,
+                0x1D90, 0x301901E5,
+                0x1D90, 0x301A01E4,
+                0x1D90, 0x301B01C5,
+                0x1D90, 0x301C01C4,
+                0x1D90, 0x301D01C3,
+                0x1D90, 0x301E01C2,
+                0x1D90, 0x301F0188,
+                0x1D90, 0x30200187,
+                0x1D90, 0x30210186,
+                0x1D90, 0x30220184,
+                0x1D90, 0x30230183,
+                0x1D90, 0x30240182,
+                0x1D90, 0x30250181,
+                0x1D90, 0x30260148,
+                0x1D90, 0x30270147,
+                0x1D90, 0x30280146,
+                0x1D90, 0x30290144,
+                0x1D90, 0x302A0143,
+                0x1D90, 0x302B0142,
+                0x1D90, 0x302C0141,
+                0x1D90, 0x302D00C8,
+                0x1D90, 0x302E00C7,
+                0x1D90, 0x302F00C6,
+                0x1D90, 0x303000C5,
+                0x1D90, 0x303100C4,
+                0x1D90, 0x303200C3,
+                0x1D90, 0x30330048,
+                0x1D90, 0x30340047,
+                0x1D90, 0x30350046,
                 0x1D90, 0x30360045,
-                0x1D90, 0x30370044,
-                0x1D90, 0x30380043,
+                0x1D90, 0x30370025,
+                0x1D90, 0x30380024,
                 0x1D90, 0x30390023,
                 0x1D90, 0x303A0022,
                 0x1D90, 0x303B0021,
                 0x1D90, 0x303C0020,
-                0x1D90, 0x303D0002,
-                0x1D90, 0x303E0001,
-                0x1D90, 0x303F0000,
+                0x1D90, 0x303D0003,
+                0x1D90, 0x303E0002,
+                0x1D90, 0x303F0001,
                 0x1D90, 0x304000FF,
                 0x1D90, 0x304100FF,
                 0x1D90, 0x304200FF,
@@ -418,48 +419,48 @@ static const u32 rtw8822c_agc[] = {
                 0x1D90, 0x319301EB,
                 0x1D90, 0x319401EA,
                 0x1D90, 0x319501E9,
-                0x1D90, 0x3196018F,
-                0x1D90, 0x3197018E,
-                0x1D90, 0x3198018D,
-                0x1D90, 0x3199018C,
-                0x1D90, 0x319A018B,
-                0x1D90, 0x319B018A,
-                0x1D90, 0x319C0189,
-                0x1D90, 0x319D0188,
-                0x1D90, 0x319E0187,
-                0x1D90, 0x319F0186,
-                0x1D90, 0x31A00185,
-                0x1D90, 0x31A10184,
-                0x1D90, 0x31A20183,
-                0x1D90, 0x31A30182,
-                0x1D90, 0x31A40149,
-                0x1D90, 0x31A50148,
-                0x1D90, 0x31A60147,
-                0x1D90, 0x31A70146,
-                0x1D90, 0x31A80145,
-                0x1D90, 0x31A90144,
-                0x1D90, 0x31AA0143,
-                0x1D90, 0x31AB0142,
-                0x1D90, 0x31AC0141,
-                0x1D90, 0x31AD0140,
-                0x1D90, 0x31AE00C7,
-                0x1D90, 0x31AF00C6,
-                0x1D90, 0x31B000C5,
-                0x1D90, 0x31B100C4,
-                0x1D90, 0x31B200C3,
-                0x1D90, 0x31B30088,
-                0x1D90, 0x31B40087,
-                0x1D90, 0x31B50086,
-                0x1D90, 0x31B60045,
-                0x1D90, 0x31B70044,
-                0x1D90, 0x31B80043,
+                0x1D90, 0x319601E7,
+                0x1D90, 0x319701E6,
+                0x1D90, 0x319801E5,
+                0x1D90, 0x319901E4,
+                0x1D90, 0x319A01A8,
+                0x1D90, 0x319B01A7,
+                0x1D90, 0x319C01A6,
+                0x1D90, 0x319D01A5,
+                0x1D90, 0x319E0185,
+                0x1D90, 0x319F0184,
+                0x1D90, 0x31A00183,
+                0x1D90, 0x31A10182,
+                0x1D90, 0x31A20149,
+                0x1D90, 0x31A30148,
+                0x1D90, 0x31A40147,
+                0x1D90, 0x31A50145,
+                0x1D90, 0x31A60144,
+                0x1D90, 0x31A70143,
+                0x1D90, 0x31A80142,
+                0x1D90, 0x31A900E6,
+                0x1D90, 0x31AA00E5,
+                0x1D90, 0x31AB00C9,
+                0x1D90, 0x31AC00C8,
+                0x1D90, 0x31AD00C7,
+                0x1D90, 0x31AE00C6,
+                0x1D90, 0x31AF00C5,
+                0x1D90, 0x31B000C4,
+                0x1D90, 0x31B100C3,
+                0x1D90, 0x31B20088,
+                0x1D90, 0x31B30087,
+                0x1D90, 0x31B40086,
+                0x1D90, 0x31B50085,
+                0x1D90, 0x31B60026,
+                0x1D90, 0x31B70025,
+                0x1D90, 0x31B80024,
                 0x1D90, 0x31B90023,
                 0x1D90, 0x31BA0022,
                 0x1D90, 0x31BB0021,
                 0x1D90, 0x31BC0020,
-                0x1D90, 0x31BD0002,
-                0x1D90, 0x31BE0001,
-                0x1D90, 0x31BF0000,
+                0x1D90, 0x31BD0003,
+                0x1D90, 0x31BE0002,
+                0x1D90, 0x31BF0001,
                 0x1D70, 0x22222222,
                 0x1D70, 0x20202020,
 };
@@ -478,7 +479,7 @@ static const u32 rtw8822c_bb[] = {
                 0x814, 0x00904080,
                 0x818, 0xC30056F1,
                 0x81C, 0x00050000,
-                0x820, 0x11111133,
+                0x820, 0x11111111,
                 0x824, 0xC3C3CCC4,
                 0x828, 0x30FB186C,
                 0x82C, 0x185D6556,
@@ -604,7 +605,7 @@ static const u32 rtw8822c_bb[] = {
                 0xA14, 0x00000000,
                 0xA18, 0x00000000,
                 0xA1C, 0x00000000,
-                0xA20, 0xEB31B333,
+                0xA20, 0xCB31B333,
                 0xA24, 0x00275485,
                 0xA28, 0x00166366,
                 0xA2C, 0x00275485,
@@ -722,7 +723,7 @@ static const u32 rtw8822c_bb[] = {
                 0xBF0, 0x00000000,
                 0xBF4, 0x00000000,
                 0xBF8, 0x00000000,
-                0xC00, 0x1C8BA0D6,
+                0xC00, 0x0C8BA0D6,
                 0xC04, 0x00000001,
                 0xC08, 0x00000000,
                 0xC0C, 0x02F1D8B7,
@@ -774,8 +775,8 @@ static const u32 rtw8822c_bb[] = {
                 0xCC4, 0x00200400,
                 0xCC8, 0x0B200400,
                 0xCCC, 0x00600400,
-                0xCD0, 0x00000092,
-                0xCD4, 0x22220000,
+                0xCD0, 0x22220092,
+                0xCD4, 0x22220707,
                 0xCD8, 0x22222222,
                 0xCDC, 0x22222222,
                 0xCE0, 0x22222222,
@@ -990,7 +991,7 @@ static const u32 rtw8822c_bb[] = {
                 0x1C34, 0xE4E42000,
                 0x1C38, 0xFFA1005E,
                 0x1C40, 0x8F588837,
-                0x1C44, 0x04400300,
+                0x1C44, 0x04400700,
                 0x1C48, 0x00000000,
                 0x1C4C, 0x00000200,
                 0x1C50, 0x8E588837,
@@ -1108,7 +1109,7 @@ static const u32 rtw8822c_bb[] = {
                 0x1E20, 0x00000000,
                 0x1E24, 0x80003000,
                 0x1E28, 0x000CC0C3,
-                0x1E2C, 0xE4E40404,
+                0x1E2C, 0xE4E40000,
                 0x1E30, 0xE4E4E4E4,
                 0x1E34, 0xF3001234,
                 0x1E38, 0x00000000,
@@ -1124,7 +1125,7 @@ static const u32 rtw8822c_bb[] = {
                 0x1E60, 0x00000000,
                 0x1E64, 0xF3A00001,
                 0x1E68, 0x0028846E,
-                0x1E6C, 0x40274906,
+                0x1E6C, 0x40374906,
                 0x1E70, 0x00001000,
                 0x1E74, 0x00000000,
                 0x1E78, 0x00000000,
@@ -1485,11 +1486,11 @@ static const u32 rtw8822c_bb[] = {
                 0x1AD0, 0xA33529AD,
                 0x1AD4, 0x0D8D8452,
                 0x1AD8, 0x08024024,
-                0x1ADC, 0x000DB001,
+                0x1ADC, 0x000D0001,
                 0x1AE0, 0x00600391,
                 0x1AE4, 0x08000080,
-                0x1AE8, 0x00000002,
-                0x1AEC, 0x00000000,
+                0x1AE8, 0xC2100002,
+                0x1AEC, 0x000000F6,
                 0x1AF0, 0x00000000,
                 0x1AF4, 0x00000000,
                 0x1AF8, 0x00000000,
@@ -1756,6 +1757,7 @@ static const u32 rtw8822c_bb[] = {
                 0x1D94, 0x40FF0000,
                 0xC0C, 0x02F1D8B7,
                 0x1EE8, 0x00000000,
+
 };
 
 RTW_DECL_TABLE_PHY_COND(rtw8822c_bb, rtw_phy_cfg_bb);
@@ -1828,6 +1830,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x08E, 0x000A5540,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x08E, 0x000A5540,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x08E, 0x000A5540,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x08E, 0x000A5540,
         0xA0000000,     0x00000000,
                 0x08E, 0x000A5540,
         0xB0000000,     0x00000000,
@@ -1846,6 +1852,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x085, 0x0006A06C,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x085, 0x0006A06C,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x085, 0x0006A06C,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x085, 0x0006A06C,
         0xA0000000,     0x00000000,
                 0x085, 0x0006A06C,
         0xB0000000,     0x00000000,
@@ -1903,6 +1913,24 @@ static const u32 rtw8822c_rf_a[] = {
                 0x033, 0x00000002,
                 0x03F, 0x0000002A,
                 0x0EE, 0x00000000,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0EE, 0x00000010,
+                0x033, 0x00000001,
+                0x03F, 0x0000002A,
+                0x033, 0x00000001,
+                0x03F, 0x0000002A,
+                0x033, 0x00000002,
+                0x03F, 0x0000002A,
+                0x0EE, 0x00000000,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0EE, 0x00000010,
+                0x033, 0x00000001,
+                0x03F, 0x0000002A,
+                0x033, 0x00000001,
+                0x03F, 0x0000002A,
+                0x033, 0x00000002,
+                0x03F, 0x0000002A,
+                0x0EE, 0x00000000,
         0xA0000000,     0x00000000,
                 0x0EE, 0x00000010,
                 0x033, 0x00000001,
@@ -2069,6 +2097,58 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000004,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00010000,
+                0x033, 0x0000000F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000000E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000000D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000000C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000000B,
+                0x03F, 0x00000287,
+                0x033, 0x0000000A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000009,
+                0x03F, 0x00000207,
+                0x033, 0x00000008,
+                0x03F, 0x000FF280,
+                0x033, 0x00000007,
+                0x03F, 0x00000200,
+                0x033, 0x00000006,
+                0x03F, 0x000001C0,
+                0x033, 0x00000005,
+                0x03F, 0x00000180,
+                0x033, 0x00000004,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00010000,
+                0x033, 0x0000000F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000000E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000000D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000000C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000000B,
+                0x03F, 0x00000287,
+                0x033, 0x0000000A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000009,
+                0x03F, 0x00000207,
+                0x033, 0x00000008,
+                0x03F, 0x000FF280,
+                0x033, 0x00000007,
+                0x03F, 0x00000200,
+                0x033, 0x00000006,
+                0x03F, 0x000001C0,
+                0x033, 0x00000005,
+                0x03F, 0x00000180,
+                0x033, 0x00000004,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x0EF, 0x00010000,
                 0x033, 0x0000000F,
@@ -2248,6 +2328,56 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000014,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000001F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000001E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000001D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000001C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000001B,
+                0x03F, 0x00000287,
+                0x033, 0x0000001A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000019,
+                0x03F, 0x00000207,
+                0x033, 0x00000018,
+                0x03F, 0x000FF280,
+                0x033, 0x00000017,
+                0x03F, 0x00000200,
+                0x033, 0x00000016,
+                0x03F, 0x000001C0,
+                0x033, 0x00000015,
+                0x03F, 0x00000180,
+                0x033, 0x00000014,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000001F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000001E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000001D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000001C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000001B,
+                0x03F, 0x00000287,
+                0x033, 0x0000001A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000019,
+                0x03F, 0x00000207,
+                0x033, 0x00000018,
+                0x03F, 0x000FF280,
+                0x033, 0x00000017,
+                0x03F, 0x00000200,
+                0x033, 0x00000016,
+                0x03F, 0x000001C0,
+                0x033, 0x00000015,
+                0x03F, 0x00000180,
+                0x033, 0x00000014,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000001F,
                 0x03F, 0x000773E8,
@@ -2426,6 +2556,56 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000024,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000002F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000002E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000002D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000002C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000002B,
+                0x03F, 0x00000287,
+                0x033, 0x0000002A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000029,
+                0x03F, 0x00000207,
+                0x033, 0x00000028,
+                0x03F, 0x000FF280,
+                0x033, 0x00000027,
+                0x03F, 0x00000200,
+                0x033, 0x00000026,
+                0x03F, 0x000001C0,
+                0x033, 0x00000025,
+                0x03F, 0x00000180,
+                0x033, 0x00000024,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000002F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000002E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000002D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000002C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000002B,
+                0x03F, 0x00000287,
+                0x033, 0x0000002A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000029,
+                0x03F, 0x00000207,
+                0x033, 0x00000028,
+                0x03F, 0x000FF280,
+                0x033, 0x00000027,
+                0x03F, 0x00000200,
+                0x033, 0x00000026,
+                0x03F, 0x000001C0,
+                0x033, 0x00000025,
+                0x03F, 0x00000180,
+                0x033, 0x00000024,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000002F,
                 0x03F, 0x000773E8,
@@ -2604,6 +2784,56 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000034,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000003F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000003E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000003D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000003C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000003B,
+                0x03F, 0x00000287,
+                0x033, 0x0000003A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000039,
+                0x03F, 0x00000207,
+                0x033, 0x00000038,
+                0x03F, 0x000FF280,
+                0x033, 0x00000037,
+                0x03F, 0x00000200,
+                0x033, 0x00000036,
+                0x03F, 0x000001C0,
+                0x033, 0x00000035,
+                0x03F, 0x00000180,
+                0x033, 0x00000034,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000003F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000003E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000003D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000003C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000003B,
+                0x03F, 0x00000287,
+                0x033, 0x0000003A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000039,
+                0x03F, 0x00000207,
+                0x033, 0x00000038,
+                0x03F, 0x000FF280,
+                0x033, 0x00000037,
+                0x03F, 0x00000200,
+                0x033, 0x00000036,
+                0x03F, 0x000001C0,
+                0x033, 0x00000035,
+                0x03F, 0x00000180,
+                0x033, 0x00000034,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000003F,
                 0x03F, 0x000773E8,
@@ -2782,6 +3012,56 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000044,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000004F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000004E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000004D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000004C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000004B,
+                0x03F, 0x00000287,
+                0x033, 0x0000004A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000049,
+                0x03F, 0x00000207,
+                0x033, 0x00000048,
+                0x03F, 0x000FF280,
+                0x033, 0x00000047,
+                0x03F, 0x00000200,
+                0x033, 0x00000046,
+                0x03F, 0x000001C0,
+                0x033, 0x00000045,
+                0x03F, 0x00000180,
+                0x033, 0x00000044,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000004F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000004E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000004D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000004C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000004B,
+                0x03F, 0x00000287,
+                0x033, 0x0000004A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000049,
+                0x03F, 0x00000207,
+                0x033, 0x00000048,
+                0x03F, 0x000FF280,
+                0x033, 0x00000047,
+                0x03F, 0x00000200,
+                0x033, 0x00000046,
+                0x03F, 0x000001C0,
+                0x033, 0x00000045,
+                0x03F, 0x00000180,
+                0x033, 0x00000044,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000004F,
                 0x03F, 0x000773E8,
@@ -2960,6 +3240,56 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000054,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000005F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000005E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000005D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000005C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000005B,
+                0x03F, 0x00000287,
+                0x033, 0x0000005A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000059,
+                0x03F, 0x00000207,
+                0x033, 0x00000058,
+                0x03F, 0x000FF280,
+                0x033, 0x00000057,
+                0x03F, 0x00000200,
+                0x033, 0x00000056,
+                0x03F, 0x000001C0,
+                0x033, 0x00000055,
+                0x03F, 0x00000180,
+                0x033, 0x00000054,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000005F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000005E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000005D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000005C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000005B,
+                0x03F, 0x00000287,
+                0x033, 0x0000005A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000059,
+                0x03F, 0x00000207,
+                0x033, 0x00000058,
+                0x03F, 0x000FF280,
+                0x033, 0x00000057,
+                0x03F, 0x00000200,
+                0x033, 0x00000056,
+                0x03F, 0x000001C0,
+                0x033, 0x00000055,
+                0x03F, 0x00000180,
+                0x033, 0x00000054,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000005F,
                 0x03F, 0x000773E8,
@@ -3000,6 +3330,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x0EF, 0x00000000,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x0EF, 0x00000000,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00000000,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00000000,
         0xA0000000,     0x00000000,
                 0x0EF, 0x00000000,
         0xB0000000,     0x00000000,
@@ -3899,6 +4233,300 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03E, 0x00000000,
                 0x03F, 0x0002C010,
                 0x0EF, 0x00000000,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00020000,
+                0x033, 0x00000000,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000001,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000002,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000003,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000004,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000005,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000006,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000007,
+                0x03E, 0x00000000,
+                0x03F, 0x0002F81C,
+                0x033, 0x00000008,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000009,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000000A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000000B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000000C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000000D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000000E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000000F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002F81C,
+                0x033, 0x00000010,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000011,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000012,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000013,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000014,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000015,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000016,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000017,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000018,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000019,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000001A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000001B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000001C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000001D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000001E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000001F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000020,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000021,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000022,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000023,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000024,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000025,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000026,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000027,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000028,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000029,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000002A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000002B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000002C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000002D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000002E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000002F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x0EF, 0x00000000,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00020000,
+                0x033, 0x00000000,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000001,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000002,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000003,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000004,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000005,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000006,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000007,
+                0x03E, 0x00000000,
+                0x03F, 0x0002F81C,
+                0x033, 0x00000008,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000009,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000000A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000000B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000000C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000000D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000000E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000000F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002F81C,
+                0x033, 0x00000010,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000011,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000012,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000013,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000014,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000015,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000016,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000017,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000018,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000019,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000001A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000001B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000001C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000001D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000001E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000001F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000020,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000021,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000022,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000023,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000024,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000025,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000026,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000027,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000028,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000029,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000002A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000002B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000002C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000002D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000002E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000002F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x0EF, 0x00000000,
         0xA0000000,     0x00000000,
                 0x0EF, 0x00020000,
                 0x033, 0x00000000,
@@ -4063,6 +4691,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x063, 0x00000002,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x063, 0x00000002,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x063, 0x00000002,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x063, 0x00000002,
         0xA0000000,     0x00000000,
                 0x063, 0x00000C02,
         0xB0000000,     0x00000000,
@@ -4176,59 +4808,113 @@ static const u32 rtw8822c_rf_a[] = {
                 0x030, 0x00018207,
                 0x030, 0x00019237,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x030, 0x00000237,
-                0x030, 0x00001237,
-                0x030, 0x00002237,
-                0x030, 0x00003237,
-                0x030, 0x00004207,
-                0x030, 0x00005237,
-                0x030, 0x00006237,
-                0x030, 0x00007237,
-                0x030, 0x00008207,
-                0x030, 0x00009237,
-                0x030, 0x0000A237,
-                0x030, 0x0000B237,
-                0x030, 0x0000C237,
-                0x030, 0x0000D237,
-                0x030, 0x0000E207,
-                0x030, 0x0000F237,
-                0x030, 0x00010237,
-                0x030, 0x00011237,
-                0x030, 0x00012207,
-                0x030, 0x00013237,
-                0x030, 0x00014237,
-                0x030, 0x00015237,
-                0x030, 0x00016207,
-                0x030, 0x00017237,
-                0x030, 0x00018207,
-                0x030, 0x00019237,
+                0x030, 0x00000238,
+                0x030, 0x00001238,
+                0x030, 0x00002238,
+                0x030, 0x00003238,
+                0x030, 0x00004228,
+                0x030, 0x00005238,
+                0x030, 0x00006238,
+                0x030, 0x00007238,
+                0x030, 0x00008228,
+                0x030, 0x00009238,
+                0x030, 0x0000A238,
+                0x030, 0x0000B238,
+                0x030, 0x0000C238,
+                0x030, 0x0000D238,
+                0x030, 0x0000E228,
+                0x030, 0x0000F238,
+                0x030, 0x00010238,
+                0x030, 0x00011238,
+                0x030, 0x00012228,
+                0x030, 0x00013238,
+                0x030, 0x00014238,
+                0x030, 0x00015238,
+                0x030, 0x00016228,
+                0x030, 0x00017238,
+                0x030, 0x00018228,
+                0x030, 0x00019238,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x030, 0x00000237,
-                0x030, 0x00001237,
-                0x030, 0x00002237,
-                0x030, 0x00003237,
-                0x030, 0x00004207,
-                0x030, 0x00005237,
-                0x030, 0x00006237,
-                0x030, 0x00007237,
-                0x030, 0x00008207,
-                0x030, 0x00009237,
-                0x030, 0x0000A237,
-                0x030, 0x0000B237,
-                0x030, 0x0000C237,
-                0x030, 0x0000D237,
-                0x030, 0x0000E207,
-                0x030, 0x0000F237,
-                0x030, 0x00010237,
-                0x030, 0x00011237,
-                0x030, 0x00012207,
-                0x030, 0x00013237,
-                0x030, 0x00014237,
-                0x030, 0x00015237,
-                0x030, 0x00016207,
-                0x030, 0x00017237,
-                0x030, 0x00018207,
-                0x030, 0x00019237,
+                0x030, 0x00000238,
+                0x030, 0x00001238,
+                0x030, 0x00002238,
+                0x030, 0x00003238,
+                0x030, 0x00004228,
+                0x030, 0x00005238,
+                0x030, 0x00006238,
+                0x030, 0x00007238,
+                0x030, 0x00008228,
+                0x030, 0x00009238,
+                0x030, 0x0000A238,
+                0x030, 0x0000B238,
+                0x030, 0x0000C238,
+                0x030, 0x0000D238,
+                0x030, 0x0000E228,
+                0x030, 0x0000F238,
+                0x030, 0x00010238,
+                0x030, 0x00011238,
+                0x030, 0x00012228,
+                0x030, 0x00013238,
+                0x030, 0x00014238,
+                0x030, 0x00015238,
+                0x030, 0x00016228,
+                0x030, 0x00017238,
+                0x030, 0x00018228,
+                0x030, 0x00019238,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x030, 0x00000239,
+                0x030, 0x00001239,
+                0x030, 0x00002239,
+                0x030, 0x00003239,
+                0x030, 0x00004239,
+                0x030, 0x00005239,
+                0x030, 0x00006239,
+                0x030, 0x00007239,
+                0x030, 0x00008239,
+                0x030, 0x00009239,
+                0x030, 0x0000A239,
+                0x030, 0x0000B239,
+                0x030, 0x0000C239,
+                0x030, 0x0000D239,
+                0x030, 0x0000E209,
+                0x030, 0x0000F239,
+                0x030, 0x00010239,
+                0x030, 0x00011239,
+                0x030, 0x00012209,
+                0x030, 0x00013239,
+                0x030, 0x00014239,
+                0x030, 0x00015239,
+                0x030, 0x00016209,
+                0x030, 0x00017239,
+                0x030, 0x00018209,
+                0x030, 0x00019239,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x030, 0x00000239,
+                0x030, 0x00001239,
+                0x030, 0x00002239,
+                0x030, 0x00003239,
+                0x030, 0x00004239,
+                0x030, 0x00005239,
+                0x030, 0x00006239,
+                0x030, 0x00007239,
+                0x030, 0x00008239,
+                0x030, 0x00009239,
+                0x030, 0x0000A239,
+                0x030, 0x0000B239,
+                0x030, 0x0000C239,
+                0x030, 0x0000D239,
+                0x030, 0x0000E209,
+                0x030, 0x0000F239,
+                0x030, 0x00010239,
+                0x030, 0x00011239,
+                0x030, 0x00012209,
+                0x030, 0x00013239,
+                0x030, 0x00014239,
+                0x030, 0x00015239,
+                0x030, 0x00016209,
+                0x030, 0x00017239,
+                0x030, 0x00018209,
+                0x030, 0x00019239,
         0xA0000000,     0x00000000,
                 0x030, 0x00000233,
                 0x030, 0x00001233,
@@ -4337,6 +5023,32 @@ static const u32 rtw8822c_rf_a[] = {
                 0x030, 0x00009334,
                 0x030, 0x0000A334,
                 0x030, 0x0000B334,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x030, 0x00000334,
+                0x030, 0x00001334,
+                0x030, 0x00002334,
+                0x030, 0x00003334,
+                0x030, 0x00004334,
+                0x030, 0x00005334,
+                0x030, 0x00006334,
+                0x030, 0x00007334,
+                0x030, 0x00008334,
+                0x030, 0x00009334,
+                0x030, 0x0000A334,
+                0x030, 0x0000B334,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x030, 0x00000334,
+                0x030, 0x00001334,
+                0x030, 0x00002334,
+                0x030, 0x00003334,
+                0x030, 0x00004334,
+                0x030, 0x00005334,
+                0x030, 0x00006334,
+                0x030, 0x00007334,
+                0x030, 0x00008334,
+                0x030, 0x00009334,
+                0x030, 0x0000A334,
+                0x030, 0x0000B334,
         0xA0000000,     0x00000000,
                 0x030, 0x00000232,
                 0x030, 0x00001232,
@@ -4444,6 +5156,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x052, 0x000902CA,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x052, 0x000902CA,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x052, 0x000902CA,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x052, 0x000902CA,
         0xA0000000,     0x00000000,
                 0x052, 0x000942CA,
         0xB0000000,     0x00000000,
@@ -4462,9 +5178,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4479,9 +5199,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4499,6 +5223,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00030246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00030246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4513,9 +5241,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4530,9 +5262,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4550,6 +5286,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00030246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00030246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4564,9 +5304,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4581,9 +5325,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4601,6 +5349,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00030246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00030246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4615,9 +5367,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4632,9 +5388,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4652,6 +5412,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00030246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00030246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4666,9 +5430,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4683,9 +5451,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00010E46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4703,6 +5475,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00030246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00030246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4717,9 +5493,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4734,9 +5514,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x00028246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00028246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4754,6 +5538,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00030246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00030246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00030246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4768,9 +5556,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4785,9 +5577,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4805,6 +5601,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00031E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00031E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4819,9 +5619,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4836,9 +5640,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4856,6 +5664,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00031E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00031E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4870,9 +5682,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4887,9 +5703,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4907,6 +5727,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00031E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00031E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4921,9 +5745,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4938,9 +5766,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4958,6 +5790,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00031E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00031E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4972,9 +5808,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -4989,9 +5829,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5009,6 +5853,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00031E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00031E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5023,9 +5871,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5040,9 +5892,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5060,6 +5916,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00031E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00031E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5074,9 +5934,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5091,9 +5955,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5111,6 +5979,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00031E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00031E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5125,9 +5997,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5142,9 +6018,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0000EA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00021E46,
+                0x03F, 0x00025E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00025E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5162,6 +6042,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00031E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00031E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00031E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5179,6 +6063,10 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00021E46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00021E46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00021E46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x00021E46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00002A46,
         0xB0000000,     0x00000000,
@@ -5278,17 +6166,17 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000DF7,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
                 0x033, 0x00000060,
-                0x03F, 0x00000468,
+                0x03F, 0x00000467,
                 0x033, 0x00000061,
-                0x03F, 0x00000868,
+                0x03F, 0x00000867,
                 0x033, 0x00000062,
-                0x03F, 0x00000909,
+                0x03F, 0x00000908,
                 0x033, 0x00000063,
-                0x03F, 0x00000D0A,
+                0x03F, 0x00000D09,
                 0x033, 0x00000064,
-                0x03F, 0x00000D4A,
+                0x03F, 0x00000D49,
                 0x033, 0x00000065,
-                0x03F, 0x00000D8B,
+                0x03F, 0x00000D8A,
                 0x033, 0x00000066,
                 0x03F, 0x00000DEB,
                 0x033, 0x00000067,
@@ -5301,17 +6189,63 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000DF7,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x033, 0x00000060,
-                0x03F, 0x00000468,
+                0x03F, 0x00000467,
                 0x033, 0x00000061,
-                0x03F, 0x00000868,
+                0x03F, 0x00000867,
                 0x033, 0x00000062,
-                0x03F, 0x00000909,
+                0x03F, 0x00000908,
                 0x033, 0x00000063,
-                0x03F, 0x00000D0A,
+                0x03F, 0x00000D09,
                 0x033, 0x00000064,
-                0x03F, 0x00000D4A,
+                0x03F, 0x00000D49,
                 0x033, 0x00000065,
-                0x03F, 0x00000D8B,
+                0x03F, 0x00000D8A,
+                0x033, 0x00000066,
+                0x03F, 0x00000DEB,
+                0x033, 0x00000067,
+                0x03F, 0x00000DEE,
+                0x033, 0x00000068,
+                0x03F, 0x00000DF1,
+                0x033, 0x00000069,
+                0x03F, 0x00000DF4,
+                0x033, 0x0000006A,
+                0x03F, 0x00000DF7,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x00000060,
+                0x03F, 0x00000467,
+                0x033, 0x00000061,
+                0x03F, 0x00000867,
+                0x033, 0x00000062,
+                0x03F, 0x00000908,
+                0x033, 0x00000063,
+                0x03F, 0x00000D09,
+                0x033, 0x00000064,
+                0x03F, 0x00000D49,
+                0x033, 0x00000065,
+                0x03F, 0x00000D8A,
+                0x033, 0x00000066,
+                0x03F, 0x00000DEB,
+                0x033, 0x00000067,
+                0x03F, 0x00000DEE,
+                0x033, 0x00000068,
+                0x03F, 0x00000DF1,
+                0x033, 0x00000069,
+                0x03F, 0x00000DF4,
+                0x033, 0x0000006A,
+                0x03F, 0x00000DF7,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x00000060,
+                0x03F, 0x00000467,
+                0x033, 0x00000061,
+                0x03F, 0x00000867,
+                0x033, 0x00000062,
+                0x03F, 0x00000908,
+                0x033, 0x00000063,
+                0x03F, 0x00000D09,
+                0x033, 0x00000064,
+                0x03F, 0x00000D49,
+                0x033, 0x00000065,
+                0x03F, 0x00000D8A,
                 0x033, 0x00000066,
                 0x03F, 0x00000DEB,
                 0x033, 0x00000067,
@@ -5440,17 +6374,17 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000DF7,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
                 0x033, 0x00000020,
-                0x03F, 0x00000468,
+                0x03F, 0x00000467,
                 0x033, 0x00000021,
-                0x03F, 0x00000868,
+                0x03F, 0x00000867,
                 0x033, 0x00000022,
-                0x03F, 0x00000909,
+                0x03F, 0x00000908,
                 0x033, 0x00000023,
-                0x03F, 0x00000D0A,
+                0x03F, 0x00000D09,
                 0x033, 0x00000024,
-                0x03F, 0x00000D4A,
+                0x03F, 0x00000D49,
                 0x033, 0x00000025,
-                0x03F, 0x00000D8B,
+                0x03F, 0x00000D8A,
                 0x033, 0x00000026,
                 0x03F, 0x00000DEB,
                 0x033, 0x00000027,
@@ -5463,17 +6397,63 @@ static const u32 rtw8822c_rf_a[] = {
                 0x03F, 0x00000DF7,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x033, 0x00000020,
-                0x03F, 0x00000468,
+                0x03F, 0x00000467,
                 0x033, 0x00000021,
-                0x03F, 0x00000868,
+                0x03F, 0x00000867,
                 0x033, 0x00000022,
-                0x03F, 0x00000909,
+                0x03F, 0x00000908,
                 0x033, 0x00000023,
-                0x03F, 0x00000D0A,
+                0x03F, 0x00000D09,
                 0x033, 0x00000024,
-                0x03F, 0x00000D4A,
+                0x03F, 0x00000D49,
                 0x033, 0x00000025,
-                0x03F, 0x00000D8B,
+                0x03F, 0x00000D8A,
+                0x033, 0x00000026,
+                0x03F, 0x00000DEB,
+                0x033, 0x00000027,
+                0x03F, 0x00000DEE,
+                0x033, 0x00000028,
+                0x03F, 0x00000DF1,
+                0x033, 0x00000029,
+                0x03F, 0x00000DF4,
+                0x033, 0x0000002A,
+                0x03F, 0x00000DF7,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x00000020,
+                0x03F, 0x00000467,
+                0x033, 0x00000021,
+                0x03F, 0x00000867,
+                0x033, 0x00000022,
+                0x03F, 0x00000908,
+                0x033, 0x00000023,
+                0x03F, 0x00000D09,
+                0x033, 0x00000024,
+                0x03F, 0x00000D49,
+                0x033, 0x00000025,
+                0x03F, 0x00000D8A,
+                0x033, 0x00000026,
+                0x03F, 0x00000DEB,
+                0x033, 0x00000027,
+                0x03F, 0x00000DEE,
+                0x033, 0x00000028,
+                0x03F, 0x00000DF1,
+                0x033, 0x00000029,
+                0x03F, 0x00000DF4,
+                0x033, 0x0000002A,
+                0x03F, 0x00000DF7,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x00000020,
+                0x03F, 0x00000467,
+                0x033, 0x00000021,
+                0x03F, 0x00000867,
+                0x033, 0x00000022,
+                0x03F, 0x00000908,
+                0x033, 0x00000023,
+                0x03F, 0x00000D09,
+                0x033, 0x00000024,
+                0x03F, 0x00000D49,
+                0x033, 0x00000025,
+                0x03F, 0x00000D8A,
                 0x033, 0x00000026,
                 0x03F, 0x00000DEB,
                 0x033, 0x00000027,
@@ -5526,15 +6506,25 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x0B3, 0x0007C760,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x0B3, 0x0007C760,
+                0x0B3, 0x000FC760,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x0B3, 0x0007C760,
+                0x0B3, 0x000FC760,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0B3, 0x000FC760,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0B3, 0x000FC760,
         0xA0000000,     0x00000000,
                 0x0B3, 0x0007C760,
         0xB0000000,     0x00000000,
                 0x0B4, 0x00099D40,
                 0x0B5, 0x0004103F,
+        0x83000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0B6, 0x000387F8,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0B6, 0x000387F8,
+        0xA0000000,     0x00000000,
                 0x0B6, 0x000187F8,
+        0xB0000000,     0x00000000,
                 0x0B7, 0x00030018,
                 0x0BC, 0x00000008,
                 0x0D3, 0x00000542,
@@ -5555,9 +6545,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x0B3, 0x0007C700,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x0B3, 0x0007C700,
+                0x0B3, 0x000FC760,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x0B3, 0x0007C700,
+                0x0B3, 0x000FC760,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0B3, 0x000FC760,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0B3, 0x000FC760,
         0xA0000000,     0x00000000,
                 0x0B3, 0x0007C700,
         0xB0000000,     0x00000000,
@@ -5573,9 +6567,13 @@ static const u32 rtw8822c_rf_a[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x0B3, 0x0007C760,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x0B3, 0x0007C760,
+                0x0B3, 0x000FC760,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x0B3, 0x0007C760,
+                0x0B3, 0x000FC760,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0B3, 0x000FC760,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0B3, 0x000FC760,
         0xA0000000,     0x00000000,
                 0x0B3, 0x0007C760,
         0xB0000000,     0x00000000,
@@ -5584,10 +6582,14 @@ static const u32 rtw8822c_rf_a[] = {
                 0x0CD, 0x00089600,
                 0x018, 0x00013108,
                 0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
                 0x0B8, 0x000C0440,
                 0x0BA, 0x000E840D,
                 0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
                 0x018, 0x00013124,
+                0x0FE, 0x00000000,
+                0x0FE, 0x00000000,
                 0x059, 0x000A0000,
                 0x05A, 0x00060000,
                 0x05B, 0x00014000,
@@ -5595,6 +6597,18 @@ static const u32 rtw8822c_rf_a[] = {
                 0x033, 0x00000001,
                 0x03F, 0x0000000F,
                 0x0ED, 0x00000000,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x0DD, 0x00000540,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x0DD, 0x00000540,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0DD, 0x00000540,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0DD, 0x00000540,
+        0xA0000000,     0x00000000,
+                0x0DD, 0x00000500,
+        0xB0000000,     0x00000000,
+                0x0BC, 0x00000004,
                 0x0EE, 0x00000002,
                 0x033, 0x00000017,
                 0x03F, 0x0000003F,
@@ -5672,9 +6686,24 @@ static const u32 rtw8822c_rf_a[] = {
                 0x0FE, 0x00000000,
                 0x0FE, 0x00000000,
                 0x092, 0x00084800,
-                0x08F, 0x0000182C,
+                0x08F, 0x00001B4C,
                 0x088, 0x0004326B,
                 0x019, 0x00000005,
+                0x0EF, 0x00080000,
+                0x033, 0x00000004,
+                0x03E, 0x00000003,
+                0x03F, 0x000F60FF,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00080000,
+                0x033, 0x00000006,
+                0x03E, 0x00000003,
+                0x03F, 0x000760FF,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00080000,
+                0x033, 0x00000007,
+                0x03E, 0x00000003,
+                0x03F, 0x0007DEFF,
+                0x0EF, 0x00000000,
 };
 
 RTW_DECL_TABLE_RF_RADIO(rtw8822c_rf_a, A);
@@ -5685,7 +6714,7 @@ static const u32 rtw8822c_rf_b[] = {
                 0x093, 0x0008483F,
                 0x0EF, 0x00080000,
                 0x033, 0x00000001,
-                0x03F, 0x00091020,
+                0x03F, 0x00091230,
                 0x0EF, 0x00000000,
                 0x0DE, 0x00000020,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
@@ -5700,6 +6729,10 @@ static const u32 rtw8822c_rf_b[] = {
                 0x08E, 0x000A5540,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x08E, 0x000A5540,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x08E, 0x000A5540,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x08E, 0x000A5540,
         0xA0000000,     0x00000000,
                 0x08E, 0x000A5540,
         0xB0000000,     0x00000000,
@@ -5761,6 +6794,24 @@ static const u32 rtw8822c_rf_b[] = {
                 0x033, 0x00000002,
                 0x03F, 0x0000002A,
                 0x0EE, 0x00000000,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0EE, 0x00000010,
+                0x033, 0x00000001,
+                0x03F, 0x0000002A,
+                0x033, 0x00000001,
+                0x03F, 0x0000002A,
+                0x033, 0x00000002,
+                0x03F, 0x0000002A,
+                0x0EE, 0x00000000,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0EE, 0x00000010,
+                0x033, 0x00000001,
+                0x03F, 0x0000002A,
+                0x033, 0x00000001,
+                0x03F, 0x0000002A,
+                0x033, 0x00000002,
+                0x03F, 0x0000002A,
+                0x0EE, 0x00000000,
         0xA0000000,     0x00000000,
                 0x0EE, 0x00000010,
                 0x033, 0x00000001,
@@ -5927,6 +6978,58 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000004,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00010000,
+                0x033, 0x0000000F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000000E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000000D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000000C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000000B,
+                0x03F, 0x00000287,
+                0x033, 0x0000000A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000009,
+                0x03F, 0x00000207,
+                0x033, 0x00000008,
+                0x03F, 0x000FF280,
+                0x033, 0x00000007,
+                0x03F, 0x00000200,
+                0x033, 0x00000006,
+                0x03F, 0x000001C0,
+                0x033, 0x00000005,
+                0x03F, 0x00000180,
+                0x033, 0x00000004,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00010000,
+                0x033, 0x0000000F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000000E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000000D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000000C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000000B,
+                0x03F, 0x00000287,
+                0x033, 0x0000000A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000009,
+                0x03F, 0x00000207,
+                0x033, 0x00000008,
+                0x03F, 0x000FF280,
+                0x033, 0x00000007,
+                0x03F, 0x00000200,
+                0x033, 0x00000006,
+                0x03F, 0x000001C0,
+                0x033, 0x00000005,
+                0x03F, 0x00000180,
+                0x033, 0x00000004,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x0EF, 0x00010000,
                 0x033, 0x0000000F,
@@ -6106,6 +7209,56 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000014,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000001F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000001E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000001D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000001C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000001B,
+                0x03F, 0x00000287,
+                0x033, 0x0000001A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000019,
+                0x03F, 0x00000207,
+                0x033, 0x00000018,
+                0x03F, 0x000FF280,
+                0x033, 0x00000017,
+                0x03F, 0x00000200,
+                0x033, 0x00000016,
+                0x03F, 0x000001C0,
+                0x033, 0x00000015,
+                0x03F, 0x00000180,
+                0x033, 0x00000014,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000001F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000001E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000001D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000001C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000001B,
+                0x03F, 0x00000287,
+                0x033, 0x0000001A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000019,
+                0x03F, 0x00000207,
+                0x033, 0x00000018,
+                0x03F, 0x000FF280,
+                0x033, 0x00000017,
+                0x03F, 0x00000200,
+                0x033, 0x00000016,
+                0x03F, 0x000001C0,
+                0x033, 0x00000015,
+                0x03F, 0x00000180,
+                0x033, 0x00000014,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000001F,
                 0x03F, 0x000773E8,
@@ -6284,6 +7437,56 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000024,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000002F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000002E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000002D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000002C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000002B,
+                0x03F, 0x00000287,
+                0x033, 0x0000002A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000029,
+                0x03F, 0x00000207,
+                0x033, 0x00000028,
+                0x03F, 0x000FF280,
+                0x033, 0x00000027,
+                0x03F, 0x00000200,
+                0x033, 0x00000026,
+                0x03F, 0x000001C0,
+                0x033, 0x00000025,
+                0x03F, 0x00000180,
+                0x033, 0x00000024,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000002F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000002E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000002D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000002C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000002B,
+                0x03F, 0x00000287,
+                0x033, 0x0000002A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000029,
+                0x03F, 0x00000207,
+                0x033, 0x00000028,
+                0x03F, 0x000FF280,
+                0x033, 0x00000027,
+                0x03F, 0x00000200,
+                0x033, 0x00000026,
+                0x03F, 0x000001C0,
+                0x033, 0x00000025,
+                0x03F, 0x00000180,
+                0x033, 0x00000024,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000002F,
                 0x03F, 0x000773E8,
@@ -6462,6 +7665,56 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000034,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000003F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000003E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000003D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000003C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000003B,
+                0x03F, 0x00000287,
+                0x033, 0x0000003A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000039,
+                0x03F, 0x00000207,
+                0x033, 0x00000038,
+                0x03F, 0x000FF280,
+                0x033, 0x00000037,
+                0x03F, 0x00000200,
+                0x033, 0x00000036,
+                0x03F, 0x000001C0,
+                0x033, 0x00000035,
+                0x03F, 0x00000180,
+                0x033, 0x00000034,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000003F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000003E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000003D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000003C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000003B,
+                0x03F, 0x00000287,
+                0x033, 0x0000003A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000039,
+                0x03F, 0x00000207,
+                0x033, 0x00000038,
+                0x03F, 0x000FF280,
+                0x033, 0x00000037,
+                0x03F, 0x00000200,
+                0x033, 0x00000036,
+                0x03F, 0x000001C0,
+                0x033, 0x00000035,
+                0x03F, 0x00000180,
+                0x033, 0x00000034,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000003F,
                 0x03F, 0x000773E8,
@@ -6640,6 +7893,56 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000044,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000004F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000004E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000004D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000004C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000004B,
+                0x03F, 0x00000287,
+                0x033, 0x0000004A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000049,
+                0x03F, 0x00000207,
+                0x033, 0x00000048,
+                0x03F, 0x000FF280,
+                0x033, 0x00000047,
+                0x03F, 0x00000200,
+                0x033, 0x00000046,
+                0x03F, 0x000001C0,
+                0x033, 0x00000045,
+                0x03F, 0x00000180,
+                0x033, 0x00000044,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000004F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000004E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000004D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000004C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000004B,
+                0x03F, 0x00000287,
+                0x033, 0x0000004A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000049,
+                0x03F, 0x00000207,
+                0x033, 0x00000048,
+                0x03F, 0x000FF280,
+                0x033, 0x00000047,
+                0x03F, 0x00000200,
+                0x033, 0x00000046,
+                0x03F, 0x000001C0,
+                0x033, 0x00000045,
+                0x03F, 0x00000180,
+                0x033, 0x00000044,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000004F,
                 0x03F, 0x000773E8,
@@ -6818,6 +8121,56 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000180,
                 0x033, 0x00000054,
                 0x03F, 0x00000040,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000005F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000005E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000005D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000005C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000005B,
+                0x03F, 0x00000287,
+                0x033, 0x0000005A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000059,
+                0x03F, 0x00000207,
+                0x033, 0x00000058,
+                0x03F, 0x000FF280,
+                0x033, 0x00000057,
+                0x03F, 0x00000200,
+                0x033, 0x00000056,
+                0x03F, 0x000001C0,
+                0x033, 0x00000055,
+                0x03F, 0x00000180,
+                0x033, 0x00000054,
+                0x03F, 0x00000040,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x0000005F,
+                0x03F, 0x000773C0,
+                0x033, 0x0000005E,
+                0x03F, 0x000FF3C0,
+                0x033, 0x0000005D,
+                0x03F, 0x000773E8,
+                0x033, 0x0000005C,
+                0x03F, 0x000FF3E8,
+                0x033, 0x0000005B,
+                0x03F, 0x00000287,
+                0x033, 0x0000005A,
+                0x03F, 0x000002A8,
+                0x033, 0x00000059,
+                0x03F, 0x00000207,
+                0x033, 0x00000058,
+                0x03F, 0x000FF280,
+                0x033, 0x00000057,
+                0x03F, 0x00000200,
+                0x033, 0x00000056,
+                0x03F, 0x000001C0,
+                0x033, 0x00000055,
+                0x03F, 0x00000180,
+                0x033, 0x00000054,
+                0x03F, 0x00000040,
         0xA0000000,     0x00000000,
                 0x033, 0x0000005F,
                 0x03F, 0x000773E8,
@@ -6858,6 +8211,10 @@ static const u32 rtw8822c_rf_b[] = {
                 0x0EF, 0x00000000,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x0EF, 0x00000000,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00000000,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00000000,
         0xA0000000,     0x00000000,
                 0x0EF, 0x00000000,
         0xB0000000,     0x00000000,
@@ -7757,6 +9114,300 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03E, 0x00000000,
                 0x03F, 0x0002C010,
                 0x0EF, 0x00000000,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00020000,
+                0x033, 0x00000000,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000001,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000002,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000003,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000004,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000005,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000006,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000007,
+                0x03E, 0x00000000,
+                0x03F, 0x0002F81C,
+                0x033, 0x00000008,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000009,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000000A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000000B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000000C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000000D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000000E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000000F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002F81C,
+                0x033, 0x00000010,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000011,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000012,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000013,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000014,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000015,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000016,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000017,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000018,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000019,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000001A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000001B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000001C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000001D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000001E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000001F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000020,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000021,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000022,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000023,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000024,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000025,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000026,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000027,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000028,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000029,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000002A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000002B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000002C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000002D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000002E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000002F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x0EF, 0x00000000,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x0EF, 0x00020000,
+                0x033, 0x00000000,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000001,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000002,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000003,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000004,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000005,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000006,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000007,
+                0x03E, 0x00000000,
+                0x03F, 0x0002F81C,
+                0x033, 0x00000008,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000009,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000000A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000000B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000000C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000000D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000000E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000000F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002F81C,
+                0x033, 0x00000010,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000011,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000012,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000013,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000014,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000015,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000016,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000017,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000018,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000019,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000001A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000001B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000001C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000001D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000001E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000001F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000020,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000021,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x00000022,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x00000023,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x00000024,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x00000025,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x00000026,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x00000027,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x033, 0x00000028,
+                0x03E, 0x00001C86,
+                0x03F, 0x00020000,
+                0x033, 0x00000029,
+                0x03E, 0x00001C02,
+                0x03F, 0x00020000,
+                0x033, 0x0000002A,
+                0x03E, 0x00000F02,
+                0x03F, 0x00020000,
+                0x033, 0x0000002B,
+                0x03E, 0x00000F00,
+                0x03F, 0x00020000,
+                0x033, 0x0000002C,
+                0x03E, 0x00000086,
+                0x03F, 0x00020000,
+                0x033, 0x0000002D,
+                0x03E, 0x00000002,
+                0x03F, 0x00020000,
+                0x033, 0x0000002E,
+                0x03E, 0x00000000,
+                0x03F, 0x00020000,
+                0x033, 0x0000002F,
+                0x03E, 0x00000000,
+                0x03F, 0x0002C010,
+                0x0EF, 0x00000000,
         0xA0000000,     0x00000000,
                 0x0EF, 0x00020000,
                 0x033, 0x00000000,
@@ -7921,6 +9572,10 @@ static const u32 rtw8822c_rf_b[] = {
                 0x063, 0x00000002,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x063, 0x00000002,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x063, 0x00000002,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x063, 0x00000002,
         0xA0000000,     0x00000000,
                 0x063, 0x00000C02,
         0xB0000000,     0x00000000,
@@ -8034,59 +9689,113 @@ static const u32 rtw8822c_rf_b[] = {
                 0x030, 0x00018207,
                 0x030, 0x00019237,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x030, 0x00000237,
-                0x030, 0x00001237,
-                0x030, 0x00002237,
-                0x030, 0x00003237,
-                0x030, 0x00004207,
-                0x030, 0x00005237,
-                0x030, 0x00006237,
-                0x030, 0x00007237,
-                0x030, 0x00008207,
-                0x030, 0x00009237,
-                0x030, 0x0000A237,
-                0x030, 0x0000B237,
-                0x030, 0x0000C237,
-                0x030, 0x0000D237,
-                0x030, 0x0000E207,
-                0x030, 0x0000F237,
-                0x030, 0x00010237,
-                0x030, 0x00011237,
-                0x030, 0x00012207,
-                0x030, 0x00013237,
-                0x030, 0x00014237,
-                0x030, 0x00015237,
-                0x030, 0x00016207,
-                0x030, 0x00017237,
-                0x030, 0x00018207,
-                0x030, 0x00019237,
+                0x030, 0x00000238,
+                0x030, 0x00001238,
+                0x030, 0x00002238,
+                0x030, 0x00003238,
+                0x030, 0x00004228,
+                0x030, 0x00005238,
+                0x030, 0x00006238,
+                0x030, 0x00007238,
+                0x030, 0x00008228,
+                0x030, 0x00009238,
+                0x030, 0x0000A238,
+                0x030, 0x0000B238,
+                0x030, 0x0000C238,
+                0x030, 0x0000D238,
+                0x030, 0x0000E228,
+                0x030, 0x0000F238,
+                0x030, 0x00010238,
+                0x030, 0x00011238,
+                0x030, 0x00012228,
+                0x030, 0x00013238,
+                0x030, 0x00014238,
+                0x030, 0x00015238,
+                0x030, 0x00016228,
+                0x030, 0x00017238,
+                0x030, 0x00018228,
+                0x030, 0x00019238,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x030, 0x00000237,
-                0x030, 0x00001237,
-                0x030, 0x00002237,
-                0x030, 0x00003237,
-                0x030, 0x00004207,
-                0x030, 0x00005237,
-                0x030, 0x00006237,
-                0x030, 0x00007237,
-                0x030, 0x00008207,
-                0x030, 0x00009237,
-                0x030, 0x0000A237,
-                0x030, 0x0000B237,
-                0x030, 0x0000C237,
-                0x030, 0x0000D237,
-                0x030, 0x0000E207,
-                0x030, 0x0000F237,
-                0x030, 0x00010237,
-                0x030, 0x00011237,
-                0x030, 0x00012207,
-                0x030, 0x00013237,
-                0x030, 0x00014237,
-                0x030, 0x00015237,
-                0x030, 0x00016207,
-                0x030, 0x00017237,
-                0x030, 0x00018207,
-                0x030, 0x00019237,
+                0x030, 0x00000238,
+                0x030, 0x00001238,
+                0x030, 0x00002238,
+                0x030, 0x00003238,
+                0x030, 0x00004228,
+                0x030, 0x00005238,
+                0x030, 0x00006238,
+                0x030, 0x00007238,
+                0x030, 0x00008228,
+                0x030, 0x00009238,
+                0x030, 0x0000A238,
+                0x030, 0x0000B238,
+                0x030, 0x0000C238,
+                0x030, 0x0000D238,
+                0x030, 0x0000E228,
+                0x030, 0x0000F238,
+                0x030, 0x00010238,
+                0x030, 0x00011238,
+                0x030, 0x00012228,
+                0x030, 0x00013238,
+                0x030, 0x00014238,
+                0x030, 0x00015238,
+                0x030, 0x00016228,
+                0x030, 0x00017238,
+                0x030, 0x00018228,
+                0x030, 0x00019238,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x030, 0x00000239,
+                0x030, 0x00001239,
+                0x030, 0x00002239,
+                0x030, 0x00003239,
+                0x030, 0x00004239,
+                0x030, 0x00005239,
+                0x030, 0x00006239,
+                0x030, 0x00007239,
+                0x030, 0x00008239,
+                0x030, 0x00009239,
+                0x030, 0x0000A239,
+                0x030, 0x0000B239,
+                0x030, 0x0000C239,
+                0x030, 0x0000D239,
+                0x030, 0x0000E209,
+                0x030, 0x0000F239,
+                0x030, 0x00010239,
+                0x030, 0x00011239,
+                0x030, 0x00012209,
+                0x030, 0x00013239,
+                0x030, 0x00014239,
+                0x030, 0x00015239,
+                0x030, 0x00016209,
+                0x030, 0x00017239,
+                0x030, 0x00018209,
+                0x030, 0x00019239,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x030, 0x00000239,
+                0x030, 0x00001239,
+                0x030, 0x00002239,
+                0x030, 0x00003239,
+                0x030, 0x00004239,
+                0x030, 0x00005239,
+                0x030, 0x00006239,
+                0x030, 0x00007239,
+                0x030, 0x00008239,
+                0x030, 0x00009239,
+                0x030, 0x0000A239,
+                0x030, 0x0000B239,
+                0x030, 0x0000C239,
+                0x030, 0x0000D239,
+                0x030, 0x0000E209,
+                0x030, 0x0000F239,
+                0x030, 0x00010239,
+                0x030, 0x00011239,
+                0x030, 0x00012209,
+                0x030, 0x00013239,
+                0x030, 0x00014239,
+                0x030, 0x00015239,
+                0x030, 0x00016209,
+                0x030, 0x00017239,
+                0x030, 0x00018209,
+                0x030, 0x00019239,
         0xA0000000,     0x00000000,
                 0x030, 0x00000233,
                 0x030, 0x00001233,
@@ -8195,6 +9904,32 @@ static const u32 rtw8822c_rf_b[] = {
                 0x030, 0x00009334,
                 0x030, 0x0000A334,
                 0x030, 0x0000B334,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x030, 0x00000334,
+                0x030, 0x00001334,
+                0x030, 0x00002334,
+                0x030, 0x00003334,
+                0x030, 0x00004334,
+                0x030, 0x00005334,
+                0x030, 0x00006334,
+                0x030, 0x00007334,
+                0x030, 0x00008334,
+                0x030, 0x00009334,
+                0x030, 0x0000A334,
+                0x030, 0x0000B334,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x030, 0x00000334,
+                0x030, 0x00001334,
+                0x030, 0x00002334,
+                0x030, 0x00003334,
+                0x030, 0x00004334,
+                0x030, 0x00005334,
+                0x030, 0x00006334,
+                0x030, 0x00007334,
+                0x030, 0x00008334,
+                0x030, 0x00009334,
+                0x030, 0x0000A334,
+                0x030, 0x0000B334,
         0xA0000000,     0x00000000,
                 0x030, 0x00000232,
                 0x030, 0x00001232,
@@ -8302,6 +10037,10 @@ static const u32 rtw8822c_rf_b[] = {
                 0x052, 0x000902CA,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x052, 0x000902CA,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x052, 0x000902CA,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x052, 0x000902CA,
         0xA0000000,     0x00000000,
                 0x052, 0x000942C0,
         0xB0000000,     0x00000000,
@@ -8310,7 +10049,17 @@ static const u32 rtw8822c_rf_b[] = {
                 0x057, 0x0004C80A,
                 0x0EF, 0x00000020,
                 0x033, 0x00000000,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8320,14 +10069,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
                 0x033, 0x00000001,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8337,9 +10100,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
@@ -8357,11 +10124,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002C246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002C246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
                 0x033, 0x00000003,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8371,14 +10152,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
                 0x033, 0x00000004,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8388,9 +10183,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
@@ -8408,11 +10207,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002C246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002C246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
                 0x033, 0x00000006,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8422,14 +10235,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
                 0x033, 0x00000007,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8439,9 +10266,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
@@ -8459,11 +10290,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002C246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002C246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
         0xA0000000,     0x00000000,
                 0x03F, 0x0000C246,
         0xB0000000,     0x00000000,
                 0x033, 0x00000009,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8473,14 +10318,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x0000000A,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8490,9 +10349,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8510,11 +10373,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002C246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002C246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x0000000C,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8524,14 +10401,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x0000000D,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8541,9 +10432,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8561,11 +10456,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002C246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002C246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x0000000F,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8575,14 +10484,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000010,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8592,9 +10515,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x00024246,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x00024246,
+                0x03F, 0x000241C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000241C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8612,11 +10539,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002C246,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002C246,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002C246,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000012,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8626,14 +10567,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000013,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8643,9 +10598,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8663,11 +10622,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000015,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8677,14 +10650,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000016,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8694,9 +10681,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8714,11 +10705,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000018,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8728,14 +10733,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000019,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8745,9 +10764,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8765,11 +10788,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x0000001B,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8779,14 +10816,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x0000001C,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8796,9 +10847,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8816,11 +10871,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x0000001E,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8830,14 +10899,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x0000001F,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8847,9 +10930,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8867,11 +10954,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000021,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8881,14 +10982,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000022,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8898,14 +11013,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000023,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000020,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000020,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000020,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xA0000000,     0x00000000,
+                0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8918,11 +11047,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000024,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8932,14 +11075,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000025,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8949,9 +11106,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -8969,11 +11130,25 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000027,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -8983,14 +11158,28 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
                 0x033, 0x00000028,
+        0x83000001,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000002,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03E, 0x00000030,
+        0xA0000000,     0x00000000,
                 0x03E, 0x00000020,
+        0xB0000000,     0x00000000,
         0x81000001,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x91000002,     0x00000000,     0x40000000,     0x00000000,
@@ -9000,9 +11189,13 @@ static const u32 rtw8822c_rf_b[] = {
         0x92000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
-                0x03F, 0x0001CA46,
+                0x03F, 0x000209C6,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x000209C6,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -9020,6 +11213,10 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0002CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0002CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0002CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -9037,6 +11234,10 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x0001CA46,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x03F, 0x0001CA46,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0001CA46,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x03F, 0x0001CA46,
         0xA0000000,     0x00000000,
                 0x03F, 0x00008E46,
         0xB0000000,     0x00000000,
@@ -9136,17 +11337,17 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000DF7,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
                 0x033, 0x00000060,
-                0x03F, 0x00000468,
+                0x03F, 0x00000467,
                 0x033, 0x00000061,
-                0x03F, 0x00000868,
+                0x03F, 0x00000867,
                 0x033, 0x00000062,
-                0x03F, 0x00000909,
+                0x03F, 0x00000908,
                 0x033, 0x00000063,
-                0x03F, 0x00000D0A,
+                0x03F, 0x00000D09,
                 0x033, 0x00000064,
-                0x03F, 0x00000D4A,
+                0x03F, 0x00000D49,
                 0x033, 0x00000065,
-                0x03F, 0x00000D8B,
+                0x03F, 0x00000D8A,
                 0x033, 0x00000066,
                 0x03F, 0x00000DEB,
                 0x033, 0x00000067,
@@ -9159,17 +11360,63 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000DF7,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x033, 0x00000060,
-                0x03F, 0x00000468,
+                0x03F, 0x00000467,
                 0x033, 0x00000061,
-                0x03F, 0x00000868,
+                0x03F, 0x00000867,
                 0x033, 0x00000062,
-                0x03F, 0x00000909,
+                0x03F, 0x00000908,
                 0x033, 0x00000063,
-                0x03F, 0x00000D0A,
+                0x03F, 0x00000D09,
                 0x033, 0x00000064,
-                0x03F, 0x00000D4A,
+                0x03F, 0x00000D49,
                 0x033, 0x00000065,
-                0x03F, 0x00000D8B,
+                0x03F, 0x00000D8A,
+                0x033, 0x00000066,
+                0x03F, 0x00000DEB,
+                0x033, 0x00000067,
+                0x03F, 0x00000DEE,
+                0x033, 0x00000068,
+                0x03F, 0x00000DF1,
+                0x033, 0x00000069,
+                0x03F, 0x00000DF4,
+                0x033, 0x0000006A,
+                0x03F, 0x00000DF7,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x00000060,
+                0x03F, 0x00000467,
+                0x033, 0x00000061,
+                0x03F, 0x00000867,
+                0x033, 0x00000062,
+                0x03F, 0x00000908,
+                0x033, 0x00000063,
+                0x03F, 0x00000D09,
+                0x033, 0x00000064,
+                0x03F, 0x00000D49,
+                0x033, 0x00000065,
+                0x03F, 0x00000D8A,
+                0x033, 0x00000066,
+                0x03F, 0x00000DEB,
+                0x033, 0x00000067,
+                0x03F, 0x00000DEE,
+                0x033, 0x00000068,
+                0x03F, 0x00000DF1,
+                0x033, 0x00000069,
+                0x03F, 0x00000DF4,
+                0x033, 0x0000006A,
+                0x03F, 0x00000DF7,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x00000060,
+                0x03F, 0x00000467,
+                0x033, 0x00000061,
+                0x03F, 0x00000867,
+                0x033, 0x00000062,
+                0x03F, 0x00000908,
+                0x033, 0x00000063,
+                0x03F, 0x00000D09,
+                0x033, 0x00000064,
+                0x03F, 0x00000D49,
+                0x033, 0x00000065,
+                0x03F, 0x00000D8A,
                 0x033, 0x00000066,
                 0x03F, 0x00000DEB,
                 0x033, 0x00000067,
@@ -9298,17 +11545,17 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000DF7,
         0x93000001,     0x00000000,     0x40000000,     0x00000000,
                 0x033, 0x00000020,
-                0x03F, 0x00000468,
+                0x03F, 0x00000467,
                 0x033, 0x00000021,
-                0x03F, 0x00000868,
+                0x03F, 0x00000867,
                 0x033, 0x00000022,
-                0x03F, 0x00000909,
+                0x03F, 0x00000908,
                 0x033, 0x00000023,
-                0x03F, 0x00000D0A,
+                0x03F, 0x00000D09,
                 0x033, 0x00000024,
-                0x03F, 0x00000D4A,
+                0x03F, 0x00000D49,
                 0x033, 0x00000025,
-                0x03F, 0x00000D8B,
+                0x03F, 0x00000D8A,
                 0x033, 0x00000026,
                 0x03F, 0x00000DEB,
                 0x033, 0x00000027,
@@ -9321,17 +11568,63 @@ static const u32 rtw8822c_rf_b[] = {
                 0x03F, 0x00000DF7,
         0x93000002,     0x00000000,     0x40000000,     0x00000000,
                 0x033, 0x00000020,
-                0x03F, 0x00000468,
+                0x03F, 0x00000467,
                 0x033, 0x00000021,
-                0x03F, 0x00000868,
+                0x03F, 0x00000867,
                 0x033, 0x00000022,
-                0x03F, 0x00000909,
+                0x03F, 0x00000908,
                 0x033, 0x00000023,
-                0x03F, 0x00000D0A,
+                0x03F, 0x00000D09,
                 0x033, 0x00000024,
-                0x03F, 0x00000D4A,
+                0x03F, 0x00000D49,
                 0x033, 0x00000025,
-                0x03F, 0x00000D8B,
+                0x03F, 0x00000D8A,
+                0x033, 0x00000026,
+                0x03F, 0x00000DEB,
+                0x033, 0x00000027,
+                0x03F, 0x00000DEE,
+                0x033, 0x00000028,
+                0x03F, 0x00000DF1,
+                0x033, 0x00000029,
+                0x03F, 0x00000DF4,
+                0x033, 0x0000002A,
+                0x03F, 0x00000DF7,
+        0x93000003,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x00000020,
+                0x03F, 0x00000467,
+                0x033, 0x00000021,
+                0x03F, 0x00000867,
+                0x033, 0x00000022,
+                0x03F, 0x00000908,
+                0x033, 0x00000023,
+                0x03F, 0x00000D09,
+                0x033, 0x00000024,
+                0x03F, 0x00000D49,
+                0x033, 0x00000025,
+                0x03F, 0x00000D8A,
+                0x033, 0x00000026,
+                0x03F, 0x00000DEB,
+                0x033, 0x00000027,
+                0x03F, 0x00000DEE,
+                0x033, 0x00000028,
+                0x03F, 0x00000DF1,
+                0x033, 0x00000029,
+                0x03F, 0x00000DF4,
+                0x033, 0x0000002A,
+                0x03F, 0x00000DF7,
+        0x93000004,     0x00000000,     0x40000000,     0x00000000,
+                0x033, 0x00000020,
+                0x03F, 0x00000467,
+                0x033, 0x00000021,
+                0x03F, 0x00000867,
+                0x033, 0x00000022,
+                0x03F, 0x00000908,
+                0x033, 0x00000023,
+                0x03F, 0x00000D09,
+                0x033, 0x00000024,
+                0x03F, 0x00000D49,
+                0x033, 0x00000025,
+                0x03F, 0x00000D8A,
                 0x033, 0x00000026,
                 0x03F, 0x00000DEB,
                 0x033, 0x00000027,
@@ -9396,9 +11689,27 @@ static const u32 rtw8822c_rf_b[] = {
                 0x0FE, 0x00000000,
                 0x0FE, 0x00000000,
                 0x092, 0x00084800,
-                0x08F, 0x0000182C,
+                0x08F, 0x00001B4C,
                 0x088, 0x0004326B,
                 0x019, 0x00000005,
+                0x0EF, 0x00080000,
+                0x033, 0x00000004,
+                0x03F, 0x000FD83F,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00080000,
+                0x033, 0x00000006,
+                0x03F, 0x000DD83F,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00080000,
+                0x033, 0x00000007,
+                0x03F, 0x000DF7BF,
+                0x0EF, 0x00000000,
+                0x0EF, 0x00040000,
+                0x033, 0x00000006,
+                0x03F, 0x00000002,
+                0x033, 0x00000007,
+                0x03F, 0x00000002,
+                0x0EF, 0x00000000,
 };
 
 RTW_DECL_TABLE_RF_RADIO(rtw8822c_rf_b, B);
@@ -11163,6 +13474,109 @@ static const struct rtw_txpwr_lmt_cfg_pair rtw8822c_txpwr_lmt_type0[] = {
 
 RTW_DECL_TABLE_TXPWR_LMT(rtw8822c_txpwr_lmt_type0);
 
+static const u32 rtw8822c_dpk_afe_no_dpk[] = {
+        0x18a4, BIT(7), 0,
+        0x41a4, BIT(7), 0,
+        0x1c38, MASKDWORD, 0xffa1005e,
+        0x1830, MASKDWORD, 0x700b8041,
+        0x1830, MASKDWORD, 0x70144041,
+        0x1830, MASKDWORD, 0x70244041,
+        0x1830, MASKDWORD, 0x70344041,
+        0x1830, MASKDWORD, 0x70444041,
+        0x1830, MASKDWORD, 0x705b8041,
+        0x1830, MASKDWORD, 0x70644041,
+        0x4130, MASKDWORD, 0x700b8041,
+        0x4130, MASKDWORD, 0x70144041,
+        0x4130, MASKDWORD, 0x70244041,
+        0x4130, MASKDWORD, 0x70344041,
+        0x4130, MASKDWORD, 0x70444041,
+        0x4130, MASKDWORD, 0x705b8041,
+        0x4130, MASKDWORD, 0x70644041,
+        0x1830, MASKDWORD, 0x707b8041,
+        0x1830, MASKDWORD, 0x708b8041,
+        0x1830, MASKDWORD, 0x709b8041,
+        0x1830, MASKDWORD, 0x70ab8041,
+        0x1830, MASKDWORD, 0x70bb8041,
+        0x1830, MASKDWORD, 0x70cb8041,
+        0x1830, MASKDWORD, 0x70db8041,
+        0x1830, MASKDWORD, 0x70eb8041,
+        0x1830, MASKDWORD, 0x70fb8041,
+        0x4130, MASKDWORD, 0x707b8041,
+        0x4130, MASKDWORD, 0x708b8041,
+        0x4130, MASKDWORD, 0x709b8041,
+        0x4130, MASKDWORD, 0x70ab8041,
+        0x4130, MASKDWORD, 0x70bb8041,
+        0x4130, MASKDWORD, 0x70cb8041,
+        0x4130, MASKDWORD, 0x70db8041,
+        0x4130, MASKDWORD, 0x70eb8041,
+        0x4130, MASKDWORD, 0x70fb8041,
+};
+
+RTW_DECL_TABLE_DPK(rtw8822c_dpk_afe_no_dpk);
+
+static const u32 rtw8822c_dpk_afe_is_dpk[] = {
+        0x1c38, MASKDWORD, 0xFFFFFFFF,
+        0x1830, MASKDWORD, 0x700f0001,
+        0x1830, MASKDWORD, 0x700f0001,
+        0x1830, MASKDWORD, 0x701f0001,
+        0x1830, MASKDWORD, 0x702f0001,
+        0x1830, MASKDWORD, 0x703f0001,
+        0x1830, MASKDWORD, 0x704f0001,
+        0x1830, MASKDWORD, 0x705f0001,
+        0x1830, MASKDWORD, 0x706f0001,
+        0x1830, MASKDWORD, 0x707f0001,
+        0x1830, MASKDWORD, 0x708f0001,
+        0x1830, MASKDWORD, 0x709f0001,
+        0x1830, MASKDWORD, 0x70af0001,
+        0x1830, MASKDWORD, 0x70bf0001,
+        0x1830, MASKDWORD, 0x70cf0001,
+        0x1830, MASKDWORD, 0x70df0001,
+        0x1830, MASKDWORD, 0x70ef0001,
+        0x1830, MASKDWORD, 0x70ff0001,
+        0x1830, MASKDWORD, 0x70ff0001,
+        0x4130, MASKDWORD, 0x700f0001,
+        0x4130, MASKDWORD, 0x700f0001,
+        0x4130, MASKDWORD, 0x701f0001,
+        0x4130, MASKDWORD, 0x702f0001,
+        0x4130, MASKDWORD, 0x703f0001,
+        0x4130, MASKDWORD, 0x704f0001,
+        0x4130, MASKDWORD, 0x705f0001,
+        0x4130, MASKDWORD, 0x706f0001,
+        0x4130, MASKDWORD, 0x707f0001,
+        0x4130, MASKDWORD, 0x708f0001,
+        0x4130, MASKDWORD, 0x709f0001,
+        0x4130, MASKDWORD, 0x70af0001,
+        0x4130, MASKDWORD, 0x70bf0001,
+        0x4130, MASKDWORD, 0x70cf0001,
+        0x4130, MASKDWORD, 0x70df0001,
+        0x4130, MASKDWORD, 0x70ef0001,
+        0x4130, MASKDWORD, 0x70ff0001,
+        0x4130, MASKDWORD, 0x70ff0001,
+        0x18a4, BIT(7), 1,
+        0x41a4, BIT(7), 1,
+};
+
+RTW_DECL_TABLE_DPK(rtw8822c_dpk_afe_is_dpk);
+
+static const u32 rtw8822c_dpk_mac_bb[] = {
+        0x1e24, BIT(17), 0x1,
+        0x1d58, GENMASK(11, 3), 0x1ff,
+        0x1864, BIT(31), 0x1,
+        0x4164, BIT(31), 0x1,
+        0x180c, BIT(27), 0x1,
+        0x410c, BIT(27), 0x1,
+        0x186c, BIT(7), 0x1,
+        0x416c, BIT(7), 0x1,
+        0x180c, GENMASK(1, 0), 0x0,
+        0x410c, GENMASK(1, 0), 0x0,
+        0x1a14, GENMASK(9, 8), 0x3,
+        0x80c, GENMASK(3, 0), 0x8,
+        0x824, GENMASK(19, 16), 0x3,
+        0x824, GENMASK(27, 24), 0x3,
+};
+
+RTW_DECL_TABLE_DPK(rtw8822c_dpk_mac_bb);
+
 static const u32 rtw8822c_array_mp_cal_init[] = {
         0x1b00, 0x00000008,
         0x1b00, 0x00A70008,
@@ -11187,6 +13601,7 @@ static const u32 rtw8822c_array_mp_cal_init[] = {
         0x1b9c, 0x00000000,
         0x1bc0, 0x01000000,
         0x1bcc, 0x00000000,
+        0x1bd8, 0xe0000001,
         0x1be4, 0x00000000,
         0x1bec, 0x40000000,
         0x1b40, 0x40000000,
@@ -11450,6 +13865,7 @@ static const u32 rtw8822c_array_mp_cal_init[] = {
         0x1b9c, 0x00000000,
         0x1bc0, 0x01000000,
         0x1bcc, 0x00000000,
+        0x1bd8, 0xe0000001,
         0x1be4, 0x00000000,
         0x1bec, 0x40000000,
         0x1b60, 0x1F100000,
@@ -11656,1656 +14072,1970 @@ static const u32 rtw8822c_array_mp_cal_init[] = {
         0x1b80, 0x00020257,
         0x1b80, 0x30000265,
         0x1b80, 0x30000267,
-        0x1b80, 0xa5100275,
-        0x1b80, 0xa5100277,
-        0x1b80, 0xe3520285,
-        0x1b80, 0xe3520287,
-        0x1b80, 0xf01d0295,
-        0x1b80, 0xf01d0297,
-        0x1b80, 0xf11d02a5,
-        0x1b80, 0xf11d02a7,
-        0x1b80, 0xf21d02b5,
-        0x1b80, 0xf21d02b7,
-        0x1b80, 0xf31d02c5,
-        0x1b80, 0xf31d02c7,
-        0x1b80, 0xf41d02d5,
-        0x1b80, 0xf41d02d7,
-        0x1b80, 0xf51d02e5,
-        0x1b80, 0xf51d02e7,
-        0x1b80, 0xf61d02f5,
-        0x1b80, 0xf61d02f7,
-        0x1b80, 0xf71d0305,
-        0x1b80, 0xf71d0307,
-        0x1b80, 0xf81d0315,
-        0x1b80, 0xf81d0317,
-        0x1b80, 0xf91d0325,
-        0x1b80, 0xf91d0327,
-        0x1b80, 0xfa1d0335,
-        0x1b80, 0xfa1d0337,
-        0x1b80, 0xfb1d0345,
-        0x1b80, 0xfb1d0347,
-        0x1b80, 0xfc1d0355,
-        0x1b80, 0xfc1d0357,
-        0x1b80, 0xfd1d0365,
-        0x1b80, 0xfd1d0367,
-        0x1b80, 0xf21d0375,
-        0x1b80, 0xf21d0377,
-        0x1b80, 0xf31d0385,
-        0x1b80, 0xf31d0387,
-        0x1b80, 0xf41d0395,
-        0x1b80, 0xf41d0397,
-        0x1b80, 0xf51d03a5,
-        0x1b80, 0xf51d03a7,
-        0x1b80, 0xf61d03b5,
-        0x1b80, 0xf61d03b7,
-        0x1b80, 0xf71d03c5,
-        0x1b80, 0xf71d03c7,
-        0x1b80, 0xf81d03d5,
-        0x1b80, 0xf81d03d7,
-        0x1b80, 0xf91d03e5,
-        0x1b80, 0xf91d03e7,
-        0x1b80, 0xfa1d03f5,
-        0x1b80, 0xfa1d03f7,
-        0x1b80, 0xfb1d0405,
-        0x1b80, 0xfb1d0407,
-        0x1b80, 0xfc1d0415,
-        0x1b80, 0xfc1d0417,
-        0x1b80, 0xfd1d0425,
-        0x1b80, 0xfd1d0427,
-        0x1b80, 0xfe1d0435,
-        0x1b80, 0xfe1d0437,
-        0x1b80, 0xff1d0445,
-        0x1b80, 0xff1d0447,
-        0x1b80, 0x00010455,
-        0x1b80, 0x00010457,
-        0x1b80, 0x30620465,
-        0x1b80, 0x30620467,
-        0x1b80, 0x307a0475,
-        0x1b80, 0x307a0477,
-        0x1b80, 0x307c0485,
-        0x1b80, 0x307c0487,
-        0x1b80, 0x30eb0495,
-        0x1b80, 0x30eb0497,
-        0x1b80, 0x308004a5,
-        0x1b80, 0x308004a7,
-        0x1b80, 0x308c04b5,
-        0x1b80, 0x308c04b7,
-        0x1b80, 0x309804c5,
-        0x1b80, 0x309804c7,
-        0x1b80, 0x307f04d5,
-        0x1b80, 0x307f04d7,
-        0x1b80, 0x308b04e5,
-        0x1b80, 0x308b04e7,
-        0x1b80, 0x309704f5,
-        0x1b80, 0x309704f7,
-        0x1b80, 0x30ef0505,
-        0x1b80, 0x30ef0507,
-        0x1b80, 0x30fa0515,
-        0x1b80, 0x30fa0517,
-        0x1b80, 0x31050525,
-        0x1b80, 0x31050527,
-        0x1b80, 0x316a0535,
-        0x1b80, 0x316a0537,
-        0x1b80, 0x307a0545,
-        0x1b80, 0x307a0547,
-        0x1b80, 0x30e90555,
-        0x1b80, 0x30e90557,
-        0x1b80, 0x31870565,
-        0x1b80, 0x31870567,
-        0x1b80, 0x31a00575,
-        0x1b80, 0x31a00577,
-        0x1b80, 0x31ba0585,
-        0x1b80, 0x31ba0587,
-        0x1b80, 0x31c20595,
-        0x1b80, 0x31c20597,
-        0x1b80, 0x31ca05a5,
-        0x1b80, 0x31ca05a7,
-        0x1b80, 0x31d205b5,
-        0x1b80, 0x31d205b7,
-        0x1b80, 0x31da05c5,
-        0x1b80, 0x31da05c7,
-        0x1b80, 0x31e905d5,
-        0x1b80, 0x31e905d7,
-        0x1b80, 0x31f805e5,
-        0x1b80, 0x31f805e7,
-        0x1b80, 0x31fe05f5,
-        0x1b80, 0x31fe05f7,
-        0x1b80, 0x32040605,
-        0x1b80, 0x32040607,
-        0x1b80, 0x320a0615,
-        0x1b80, 0x320a0617,
-        0x1b80, 0xe2eb0625,
-        0x1b80, 0xe2eb0627,
-        0x1b80, 0x4d040635,
-        0x1b80, 0x4d040637,
-        0x1b80, 0x20800645,
-        0x1b80, 0x20800647,
-        0x1b80, 0x00000655,
-        0x1b80, 0x00000657,
-        0x1b80, 0x4d000665,
-        0x1b80, 0x4d000667,
-        0x1b80, 0x55070675,
-        0x1b80, 0x55070677,
-        0x1b80, 0xe2e30685,
-        0x1b80, 0xe2e30687,
-        0x1b80, 0xe2e30695,
-        0x1b80, 0xe2e30697,
-        0x1b80, 0x4d0406a5,
-        0x1b80, 0x4d0406a7,
-        0x1b80, 0x208806b5,
-        0x1b80, 0x208806b7,
-        0x1b80, 0x020006c5,
-        0x1b80, 0x020006c7,
-        0x1b80, 0x4d0006d5,
-        0x1b80, 0x4d0006d7,
-        0x1b80, 0x550f06e5,
-        0x1b80, 0x550f06e7,
-        0x1b80, 0xe2e306f5,
-        0x1b80, 0xe2e306f7,
-        0x1b80, 0x4f020705,
-        0x1b80, 0x4f020707,
-        0x1b80, 0x4e000715,
-        0x1b80, 0x4e000717,
-        0x1b80, 0x53020725,
-        0x1b80, 0x53020727,
-        0x1b80, 0x52010735,
-        0x1b80, 0x52010737,
-        0x1b80, 0xe2e70745,
-        0x1b80, 0xe2e70747,
-        0x1b80, 0x4d080755,
-        0x1b80, 0x4d080757,
-        0x1b80, 0x57100765,
-        0x1b80, 0x57100767,
-        0x1b80, 0x57000775,
-        0x1b80, 0x57000777,
-        0x1b80, 0x4d000785,
-        0x1b80, 0x4d000787,
-        0x1b80, 0x00010795,
-        0x1b80, 0x00010797,
-        0x1b80, 0xe2eb07a5,
-        0x1b80, 0xe2eb07a7,
-        0x1b80, 0x000107b5,
-        0x1b80, 0x000107b7,
-        0x1b80, 0x620607c5,
-        0x1b80, 0x620607c7,
-        0x1b80, 0xe2eb07d5,
-        0x1b80, 0xe2eb07d7,
-        0x1b80, 0x000107e5,
-        0x1b80, 0x000107e7,
-        0x1b80, 0x620607f5,
-        0x1b80, 0x620607f7,
-        0x1b80, 0x30ad0805,
-        0x1b80, 0x30ad0807,
-        0x1b80, 0x00260815,
-        0x1b80, 0x00260817,
-        0x1b80, 0xe3450825,
-        0x1b80, 0xe3450827,
-        0x1b80, 0x00020835,
-        0x1b80, 0x00020837,
-        0x1b80, 0x54ec0845,
-        0x1b80, 0x54ec0847,
-        0x1b80, 0x0ba60855,
-        0x1b80, 0x0ba60857,
-        0x1b80, 0x00260865,
-        0x1b80, 0x00260867,
-        0x1b80, 0xe3450875,
-        0x1b80, 0xe3450877,
-        0x1b80, 0x00020885,
-        0x1b80, 0x00020887,
-        0x1b80, 0x63c30895,
-        0x1b80, 0x63c30897,
-        0x1b80, 0x30d908a5,
-        0x1b80, 0x30d908a7,
-        0x1b80, 0x620608b5,
-        0x1b80, 0x620608b7,
-        0x1b80, 0x30a508c5,
-        0x1b80, 0x30a508c7,
-        0x1b80, 0x002408d5,
-        0x1b80, 0x002408d7,
-        0x1b80, 0xe34508e5,
-        0x1b80, 0xe34508e7,
-        0x1b80, 0x000208f5,
-        0x1b80, 0x000208f7,
-        0x1b80, 0x54ea0905,
-        0x1b80, 0x54ea0907,
-        0x1b80, 0x0ba60915,
-        0x1b80, 0x0ba60917,
-        0x1b80, 0x00240925,
-        0x1b80, 0x00240927,
-        0x1b80, 0xe3450935,
-        0x1b80, 0xe3450937,
-        0x1b80, 0x00020945,
-        0x1b80, 0x00020947,
-        0x1b80, 0x63c30955,
-        0x1b80, 0x63c30957,
-        0x1b80, 0x30d90965,
-        0x1b80, 0x30d90967,
+        0x1b80, 0xa5110275,
+        0x1b80, 0xa5110277,
+        0x1b80, 0xe3ef0285,
+        0x1b80, 0xe3ef0287,
+        0x1b80, 0xf01f0295,
+        0x1b80, 0xf01f0297,
+        0x1b80, 0xf11f02a5,
+        0x1b80, 0xf11f02a7,
+        0x1b80, 0xf21f02b5,
+        0x1b80, 0xf21f02b7,
+        0x1b80, 0xf31f02c5,
+        0x1b80, 0xf31f02c7,
+        0x1b80, 0xf41f02d5,
+        0x1b80, 0xf41f02d7,
+        0x1b80, 0xf51f02e5,
+        0x1b80, 0xf51f02e7,
+        0x1b80, 0xf61f02f5,
+        0x1b80, 0xf61f02f7,
+        0x1b80, 0xf71f0305,
+        0x1b80, 0xf71f0307,
+        0x1b80, 0xf81f0315,
+        0x1b80, 0xf81f0317,
+        0x1b80, 0xf91f0325,
+        0x1b80, 0xf91f0327,
+        0x1b80, 0xfa1f0335,
+        0x1b80, 0xfa1f0337,
+        0x1b80, 0xfb1f0345,
+        0x1b80, 0xfb1f0347,
+        0x1b80, 0xfc1f0355,
+        0x1b80, 0xfc1f0357,
+        0x1b80, 0xfd1f0365,
+        0x1b80, 0xfd1f0367,
+        0x1b80, 0xfe1f0375,
+        0x1b80, 0xfe1f0377,
+        0x1b80, 0xf11f0385,
+        0x1b80, 0xf11f0387,
+        0x1b80, 0xf21f0395,
+        0x1b80, 0xf21f0397,
+        0x1b80, 0xf31f03a5,
+        0x1b80, 0xf31f03a7,
+        0x1b80, 0xf41f03b5,
+        0x1b80, 0xf41f03b7,
+        0x1b80, 0xf51f03c5,
+        0x1b80, 0xf51f03c7,
+        0x1b80, 0xf61f03d5,
+        0x1b80, 0xf61f03d7,
+        0x1b80, 0xf71f03e5,
+        0x1b80, 0xf71f03e7,
+        0x1b80, 0xf81f03f5,
+        0x1b80, 0xf81f03f7,
+        0x1b80, 0xf91f0405,
+        0x1b80, 0xf91f0407,
+        0x1b80, 0xfa1f0415,
+        0x1b80, 0xfa1f0417,
+        0x1b80, 0xfb1f0425,
+        0x1b80, 0xfb1f0427,
+        0x1b80, 0xfc1f0435,
+        0x1b80, 0xfc1f0437,
+        0x1b80, 0xfd1f0445,
+        0x1b80, 0xfd1f0447,
+        0x1b80, 0xfe1f0455,
+        0x1b80, 0xfe1f0457,
+        0x1b80, 0xff1f0465,
+        0x1b80, 0xff1f0467,
+        0x1b80, 0x00010475,
+        0x1b80, 0x00010477,
+        0x1b80, 0x30660485,
+        0x1b80, 0x30660487,
+        0x1b80, 0x307e0495,
+        0x1b80, 0x307e0497,
+        0x1b80, 0x308204a5,
+        0x1b80, 0x308204a7,
+        0x1b80, 0x310c04b5,
+        0x1b80, 0x310c04b7,
+        0x1b80, 0x308904c5,
+        0x1b80, 0x308904c7,
+        0x1b80, 0x309804d5,
+        0x1b80, 0x309804d7,
+        0x1b80, 0x30a704e5,
+        0x1b80, 0x30a704e7,
+        0x1b80, 0x308804f5,
+        0x1b80, 0x308804f7,
+        0x1b80, 0x30970505,
+        0x1b80, 0x30970507,
+        0x1b80, 0x30a60515,
+        0x1b80, 0x30a60517,
+        0x1b80, 0x31100525,
+        0x1b80, 0x31100527,
+        0x1b80, 0x311b0535,
+        0x1b80, 0x311b0537,
+        0x1b80, 0x31260545,
+        0x1b80, 0x31260547,
+        0x1b80, 0x31ae0555,
+        0x1b80, 0x31ae0557,
+        0x1b80, 0x318b0565,
+        0x1b80, 0x318b0567,
+        0x1b80, 0x31cb0575,
+        0x1b80, 0x31cb0577,
+        0x1b80, 0x307e0585,
+        0x1b80, 0x307e0587,
+        0x1b80, 0x310a0595,
+        0x1b80, 0x310a0597,
+        0x1b80, 0x31db05a5,
+        0x1b80, 0x31db05a7,
+        0x1b80, 0x31f405b5,
+        0x1b80, 0x31f405b7,
+        0x1b80, 0x320e05c5,
+        0x1b80, 0x320e05c7,
+        0x1b80, 0x321605d5,
+        0x1b80, 0x321605d7,
+        0x1b80, 0x321e05e5,
+        0x1b80, 0x321e05e7,
+        0x1b80, 0x322605f5,
+        0x1b80, 0x322605f7,
+        0x1b80, 0x322e0605,
+        0x1b80, 0x322e0607,
+        0x1b80, 0x323d0615,
+        0x1b80, 0x323d0617,
+        0x1b80, 0x324c0625,
+        0x1b80, 0x324c0627,
+        0x1b80, 0x32520635,
+        0x1b80, 0x32520637,
+        0x1b80, 0x32580645,
+        0x1b80, 0x32580647,
+        0x1b80, 0x325e0655,
+        0x1b80, 0x325e0657,
+        0x1b80, 0xe3880665,
+        0x1b80, 0xe3880667,
+        0x1b80, 0x4d040675,
+        0x1b80, 0x4d040677,
+        0x1b80, 0x20800685,
+        0x1b80, 0x20800687,
+        0x1b80, 0x00000695,
+        0x1b80, 0x00000697,
+        0x1b80, 0x4d0006a5,
+        0x1b80, 0x4d0006a7,
+        0x1b80, 0x550706b5,
+        0x1b80, 0x550706b7,
+        0x1b80, 0xe38006c5,
+        0x1b80, 0xe38006c7,
+        0x1b80, 0xe38006d5,
+        0x1b80, 0xe38006d7,
+        0x1b80, 0x4d0406e5,
+        0x1b80, 0x4d0406e7,
+        0x1b80, 0x208806f5,
+        0x1b80, 0x208806f7,
+        0x1b80, 0x02000705,
+        0x1b80, 0x02000707,
+        0x1b80, 0x4d000715,
+        0x1b80, 0x4d000717,
+        0x1b80, 0x550f0725,
+        0x1b80, 0x550f0727,
+        0x1b80, 0xe3800735,
+        0x1b80, 0xe3800737,
+        0x1b80, 0x4f020745,
+        0x1b80, 0x4f020747,
+        0x1b80, 0x4e000755,
+        0x1b80, 0x4e000757,
+        0x1b80, 0x53020765,
+        0x1b80, 0x53020767,
+        0x1b80, 0x52010775,
+        0x1b80, 0x52010777,
+        0x1b80, 0xe3840785,
+        0x1b80, 0xe3840787,
+        0x1b80, 0x4d080795,
+        0x1b80, 0x4d080797,
+        0x1b80, 0x571007a5,
+        0x1b80, 0x571007a7,
+        0x1b80, 0x570007b5,
+        0x1b80, 0x570007b7,
+        0x1b80, 0x4d0007c5,
+        0x1b80, 0x4d0007c7,
+        0x1b80, 0x000107d5,
+        0x1b80, 0x000107d7,
+        0x1b80, 0xe38807e5,
+        0x1b80, 0xe38807e7,
+        0x1b80, 0x0bbd07f5,
+        0x1b80, 0x0bbd07f7,
+        0x1b80, 0xe3e20805,
+        0x1b80, 0xe3e20807,
+        0x1b80, 0x00010815,
+        0x1b80, 0x00010817,
+        0x1b80, 0x62060825,
+        0x1b80, 0x62060827,
+        0x1b80, 0xe3880835,
+        0x1b80, 0xe3880837,
+        0x1b80, 0x0bbd0845,
+        0x1b80, 0x0bbd0847,
+        0x1b80, 0xe3e20855,
+        0x1b80, 0xe3e20857,
+        0x1b80, 0x00010865,
+        0x1b80, 0x00010867,
+        0x1b80, 0x00010875,
+        0x1b80, 0x00010877,
+        0x1b80, 0x62060885,
+        0x1b80, 0x62060887,
+        0x1b80, 0x30bc0895,
+        0x1b80, 0x30bc0897,
+        0x1b80, 0x002608a5,
+        0x1b80, 0x002608a7,
+        0x1b80, 0xe3e208b5,
+        0x1b80, 0xe3e208b7,
+        0x1b80, 0x000208c5,
+        0x1b80, 0x000208c7,
+        0x1b80, 0x54ec08d5,
+        0x1b80, 0x54ec08d7,
+        0x1b80, 0x0ba608e5,
+        0x1b80, 0x0ba608e7,
+        0x1b80, 0x002608f5,
+        0x1b80, 0x002608f7,
+        0x1b80, 0xe3e20905,
+        0x1b80, 0xe3e20907,
+        0x1b80, 0x00020915,
+        0x1b80, 0x00020917,
+        0x1b80, 0xf7f50925,
+        0x1b80, 0xf7f50927,
+        0x1b80, 0x00300935,
+        0x1b80, 0x00300937,
+        0x1b80, 0x63c30945,
+        0x1b80, 0x63c30947,
+        0x1b80, 0x00020955,
+        0x1b80, 0x00020957,
+        0x1b80, 0x318b0965,
+        0x1b80, 0x318b0967,
         0x1b80, 0x62060975,
         0x1b80, 0x62060977,
-        0x1b80, 0x6c100985,
-        0x1b80, 0x6c100987,
-        0x1b80, 0x6d0f0995,
-        0x1b80, 0x6d0f0997,
-        0x1b80, 0xe2eb09a5,
-        0x1b80, 0xe2eb09a7,
-        0x1b80, 0xe34509b5,
-        0x1b80, 0xe34509b7,
-        0x1b80, 0x6c2409c5,
-        0x1b80, 0x6c2409c7,
-        0x1b80, 0xe2eb09d5,
-        0x1b80, 0xe2eb09d7,
-        0x1b80, 0xe34509e5,
-        0x1b80, 0xe34509e7,
-        0x1b80, 0x6c4409f5,
-        0x1b80, 0x6c4409f7,
-        0x1b80, 0xe2eb0a05,
-        0x1b80, 0xe2eb0a07,
-        0x1b80, 0xe3450a15,
-        0x1b80, 0xe3450a17,
-        0x1b80, 0x6c640a25,
-        0x1b80, 0x6c640a27,
-        0x1b80, 0xe2eb0a35,
-        0x1b80, 0xe2eb0a37,
-        0x1b80, 0xe3450a45,
-        0x1b80, 0xe3450a47,
-        0x1b80, 0x0baa0a55,
-        0x1b80, 0x0baa0a57,
-        0x1b80, 0x6c840a65,
-        0x1b80, 0x6c840a67,
-        0x1b80, 0x6d0f0a75,
-        0x1b80, 0x6d0f0a77,
-        0x1b80, 0xe2eb0a85,
-        0x1b80, 0xe2eb0a87,
-        0x1b80, 0xe3450a95,
-        0x1b80, 0xe3450a97,
-        0x1b80, 0x6ca40aa5,
-        0x1b80, 0x6ca40aa7,
-        0x1b80, 0xe2eb0ab5,
-        0x1b80, 0xe2eb0ab7,
-        0x1b80, 0xe3450ac5,
-        0x1b80, 0xe3450ac7,
-        0x1b80, 0x0bac0ad5,
-        0x1b80, 0x0bac0ad7,
-        0x1b80, 0x6cc40ae5,
-        0x1b80, 0x6cc40ae7,
-        0x1b80, 0x6d0f0af5,
-        0x1b80, 0x6d0f0af7,
-        0x1b80, 0xe2eb0b05,
-        0x1b80, 0xe2eb0b07,
-        0x1b80, 0xe3450b15,
-        0x1b80, 0xe3450b17,
-        0x1b80, 0x6ce40b25,
-        0x1b80, 0x6ce40b27,
-        0x1b80, 0xe2eb0b35,
-        0x1b80, 0xe2eb0b37,
-        0x1b80, 0xe3450b45,
-        0x1b80, 0xe3450b47,
-        0x1b80, 0x6cf40b55,
-        0x1b80, 0x6cf40b57,
-        0x1b80, 0xe2eb0b65,
-        0x1b80, 0xe2eb0b67,
-        0x1b80, 0xe3450b75,
-        0x1b80, 0xe3450b77,
-        0x1b80, 0x6c0c0b85,
-        0x1b80, 0x6c0c0b87,
-        0x1b80, 0x6d000b95,
-        0x1b80, 0x6d000b97,
-        0x1b80, 0xe2eb0ba5,
-        0x1b80, 0xe2eb0ba7,
-        0x1b80, 0xe3450bb5,
-        0x1b80, 0xe3450bb7,
-        0x1b80, 0x6c1c0bc5,
-        0x1b80, 0x6c1c0bc7,
-        0x1b80, 0xe2eb0bd5,
-        0x1b80, 0xe2eb0bd7,
-        0x1b80, 0xe3450be5,
-        0x1b80, 0xe3450be7,
-        0x1b80, 0x6c3c0bf5,
-        0x1b80, 0x6c3c0bf7,
-        0x1b80, 0xe2eb0c05,
-        0x1b80, 0xe2eb0c07,
-        0x1b80, 0xe3450c15,
-        0x1b80, 0xe3450c17,
-        0x1b80, 0xf4bf0c25,
-        0x1b80, 0xf4bf0c27,
-        0x1b80, 0xf7be0c35,
-        0x1b80, 0xf7be0c37,
-        0x1b80, 0x6c5c0c45,
-        0x1b80, 0x6c5c0c47,
-        0x1b80, 0xe2eb0c55,
-        0x1b80, 0xe2eb0c57,
-        0x1b80, 0xe3450c65,
-        0x1b80, 0xe3450c67,
-        0x1b80, 0x6c7c0c75,
-        0x1b80, 0x6c7c0c77,
-        0x1b80, 0xe2eb0c85,
-        0x1b80, 0xe2eb0c87,
-        0x1b80, 0xe3450c95,
-        0x1b80, 0xe3450c97,
-        0x1b80, 0xf5c30ca5,
-        0x1b80, 0xf5c30ca7,
-        0x1b80, 0xf8c20cb5,
-        0x1b80, 0xf8c20cb7,
-        0x1b80, 0x6c9c0cc5,
-        0x1b80, 0x6c9c0cc7,
-        0x1b80, 0xe2eb0cd5,
-        0x1b80, 0xe2eb0cd7,
-        0x1b80, 0xe3450ce5,
-        0x1b80, 0xe3450ce7,
-        0x1b80, 0x6cbc0cf5,
-        0x1b80, 0x6cbc0cf7,
-        0x1b80, 0xe2eb0d05,
-        0x1b80, 0xe2eb0d07,
-        0x1b80, 0xe3450d15,
-        0x1b80, 0xe3450d17,
-        0x1b80, 0x6cdc0d25,
-        0x1b80, 0x6cdc0d27,
-        0x1b80, 0xe2eb0d35,
-        0x1b80, 0xe2eb0d37,
-        0x1b80, 0xe3450d45,
-        0x1b80, 0xe3450d47,
-        0x1b80, 0x6cf00d55,
-        0x1b80, 0x6cf00d57,
-        0x1b80, 0xe2eb0d65,
-        0x1b80, 0xe2eb0d67,
-        0x1b80, 0xe3450d75,
-        0x1b80, 0xe3450d77,
-        0x1b80, 0x63c30d85,
-        0x1b80, 0x63c30d87,
-        0x1b80, 0x55010d95,
-        0x1b80, 0x55010d97,
-        0x1b80, 0x57040da5,
-        0x1b80, 0x57040da7,
-        0x1b80, 0x57000db5,
-        0x1b80, 0x57000db7,
-        0x1b80, 0x96000dc5,
-        0x1b80, 0x96000dc7,
-        0x1b80, 0x57080dd5,
-        0x1b80, 0x57080dd7,
-        0x1b80, 0x57000de5,
-        0x1b80, 0x57000de7,
-        0x1b80, 0x95000df5,
-        0x1b80, 0x95000df7,
-        0x1b80, 0x4d000e05,
-        0x1b80, 0x4d000e07,
-        0x1b80, 0x63050e15,
-        0x1b80, 0x63050e17,
-        0x1b80, 0x7b400e25,
-        0x1b80, 0x7b400e27,
-        0x1b80, 0x7a000e35,
-        0x1b80, 0x7a000e37,
-        0x1b80, 0x79000e45,
-        0x1b80, 0x79000e47,
-        0x1b80, 0x7f400e55,
-        0x1b80, 0x7f400e57,
-        0x1b80, 0x7e000e65,
-        0x1b80, 0x7e000e67,
-        0x1b80, 0x7d000e75,
-        0x1b80, 0x7d000e77,
-        0x1b80, 0x00010e85,
-        0x1b80, 0x00010e87,
-        0x1b80, 0xe3170e95,
-        0x1b80, 0xe3170e97,
-        0x1b80, 0x00010ea5,
-        0x1b80, 0x00010ea7,
-        0x1b80, 0x5c320eb5,
-        0x1b80, 0x5c320eb7,
-        0x1b80, 0xe3410ec5,
-        0x1b80, 0xe3410ec7,
-        0x1b80, 0xe3170ed5,
-        0x1b80, 0xe3170ed7,
-        0x1b80, 0x00010ee5,
-        0x1b80, 0x00010ee7,
-        0x1b80, 0x31260ef5,
-        0x1b80, 0x31260ef7,
-        0x1b80, 0x00260f05,
-        0x1b80, 0x00260f07,
-        0x1b80, 0xe34a0f15,
-        0x1b80, 0xe34a0f17,
-        0x1b80, 0x00020f25,
-        0x1b80, 0x00020f27,
-        0x1b80, 0x54ec0f35,
-        0x1b80, 0x54ec0f37,
-        0x1b80, 0x0ba60f45,
-        0x1b80, 0x0ba60f47,
-        0x1b80, 0x00260f55,
-        0x1b80, 0x00260f57,
-        0x1b80, 0xe34a0f65,
-        0x1b80, 0xe34a0f67,
-        0x1b80, 0x00020f75,
-        0x1b80, 0x00020f77,
-        0x1b80, 0x63830f85,
-        0x1b80, 0x63830f87,
-        0x1b80, 0x30d90f95,
-        0x1b80, 0x30d90f97,
-        0x1b80, 0x311a0fa5,
-        0x1b80, 0x311a0fa7,
-        0x1b80, 0x00240fb5,
-        0x1b80, 0x00240fb7,
-        0x1b80, 0xe34a0fc5,
-        0x1b80, 0xe34a0fc7,
-        0x1b80, 0x00020fd5,
-        0x1b80, 0x00020fd7,
-        0x1b80, 0x54ea0fe5,
-        0x1b80, 0x54ea0fe7,
-        0x1b80, 0x0ba60ff5,
-        0x1b80, 0x0ba60ff7,
-        0x1b80, 0x00241005,
-        0x1b80, 0x00241007,
-        0x1b80, 0xe34a1015,
-        0x1b80, 0xe34a1017,
-        0x1b80, 0x00021025,
-        0x1b80, 0x00021027,
-        0x1b80, 0x63831035,
-        0x1b80, 0x63831037,
-        0x1b80, 0x30d91045,
-        0x1b80, 0x30d91047,
-        0x1b80, 0x5c321055,
-        0x1b80, 0x5c321057,
-        0x1b80, 0x54e61065,
-        0x1b80, 0x54e61067,
-        0x1b80, 0x6e101075,
-        0x1b80, 0x6e101077,
-        0x1b80, 0x6f0f1085,
-        0x1b80, 0x6f0f1087,
-        0x1b80, 0xe3171095,
-        0x1b80, 0xe3171097,
-        0x1b80, 0xe34a10a5,
-        0x1b80, 0xe34a10a7,
-        0x1b80, 0x5c3210b5,
-        0x1b80, 0x5c3210b7,
-        0x1b80, 0x54e710c5,
-        0x1b80, 0x54e710c7,
-        0x1b80, 0x6e2410d5,
-        0x1b80, 0x6e2410d7,
-        0x1b80, 0xe31710e5,
-        0x1b80, 0xe31710e7,
-        0x1b80, 0xe34a10f5,
-        0x1b80, 0xe34a10f7,
-        0x1b80, 0x5c321105,
-        0x1b80, 0x5c321107,
-        0x1b80, 0x54e81115,
-        0x1b80, 0x54e81117,
-        0x1b80, 0x6e441125,
-        0x1b80, 0x6e441127,
-        0x1b80, 0xe3171135,
-        0x1b80, 0xe3171137,
-        0x1b80, 0xe34a1145,
-        0x1b80, 0xe34a1147,
-        0x1b80, 0x5c321155,
-        0x1b80, 0x5c321157,
-        0x1b80, 0x54e91165,
-        0x1b80, 0x54e91167,
-        0x1b80, 0x6e641175,
-        0x1b80, 0x6e641177,
-        0x1b80, 0xe3171185,
-        0x1b80, 0xe3171187,
-        0x1b80, 0xe34a1195,
-        0x1b80, 0xe34a1197,
-        0x1b80, 0x5c3211a5,
-        0x1b80, 0x5c3211a7,
-        0x1b80, 0x54ea11b5,
-        0x1b80, 0x54ea11b7,
-        0x1b80, 0x0baa11c5,
-        0x1b80, 0x0baa11c7,
-        0x1b80, 0x6e8411d5,
-        0x1b80, 0x6e8411d7,
-        0x1b80, 0x6f0f11e5,
-        0x1b80, 0x6f0f11e7,
-        0x1b80, 0xe31711f5,
-        0x1b80, 0xe31711f7,
-        0x1b80, 0xe34a1205,
-        0x1b80, 0xe34a1207,
-        0x1b80, 0x5c321215,
-        0x1b80, 0x5c321217,
-        0x1b80, 0x54eb1225,
-        0x1b80, 0x54eb1227,
-        0x1b80, 0x6ea41235,
-        0x1b80, 0x6ea41237,
-        0x1b80, 0xe3171245,
-        0x1b80, 0xe3171247,
-        0x1b80, 0xe34a1255,
-        0x1b80, 0xe34a1257,
+        0x1b80, 0x30b40985,
+        0x1b80, 0x30b40987,
+        0x1b80, 0x00240995,
+        0x1b80, 0x00240997,
+        0x1b80, 0xe3e209a5,
+        0x1b80, 0xe3e209a7,
+        0x1b80, 0x000209b5,
+        0x1b80, 0x000209b7,
+        0x1b80, 0x54ea09c5,
+        0x1b80, 0x54ea09c7,
+        0x1b80, 0x0ba609d5,
+        0x1b80, 0x0ba609d7,
+        0x1b80, 0x002409e5,
+        0x1b80, 0x002409e7,
+        0x1b80, 0xe3e209f5,
+        0x1b80, 0xe3e209f7,
+        0x1b80, 0x00020a05,
+        0x1b80, 0x00020a07,
+        0x1b80, 0xf8e60a15,
+        0x1b80, 0xf8e60a17,
+        0x1b80, 0x00300a25,
+        0x1b80, 0x00300a27,
+        0x1b80, 0x63c30a35,
+        0x1b80, 0x63c30a37,
+        0x1b80, 0x00020a45,
+        0x1b80, 0x00020a47,
+        0x1b80, 0x318b0a55,
+        0x1b80, 0x318b0a57,
+        0x1b80, 0x62060a65,
+        0x1b80, 0x62060a67,
+        0x1b80, 0x6c100a75,
+        0x1b80, 0x6c100a77,
+        0x1b80, 0x6d0f0a85,
+        0x1b80, 0x6d0f0a87,
+        0x1b80, 0xe3880a95,
+        0x1b80, 0xe3880a97,
+        0x1b80, 0xe3e20aa5,
+        0x1b80, 0xe3e20aa7,
+        0x1b80, 0x6c240ab5,
+        0x1b80, 0x6c240ab7,
+        0x1b80, 0xe3880ac5,
+        0x1b80, 0xe3880ac7,
+        0x1b80, 0xe3e20ad5,
+        0x1b80, 0xe3e20ad7,
+        0x1b80, 0x6c440ae5,
+        0x1b80, 0x6c440ae7,
+        0x1b80, 0xe3880af5,
+        0x1b80, 0xe3880af7,
+        0x1b80, 0xe3e20b05,
+        0x1b80, 0xe3e20b07,
+        0x1b80, 0x6c640b15,
+        0x1b80, 0x6c640b17,
+        0x1b80, 0xe3880b25,
+        0x1b80, 0xe3880b27,
+        0x1b80, 0xe3e20b35,
+        0x1b80, 0xe3e20b37,
+        0x1b80, 0x0baa0b45,
+        0x1b80, 0x0baa0b47,
+        0x1b80, 0x6c840b55,
+        0x1b80, 0x6c840b57,
+        0x1b80, 0x6d0f0b65,
+        0x1b80, 0x6d0f0b67,
+        0x1b80, 0xe3880b75,
+        0x1b80, 0xe3880b77,
+        0x1b80, 0xe3e20b85,
+        0x1b80, 0xe3e20b87,
+        0x1b80, 0x6ca40b95,
+        0x1b80, 0x6ca40b97,
+        0x1b80, 0xe3880ba5,
+        0x1b80, 0xe3880ba7,
+        0x1b80, 0xe3e20bb5,
+        0x1b80, 0xe3e20bb7,
+        0x1b80, 0x0bac0bc5,
+        0x1b80, 0x0bac0bc7,
+        0x1b80, 0x6cc40bd5,
+        0x1b80, 0x6cc40bd7,
+        0x1b80, 0x6d0f0be5,
+        0x1b80, 0x6d0f0be7,
+        0x1b80, 0xe3880bf5,
+        0x1b80, 0xe3880bf7,
+        0x1b80, 0xe3e20c05,
+        0x1b80, 0xe3e20c07,
+        0x1b80, 0x6ce40c15,
+        0x1b80, 0x6ce40c17,
+        0x1b80, 0xe3880c25,
+        0x1b80, 0xe3880c27,
+        0x1b80, 0xe3e20c35,
+        0x1b80, 0xe3e20c37,
+        0x1b80, 0x6cf40c45,
+        0x1b80, 0x6cf40c47,
+        0x1b80, 0xe3880c55,
+        0x1b80, 0xe3880c57,
+        0x1b80, 0xe3e20c65,
+        0x1b80, 0xe3e20c67,
+        0x1b80, 0x6c0c0c75,
+        0x1b80, 0x6c0c0c77,
+        0x1b80, 0x6d000c85,
+        0x1b80, 0x6d000c87,
+        0x1b80, 0xe3880c95,
+        0x1b80, 0xe3880c97,
+        0x1b80, 0xe3e20ca5,
+        0x1b80, 0xe3e20ca7,
+        0x1b80, 0x6c1c0cb5,
+        0x1b80, 0x6c1c0cb7,
+        0x1b80, 0xe3880cc5,
+        0x1b80, 0xe3880cc7,
+        0x1b80, 0xe3e20cd5,
+        0x1b80, 0xe3e20cd7,
+        0x1b80, 0x6c3c0ce5,
+        0x1b80, 0x6c3c0ce7,
+        0x1b80, 0xe3880cf5,
+        0x1b80, 0xe3880cf7,
+        0x1b80, 0xe3e20d05,
+        0x1b80, 0xe3e20d07,
+        0x1b80, 0xf4b90d15,
+        0x1b80, 0xf4b90d17,
+        0x1b80, 0xf7b80d25,
+        0x1b80, 0xf7b80d27,
+        0x1b80, 0x6c5c0d35,
+        0x1b80, 0x6c5c0d37,
+        0x1b80, 0xe3880d45,
+        0x1b80, 0xe3880d47,
+        0x1b80, 0xe3e20d55,
+        0x1b80, 0xe3e20d57,
+        0x1b80, 0x6c7c0d65,
+        0x1b80, 0x6c7c0d67,
+        0x1b80, 0xe3880d75,
+        0x1b80, 0xe3880d77,
+        0x1b80, 0xe3e20d85,
+        0x1b80, 0xe3e20d87,
+        0x1b80, 0xf5c00d95,
+        0x1b80, 0xf5c00d97,
+        0x1b80, 0xf8bf0da5,
+        0x1b80, 0xf8bf0da7,
+        0x1b80, 0x6c9c0db5,
+        0x1b80, 0x6c9c0db7,
+        0x1b80, 0xe3880dc5,
+        0x1b80, 0xe3880dc7,
+        0x1b80, 0xe3e20dd5,
+        0x1b80, 0xe3e20dd7,
+        0x1b80, 0x6cbc0de5,
+        0x1b80, 0x6cbc0de7,
+        0x1b80, 0xe3880df5,
+        0x1b80, 0xe3880df7,
+        0x1b80, 0xe3e20e05,
+        0x1b80, 0xe3e20e07,
+        0x1b80, 0x6cdc0e15,
+        0x1b80, 0x6cdc0e17,
+        0x1b80, 0xe3880e25,
+        0x1b80, 0xe3880e27,
+        0x1b80, 0xe3e20e35,
+        0x1b80, 0xe3e20e37,
+        0x1b80, 0x6cf00e45,
+        0x1b80, 0x6cf00e47,
+        0x1b80, 0xe3880e55,
+        0x1b80, 0xe3880e57,
+        0x1b80, 0xe3e20e65,
+        0x1b80, 0xe3e20e67,
+        0x1b80, 0xf9a00e75,
+        0x1b80, 0xf9a00e77,
+        0x1b80, 0x00300e85,
+        0x1b80, 0x00300e87,
+        0x1b80, 0x63c30e95,
+        0x1b80, 0x63c30e97,
+        0x1b80, 0x00020ea5,
+        0x1b80, 0x00020ea7,
+        0x1b80, 0x318b0eb5,
+        0x1b80, 0x318b0eb7,
+        0x1b80, 0x00300ec5,
+        0x1b80, 0x00300ec7,
+        0x1b80, 0x00000ed5,
+        0x1b80, 0x00000ed7,
+        0x1b80, 0x00020ee5,
+        0x1b80, 0x00020ee7,
+        0x1b80, 0x55010ef5,
+        0x1b80, 0x55010ef7,
+        0x1b80, 0x57040f05,
+        0x1b80, 0x57040f07,
+        0x1b80, 0x57000f15,
+        0x1b80, 0x57000f17,
+        0x1b80, 0x96000f25,
+        0x1b80, 0x96000f27,
+        0x1b80, 0x00070f35,
+        0x1b80, 0x00070f37,
+        0x1b80, 0x5be00f45,
+        0x1b80, 0x5be00f47,
+        0x1b80, 0x5a000f55,
+        0x1b80, 0x5a000f57,
+        0x1b80, 0x59000f65,
+        0x1b80, 0x59000f67,
+        0x1b80, 0x58000f75,
+        0x1b80, 0x58000f77,
+        0x1b80, 0x00040f85,
+        0x1b80, 0x00040f87,
+        0x1b80, 0x57080f95,
+        0x1b80, 0x57080f97,
+        0x1b80, 0x57000fa5,
+        0x1b80, 0x57000fa7,
+        0x1b80, 0x95000fb5,
+        0x1b80, 0x95000fb7,
+        0x1b80, 0x00070fc5,
+        0x1b80, 0x00070fc7,
+        0x1b80, 0x58010fd5,
+        0x1b80, 0x58010fd7,
+        0x1b80, 0x00040fe5,
+        0x1b80, 0x00040fe7,
+        0x1b80, 0x00300ff5,
+        0x1b80, 0x00300ff7,
+        0x1b80, 0x00001005,
+        0x1b80, 0x00001007,
+        0x1b80, 0x00021015,
+        0x1b80, 0x00021017,
+        0x1b80, 0x63051025,
+        0x1b80, 0x63051027,
+        0x1b80, 0x7b401035,
+        0x1b80, 0x7b401037,
+        0x1b80, 0x7a001045,
+        0x1b80, 0x7a001047,
+        0x1b80, 0x79001055,
+        0x1b80, 0x79001057,
+        0x1b80, 0x7f401065,
+        0x1b80, 0x7f401067,
+        0x1b80, 0x7e001075,
+        0x1b80, 0x7e001077,
+        0x1b80, 0x7d001085,
+        0x1b80, 0x7d001087,
+        0x1b80, 0x00011095,
+        0x1b80, 0x00011097,
+        0x1b80, 0xe3b410a5,
+        0x1b80, 0xe3b410a7,
+        0x1b80, 0x000110b5,
+        0x1b80, 0x000110b7,
+        0x1b80, 0x5c3210c5,
+        0x1b80, 0x5c3210c7,
+        0x1b80, 0x54fd10d5,
+        0x1b80, 0x54fd10d7,
+        0x1b80, 0xe3b410e5,
+        0x1b80, 0xe3b410e7,
+        0x1b80, 0x000110f5,
+        0x1b80, 0x000110f7,
+        0x1b80, 0x31471105,
+        0x1b80, 0x31471107,
+        0x1b80, 0x00261115,
+        0x1b80, 0x00261117,
+        0x1b80, 0xe3e71125,
+        0x1b80, 0xe3e71127,
+        0x1b80, 0x00021135,
+        0x1b80, 0x00021137,
+        0x1b80, 0x54ec1145,
+        0x1b80, 0x54ec1147,
+        0x1b80, 0x0ba61155,
+        0x1b80, 0x0ba61157,
+        0x1b80, 0x00261165,
+        0x1b80, 0x00261167,
+        0x1b80, 0xe3e71175,
+        0x1b80, 0xe3e71177,
+        0x1b80, 0x00021185,
+        0x1b80, 0x00021187,
+        0x1b80, 0x63431195,
+        0x1b80, 0x63431197,
+        0x1b80, 0x30ec11a5,
+        0x1b80, 0x30ec11a7,
+        0x1b80, 0x313b11b5,
+        0x1b80, 0x313b11b7,
+        0x1b80, 0x002411c5,
+        0x1b80, 0x002411c7,
+        0x1b80, 0xe3e711d5,
+        0x1b80, 0xe3e711d7,
+        0x1b80, 0x000211e5,
+        0x1b80, 0x000211e7,
+        0x1b80, 0x54ea11f5,
+        0x1b80, 0x54ea11f7,
+        0x1b80, 0x0ba61205,
+        0x1b80, 0x0ba61207,
+        0x1b80, 0x00241215,
+        0x1b80, 0x00241217,
+        0x1b80, 0xe3e71225,
+        0x1b80, 0xe3e71227,
+        0x1b80, 0x00021235,
+        0x1b80, 0x00021237,
+        0x1b80, 0x63431245,
+        0x1b80, 0x63431247,
+        0x1b80, 0x30ec1255,
+        0x1b80, 0x30ec1257,
         0x1b80, 0x5c321265,
         0x1b80, 0x5c321267,
-        0x1b80, 0x54ec1275,
-        0x1b80, 0x54ec1277,
-        0x1b80, 0x0bac1285,
-        0x1b80, 0x0bac1287,
-        0x1b80, 0x6ec41295,
-        0x1b80, 0x6ec41297,
-        0x1b80, 0x6f0f12a5,
-        0x1b80, 0x6f0f12a7,
-        0x1b80, 0xe31712b5,
-        0x1b80, 0xe31712b7,
-        0x1b80, 0xe34a12c5,
-        0x1b80, 0xe34a12c7,
-        0x1b80, 0x5c3212d5,
-        0x1b80, 0x5c3212d7,
-        0x1b80, 0x54ed12e5,
-        0x1b80, 0x54ed12e7,
-        0x1b80, 0x6ee412f5,
-        0x1b80, 0x6ee412f7,
-        0x1b80, 0xe3171305,
-        0x1b80, 0xe3171307,
-        0x1b80, 0xe34a1315,
-        0x1b80, 0xe34a1317,
-        0x1b80, 0x5c321325,
-        0x1b80, 0x5c321327,
-        0x1b80, 0x54ee1335,
-        0x1b80, 0x54ee1337,
-        0x1b80, 0x6ef41345,
-        0x1b80, 0x6ef41347,
-        0x1b80, 0xe3171355,
-        0x1b80, 0xe3171357,
-        0x1b80, 0xe34a1365,
-        0x1b80, 0xe34a1367,
-        0x1b80, 0x5c321375,
-        0x1b80, 0x5c321377,
-        0x1b80, 0x54ef1385,
-        0x1b80, 0x54ef1387,
-        0x1b80, 0x6e0c1395,
-        0x1b80, 0x6e0c1397,
-        0x1b80, 0x6f0013a5,
-        0x1b80, 0x6f0013a7,
-        0x1b80, 0xe31713b5,
-        0x1b80, 0xe31713b7,
-        0x1b80, 0xe34a13c5,
-        0x1b80, 0xe34a13c7,
-        0x1b80, 0x5c3213d5,
-        0x1b80, 0x5c3213d7,
-        0x1b80, 0x54f013e5,
-        0x1b80, 0x54f013e7,
-        0x1b80, 0x6e1c13f5,
-        0x1b80, 0x6e1c13f7,
-        0x1b80, 0xe3171405,
-        0x1b80, 0xe3171407,
-        0x1b80, 0xe34a1415,
-        0x1b80, 0xe34a1417,
+        0x1b80, 0x54e61275,
+        0x1b80, 0x54e61277,
+        0x1b80, 0x6e101285,
+        0x1b80, 0x6e101287,
+        0x1b80, 0x6f0f1295,
+        0x1b80, 0x6f0f1297,
+        0x1b80, 0xe3b412a5,
+        0x1b80, 0xe3b412a7,
+        0x1b80, 0xe3e712b5,
+        0x1b80, 0xe3e712b7,
+        0x1b80, 0x5c3212c5,
+        0x1b80, 0x5c3212c7,
+        0x1b80, 0x54e712d5,
+        0x1b80, 0x54e712d7,
+        0x1b80, 0x6e2412e5,
+        0x1b80, 0x6e2412e7,
+        0x1b80, 0xe3b412f5,
+        0x1b80, 0xe3b412f7,
+        0x1b80, 0xe3e71305,
+        0x1b80, 0xe3e71307,
+        0x1b80, 0x5c321315,
+        0x1b80, 0x5c321317,
+        0x1b80, 0x54e81325,
+        0x1b80, 0x54e81327,
+        0x1b80, 0x6e441335,
+        0x1b80, 0x6e441337,
+        0x1b80, 0xe3b41345,
+        0x1b80, 0xe3b41347,
+        0x1b80, 0xe3e71355,
+        0x1b80, 0xe3e71357,
+        0x1b80, 0x5c321365,
+        0x1b80, 0x5c321367,
+        0x1b80, 0x54e91375,
+        0x1b80, 0x54e91377,
+        0x1b80, 0x6e641385,
+        0x1b80, 0x6e641387,
+        0x1b80, 0xe3b41395,
+        0x1b80, 0xe3b41397,
+        0x1b80, 0xe3e713a5,
+        0x1b80, 0xe3e713a7,
+        0x1b80, 0x5c3213b5,
+        0x1b80, 0x5c3213b7,
+        0x1b80, 0x54ea13c5,
+        0x1b80, 0x54ea13c7,
+        0x1b80, 0x0baa13d5,
+        0x1b80, 0x0baa13d7,
+        0x1b80, 0x6e8413e5,
+        0x1b80, 0x6e8413e7,
+        0x1b80, 0x6f0f13f5,
+        0x1b80, 0x6f0f13f7,
+        0x1b80, 0xe3b41405,
+        0x1b80, 0xe3b41407,
+        0x1b80, 0xe3e71415,
+        0x1b80, 0xe3e71417,
         0x1b80, 0x5c321425,
         0x1b80, 0x5c321427,
-        0x1b80, 0x54f11435,
-        0x1b80, 0x54f11437,
-        0x1b80, 0x6e3c1445,
-        0x1b80, 0x6e3c1447,
-        0x1b80, 0xe3171455,
-        0x1b80, 0xe3171457,
-        0x1b80, 0xe34a1465,
-        0x1b80, 0xe34a1467,
-        0x1b80, 0xfaa91475,
-        0x1b80, 0xfaa91477,
-        0x1b80, 0x5c321485,
-        0x1b80, 0x5c321487,
-        0x1b80, 0x54f21495,
-        0x1b80, 0x54f21497,
-        0x1b80, 0x6e5c14a5,
-        0x1b80, 0x6e5c14a7,
-        0x1b80, 0xe31714b5,
-        0x1b80, 0xe31714b7,
-        0x1b80, 0xe34a14c5,
-        0x1b80, 0xe34a14c7,
-        0x1b80, 0x5c3214d5,
-        0x1b80, 0x5c3214d7,
-        0x1b80, 0x54f314e5,
-        0x1b80, 0x54f314e7,
-        0x1b80, 0x6e7c14f5,
-        0x1b80, 0x6e7c14f7,
-        0x1b80, 0xe3171505,
-        0x1b80, 0xe3171507,
-        0x1b80, 0xe34a1515,
-        0x1b80, 0xe34a1517,
-        0x1b80, 0xfba91525,
-        0x1b80, 0xfba91527,
+        0x1b80, 0x54eb1435,
+        0x1b80, 0x54eb1437,
+        0x1b80, 0x6ea41445,
+        0x1b80, 0x6ea41447,
+        0x1b80, 0xe3b41455,
+        0x1b80, 0xe3b41457,
+        0x1b80, 0xe3e71465,
+        0x1b80, 0xe3e71467,
+        0x1b80, 0x5c321475,
+        0x1b80, 0x5c321477,
+        0x1b80, 0x54ec1485,
+        0x1b80, 0x54ec1487,
+        0x1b80, 0x0bac1495,
+        0x1b80, 0x0bac1497,
+        0x1b80, 0x6ec414a5,
+        0x1b80, 0x6ec414a7,
+        0x1b80, 0x6f0f14b5,
+        0x1b80, 0x6f0f14b7,
+        0x1b80, 0xe3b414c5,
+        0x1b80, 0xe3b414c7,
+        0x1b80, 0xe3e714d5,
+        0x1b80, 0xe3e714d7,
+        0x1b80, 0x5c3214e5,
+        0x1b80, 0x5c3214e7,
+        0x1b80, 0x54ed14f5,
+        0x1b80, 0x54ed14f7,
+        0x1b80, 0x6ee41505,
+        0x1b80, 0x6ee41507,
+        0x1b80, 0xe3b41515,
+        0x1b80, 0xe3b41517,
+        0x1b80, 0xe3e71525,
+        0x1b80, 0xe3e71527,
         0x1b80, 0x5c321535,
         0x1b80, 0x5c321537,
-        0x1b80, 0x54f41545,
-        0x1b80, 0x54f41547,
-        0x1b80, 0x6e9c1555,
-        0x1b80, 0x6e9c1557,
-        0x1b80, 0xe3171565,
-        0x1b80, 0xe3171567,
-        0x1b80, 0xe34a1575,
-        0x1b80, 0xe34a1577,
+        0x1b80, 0x54ee1545,
+        0x1b80, 0x54ee1547,
+        0x1b80, 0x6ef41555,
+        0x1b80, 0x6ef41557,
+        0x1b80, 0xe3b41565,
+        0x1b80, 0xe3b41567,
+        0x1b80, 0xe3e71575,
+        0x1b80, 0xe3e71577,
         0x1b80, 0x5c321585,
         0x1b80, 0x5c321587,
-        0x1b80, 0x54f51595,
-        0x1b80, 0x54f51597,
-        0x1b80, 0x6ebc15a5,
-        0x1b80, 0x6ebc15a7,
-        0x1b80, 0xe31715b5,
-        0x1b80, 0xe31715b7,
-        0x1b80, 0xe34a15c5,
-        0x1b80, 0xe34a15c7,
-        0x1b80, 0x5c3215d5,
-        0x1b80, 0x5c3215d7,
-        0x1b80, 0x54f615e5,
-        0x1b80, 0x54f615e7,
-        0x1b80, 0x6edc15f5,
-        0x1b80, 0x6edc15f7,
-        0x1b80, 0xe3171605,
-        0x1b80, 0xe3171607,
-        0x1b80, 0xe34a1615,
-        0x1b80, 0xe34a1617,
-        0x1b80, 0x5c321625,
-        0x1b80, 0x5c321627,
-        0x1b80, 0x54f71635,
-        0x1b80, 0x54f71637,
-        0x1b80, 0x6ef01645,
-        0x1b80, 0x6ef01647,
-        0x1b80, 0xe3171655,
-        0x1b80, 0xe3171657,
-        0x1b80, 0xe34a1665,
-        0x1b80, 0xe34a1667,
-        0x1b80, 0x63831675,
-        0x1b80, 0x63831677,
-        0x1b80, 0x30d91685,
-        0x1b80, 0x30d91687,
-        0x1b80, 0x00011695,
-        0x1b80, 0x00011697,
-        0x1b80, 0x000416a5,
-        0x1b80, 0x000416a7,
-        0x1b80, 0x550116b5,
-        0x1b80, 0x550116b7,
-        0x1b80, 0x5c3116c5,
-        0x1b80, 0x5c3116c7,
-        0x1b80, 0x5f8216d5,
-        0x1b80, 0x5f8216d7,
-        0x1b80, 0x660516e5,
-        0x1b80, 0x660516e7,
-        0x1b80, 0x000616f5,
-        0x1b80, 0x000616f7,
-        0x1b80, 0x5d801705,
-        0x1b80, 0x5d801707,
-        0x1b80, 0x09001715,
-        0x1b80, 0x09001717,
-        0x1b80, 0x0a011725,
-        0x1b80, 0x0a011727,
-        0x1b80, 0x0b401735,
-        0x1b80, 0x0b401737,
-        0x1b80, 0x0d001745,
-        0x1b80, 0x0d001747,
-        0x1b80, 0x0f011755,
-        0x1b80, 0x0f011757,
-        0x1b80, 0x002a1765,
-        0x1b80, 0x002a1767,
-        0x1b80, 0x055a1775,
-        0x1b80, 0x055a1777,
-        0x1b80, 0x05db1785,
-        0x1b80, 0x05db1787,
-        0x1b80, 0xe3351795,
-        0x1b80, 0xe3351797,
-        0x1b80, 0xe2e317a5,
-        0x1b80, 0xe2e317a7,
-        0x1b80, 0x000617b5,
-        0x1b80, 0x000617b7,
-        0x1b80, 0x06da17c5,
-        0x1b80, 0x06da17c7,
-        0x1b80, 0x07db17d5,
-        0x1b80, 0x07db17d7,
-        0x1b80, 0xe33517e5,
-        0x1b80, 0xe33517e7,
-        0x1b80, 0xe2e317f5,
-        0x1b80, 0xe2e317f7,
-        0x1b80, 0xe32c1805,
-        0x1b80, 0xe32c1807,
-        0x1b80, 0x00021815,
-        0x1b80, 0x00021817,
-        0x1b80, 0xe3311825,
-        0x1b80, 0xe3311827,
-        0x1b80, 0x5d001835,
-        0x1b80, 0x5d001837,
-        0x1b80, 0x00041845,
-        0x1b80, 0x00041847,
-        0x1b80, 0x5fa21855,
-        0x1b80, 0x5fa21857,
-        0x1b80, 0x00011865,
-        0x1b80, 0x00011867,
-        0x1b80, 0xe2571875,
-        0x1b80, 0xe2571877,
-        0x1b80, 0x74081885,
-        0x1b80, 0x74081887,
-        0x1b80, 0xe2a11895,
-        0x1b80, 0xe2a11897,
-        0x1b80, 0xe28318a5,
-        0x1b80, 0xe28318a7,
-        0x1b80, 0xe2c118b5,
-        0x1b80, 0xe2c118b7,
-        0x1b80, 0xb90018c5,
-        0x1b80, 0xb90018c7,
-        0x1b80, 0x990018d5,
-        0x1b80, 0x990018d7,
-        0x1b80, 0x000618e5,
-        0x1b80, 0x000618e7,
-        0x1b80, 0x770018f5,
-        0x1b80, 0x770018f7,
-        0x1b80, 0x00041905,
-        0x1b80, 0x00041907,
-        0x1b80, 0x49041915,
-        0x1b80, 0x49041917,
-        0x1b80, 0x4bb01925,
-        0x1b80, 0x4bb01927,
-        0x1b80, 0x00061935,
-        0x1b80, 0x00061937,
-        0x1b80, 0x75041945,
-        0x1b80, 0x75041947,
-        0x1b80, 0x77081955,
-        0x1b80, 0x77081957,
-        0x1b80, 0x00071965,
-        0x1b80, 0x00071967,
-        0x1b80, 0x77101975,
-        0x1b80, 0x77101977,
-        0x1b80, 0x00041985,
-        0x1b80, 0x00041987,
-        0x1b80, 0x44801995,
-        0x1b80, 0x44801997,
-        0x1b80, 0x45ff19a5,
-        0x1b80, 0x45ff19a7,
-        0x1b80, 0x463f19b5,
-        0x1b80, 0x463f19b7,
-        0x1b80, 0x473119c5,
-        0x1b80, 0x473119c7,
-        0x1b80, 0x400819d5,
-        0x1b80, 0x400819d7,
-        0x1b80, 0xe23e19e5,
-        0x1b80, 0xe23e19e7,
-        0x1b80, 0x000119f5,
-        0x1b80, 0x000119f7,
-        0x1b80, 0xe2571a05,
-        0x1b80, 0xe2571a07,
-        0x1b80, 0x74081a15,
-        0x1b80, 0x74081a17,
-        0x1b80, 0xe2b11a25,
-        0x1b80, 0xe2b11a27,
-        0x1b80, 0xe2831a35,
-        0x1b80, 0xe2831a37,
-        0x1b80, 0xe2c71a45,
-        0x1b80, 0xe2c71a47,
-        0x1b80, 0xb9001a55,
-        0x1b80, 0xb9001a57,
-        0x1b80, 0x99001a65,
-        0x1b80, 0x99001a67,
-        0x1b80, 0x00061a75,
-        0x1b80, 0x00061a77,
-        0x1b80, 0x77001a85,
-        0x1b80, 0x77001a87,
-        0x1b80, 0x00051a95,
-        0x1b80, 0x00051a97,
-        0x1b80, 0x61041aa5,
-        0x1b80, 0x61041aa7,
-        0x1b80, 0x63b01ab5,
-        0x1b80, 0x63b01ab7,
-        0x1b80, 0x00061ac5,
-        0x1b80, 0x00061ac7,
-        0x1b80, 0x75081ad5,
-        0x1b80, 0x75081ad7,
-        0x1b80, 0x77081ae5,
-        0x1b80, 0x77081ae7,
-        0x1b80, 0x00071af5,
-        0x1b80, 0x00071af7,
-        0x1b80, 0x77201b05,
-        0x1b80, 0x77201b07,
-        0x1b80, 0x00051b15,
-        0x1b80, 0x00051b17,
-        0x1b80, 0x5c801b25,
-        0x1b80, 0x5c801b27,
-        0x1b80, 0x5dff1b35,
-        0x1b80, 0x5dff1b37,
-        0x1b80, 0x5e3f1b45,
-        0x1b80, 0x5e3f1b47,
-        0x1b80, 0x5f311b55,
-        0x1b80, 0x5f311b57,
-        0x1b80, 0x00041b65,
-        0x1b80, 0x00041b67,
-        0x1b80, 0x400a1b75,
-        0x1b80, 0x400a1b77,
-        0x1b80, 0xe23e1b85,
-        0x1b80, 0xe23e1b87,
-        0x1b80, 0x00011b95,
-        0x1b80, 0x00011b97,
-        0x1b80, 0xe2571ba5,
-        0x1b80, 0xe2571ba7,
-        0x1b80, 0x74081bb5,
-        0x1b80, 0x74081bb7,
-        0x1b80, 0xe2a11bc5,
-        0x1b80, 0xe2a11bc7,
-        0x1b80, 0xe2831bd5,
-        0x1b80, 0xe2831bd7,
-        0x1b80, 0xe2c11be5,
-        0x1b80, 0xe2c11be7,
-        0x1b80, 0xe2cd1bf5,
-        0x1b80, 0xe2cd1bf7,
-        0x1b80, 0xe2101c05,
-        0x1b80, 0xe2101c07,
-        0x1b80, 0x00011c15,
-        0x1b80, 0x00011c17,
-        0x1b80, 0xe2571c25,
-        0x1b80, 0xe2571c27,
-        0x1b80, 0x74081c35,
-        0x1b80, 0x74081c37,
-        0x1b80, 0xe2b11c45,
-        0x1b80, 0xe2b11c47,
-        0x1b80, 0xe2831c55,
-        0x1b80, 0xe2831c57,
-        0x1b80, 0xe2c71c65,
-        0x1b80, 0xe2c71c67,
-        0x1b80, 0xe2cd1c75,
-        0x1b80, 0xe2cd1c77,
-        0x1b80, 0xe2261c85,
-        0x1b80, 0xe2261c87,
-        0x1b80, 0x00011c95,
-        0x1b80, 0x00011c97,
-        0x1b80, 0xe26d1ca5,
-        0x1b80, 0xe26d1ca7,
-        0x1b80, 0x74001cb5,
-        0x1b80, 0x74001cb7,
-        0x1b80, 0xe2a11cc5,
-        0x1b80, 0xe2a11cc7,
-        0x1b80, 0xe2921cd5,
-        0x1b80, 0xe2921cd7,
-        0x1b80, 0xe2c11ce5,
-        0x1b80, 0xe2c11ce7,
-        0x1b80, 0xe2cd1cf5,
-        0x1b80, 0xe2cd1cf7,
-        0x1b80, 0xe2101d05,
-        0x1b80, 0xe2101d07,
-        0x1b80, 0x00011d15,
-        0x1b80, 0x00011d17,
-        0x1b80, 0xe26d1d25,
-        0x1b80, 0xe26d1d27,
-        0x1b80, 0x74001d35,
-        0x1b80, 0x74001d37,
-        0x1b80, 0xe2b11d45,
-        0x1b80, 0xe2b11d47,
-        0x1b80, 0xe2921d55,
-        0x1b80, 0xe2921d57,
-        0x1b80, 0xe2c71d65,
-        0x1b80, 0xe2c71d67,
-        0x1b80, 0xe2cd1d75,
-        0x1b80, 0xe2cd1d77,
-        0x1b80, 0xe2261d85,
-        0x1b80, 0xe2261d87,
-        0x1b80, 0x00011d95,
-        0x1b80, 0x00011d97,
-        0x1b80, 0x00041da5,
-        0x1b80, 0x00041da7,
-        0x1b80, 0x445b1db5,
-        0x1b80, 0x445b1db7,
-        0x1b80, 0x47b01dc5,
-        0x1b80, 0x47b01dc7,
-        0x1b80, 0x47301dd5,
-        0x1b80, 0x47301dd7,
-        0x1b80, 0x47001de5,
-        0x1b80, 0x47001de7,
-        0x1b80, 0x00061df5,
-        0x1b80, 0x00061df7,
-        0x1b80, 0x77081e05,
-        0x1b80, 0x77081e07,
-        0x1b80, 0x00041e15,
-        0x1b80, 0x00041e17,
-        0x1b80, 0x49401e25,
-        0x1b80, 0x49401e27,
-        0x1b80, 0x4bb01e35,
-        0x1b80, 0x4bb01e37,
-        0x1b80, 0x00071e45,
-        0x1b80, 0x00071e47,
-        0x1b80, 0x54401e55,
-        0x1b80, 0x54401e57,
-        0x1b80, 0x00041e65,
-        0x1b80, 0x00041e67,
-        0x1b80, 0x40081e75,
-        0x1b80, 0x40081e77,
-        0x1b80, 0x00011e85,
-        0x1b80, 0x00011e87,
-        0x1b80, 0x00051e95,
-        0x1b80, 0x00051e97,
-        0x1b80, 0x5c5b1ea5,
-        0x1b80, 0x5c5b1ea7,
-        0x1b80, 0x5fb01eb5,
-        0x1b80, 0x5fb01eb7,
-        0x1b80, 0x5f301ec5,
-        0x1b80, 0x5f301ec7,
-        0x1b80, 0x5f001ed5,
-        0x1b80, 0x5f001ed7,
-        0x1b80, 0x00061ee5,
-        0x1b80, 0x00061ee7,
-        0x1b80, 0x77081ef5,
-        0x1b80, 0x77081ef7,
-        0x1b80, 0x00051f05,
-        0x1b80, 0x00051f07,
-        0x1b80, 0x61401f15,
-        0x1b80, 0x61401f17,
-        0x1b80, 0x63b01f25,
-        0x1b80, 0x63b01f27,
-        0x1b80, 0x00071f35,
-        0x1b80, 0x00071f37,
-        0x1b80, 0x54401f45,
-        0x1b80, 0x54401f47,
-        0x1b80, 0x00041f55,
-        0x1b80, 0x00041f57,
-        0x1b80, 0x40081f65,
-        0x1b80, 0x40081f67,
-        0x1b80, 0x00011f75,
-        0x1b80, 0x00011f77,
-        0x1b80, 0xe2571f85,
-        0x1b80, 0xe2571f87,
-        0x1b80, 0x74081f95,
-        0x1b80, 0x74081f97,
-        0x1b80, 0xe2a11fa5,
-        0x1b80, 0xe2a11fa7,
-        0x1b80, 0x00041fb5,
-        0x1b80, 0x00041fb7,
-        0x1b80, 0x40081fc5,
-        0x1b80, 0x40081fc7,
-        0x1b80, 0x00011fd5,
-        0x1b80, 0x00011fd7,
-        0x1b80, 0xe2571fe5,
-        0x1b80, 0xe2571fe7,
-        0x1b80, 0x74081ff5,
-        0x1b80, 0x74081ff7,
-        0x1b80, 0xe2b12005,
-        0x1b80, 0xe2b12007,
-        0x1b80, 0x00042015,
-        0x1b80, 0x00042017,
-        0x1b80, 0x40082025,
-        0x1b80, 0x40082027,
-        0x1b80, 0x00012035,
-        0x1b80, 0x00012037,
-        0x1b80, 0xe26d2045,
-        0x1b80, 0xe26d2047,
-        0x1b80, 0x74002055,
-        0x1b80, 0x74002057,
-        0x1b80, 0xe2a12065,
-        0x1b80, 0xe2a12067,
-        0x1b80, 0x00042075,
-        0x1b80, 0x00042077,
-        0x1b80, 0x40082085,
-        0x1b80, 0x40082087,
-        0x1b80, 0x00012095,
-        0x1b80, 0x00012097,
-        0x1b80, 0xe26d20a5,
-        0x1b80, 0xe26d20a7,
-        0x1b80, 0x740020b5,
-        0x1b80, 0x740020b7,
-        0x1b80, 0xe2b120c5,
-        0x1b80, 0xe2b120c7,
-        0x1b80, 0x000420d5,
-        0x1b80, 0x000420d7,
-        0x1b80, 0x400820e5,
-        0x1b80, 0x400820e7,
-        0x1b80, 0x000120f5,
-        0x1b80, 0x000120f7,
-        0x1b80, 0x00042105,
-        0x1b80, 0x00042107,
-        0x1b80, 0x49042115,
-        0x1b80, 0x49042117,
-        0x1b80, 0x4bb02125,
-        0x1b80, 0x4bb02127,
-        0x1b80, 0x00062135,
-        0x1b80, 0x00062137,
-        0x1b80, 0x75042145,
-        0x1b80, 0x75042147,
-        0x1b80, 0x77082155,
-        0x1b80, 0x77082157,
-        0x1b80, 0x00042165,
-        0x1b80, 0x00042167,
-        0x1b80, 0x44802175,
-        0x1b80, 0x44802177,
-        0x1b80, 0x45ff2185,
-        0x1b80, 0x45ff2187,
-        0x1b80, 0x463f2195,
-        0x1b80, 0x463f2197,
-        0x1b80, 0x473121a5,
-        0x1b80, 0x473121a7,
-        0x1b80, 0x400821b5,
-        0x1b80, 0x400821b7,
-        0x1b80, 0xe23e21c5,
-        0x1b80, 0xe23e21c7,
-        0x1b80, 0x000421d5,
-        0x1b80, 0x000421d7,
-        0x1b80, 0x400c21e5,
-        0x1b80, 0x400c21e7,
-        0x1b80, 0x000621f5,
-        0x1b80, 0x000621f7,
-        0x1b80, 0x75002205,
-        0x1b80, 0x75002207,
-        0x1b80, 0x00042215,
-        0x1b80, 0x00042217,
-        0x1b80, 0x445b2225,
-        0x1b80, 0x445b2227,
-        0x1b80, 0x47002235,
-        0x1b80, 0x47002237,
-        0x1b80, 0x40082245,
-        0x1b80, 0x40082247,
+        0x1b80, 0x54ef1595,
+        0x1b80, 0x54ef1597,
+        0x1b80, 0x6e0c15a5,
+        0x1b80, 0x6e0c15a7,
+        0x1b80, 0x6f0015b5,
+        0x1b80, 0x6f0015b7,
+        0x1b80, 0xe3b415c5,
+        0x1b80, 0xe3b415c7,
+        0x1b80, 0xe3e715d5,
+        0x1b80, 0xe3e715d7,
+        0x1b80, 0x5c3215e5,
+        0x1b80, 0x5c3215e7,
+        0x1b80, 0x54f015f5,
+        0x1b80, 0x54f015f7,
+        0x1b80, 0x6e1c1605,
+        0x1b80, 0x6e1c1607,
+        0x1b80, 0xe3b41615,
+        0x1b80, 0xe3b41617,
+        0x1b80, 0xe3e71625,
+        0x1b80, 0xe3e71627,
+        0x1b80, 0x5c321635,
+        0x1b80, 0x5c321637,
+        0x1b80, 0x54f11645,
+        0x1b80, 0x54f11647,
+        0x1b80, 0x6e3c1655,
+        0x1b80, 0x6e3c1657,
+        0x1b80, 0xe3b41665,
+        0x1b80, 0xe3b41667,
+        0x1b80, 0xe3e71675,
+        0x1b80, 0xe3e71677,
+        0x1b80, 0xfaa91685,
+        0x1b80, 0xfaa91687,
+        0x1b80, 0x5c321695,
+        0x1b80, 0x5c321697,
+        0x1b80, 0x54f216a5,
+        0x1b80, 0x54f216a7,
+        0x1b80, 0x6e5c16b5,
+        0x1b80, 0x6e5c16b7,
+        0x1b80, 0xe3b416c5,
+        0x1b80, 0xe3b416c7,
+        0x1b80, 0xe3e716d5,
+        0x1b80, 0xe3e716d7,
+        0x1b80, 0x5c3216e5,
+        0x1b80, 0x5c3216e7,
+        0x1b80, 0x54f316f5,
+        0x1b80, 0x54f316f7,
+        0x1b80, 0x6e7c1705,
+        0x1b80, 0x6e7c1707,
+        0x1b80, 0xe3b41715,
+        0x1b80, 0xe3b41717,
+        0x1b80, 0xe3e71725,
+        0x1b80, 0xe3e71727,
+        0x1b80, 0xfba91735,
+        0x1b80, 0xfba91737,
+        0x1b80, 0x5c321745,
+        0x1b80, 0x5c321747,
+        0x1b80, 0x54f41755,
+        0x1b80, 0x54f41757,
+        0x1b80, 0x6e9c1765,
+        0x1b80, 0x6e9c1767,
+        0x1b80, 0xe3b41775,
+        0x1b80, 0xe3b41777,
+        0x1b80, 0xe3e71785,
+        0x1b80, 0xe3e71787,
+        0x1b80, 0x5c321795,
+        0x1b80, 0x5c321797,
+        0x1b80, 0x54f517a5,
+        0x1b80, 0x54f517a7,
+        0x1b80, 0x6ebc17b5,
+        0x1b80, 0x6ebc17b7,
+        0x1b80, 0xe3b417c5,
+        0x1b80, 0xe3b417c7,
+        0x1b80, 0xe3e717d5,
+        0x1b80, 0xe3e717d7,
+        0x1b80, 0x5c3217e5,
+        0x1b80, 0x5c3217e7,
+        0x1b80, 0x54f617f5,
+        0x1b80, 0x54f617f7,
+        0x1b80, 0x6edc1805,
+        0x1b80, 0x6edc1807,
+        0x1b80, 0xe3b41815,
+        0x1b80, 0xe3b41817,
+        0x1b80, 0xe3e71825,
+        0x1b80, 0xe3e71827,
+        0x1b80, 0x5c321835,
+        0x1b80, 0x5c321837,
+        0x1b80, 0x54f71845,
+        0x1b80, 0x54f71847,
+        0x1b80, 0x6ef01855,
+        0x1b80, 0x6ef01857,
+        0x1b80, 0xe3b41865,
+        0x1b80, 0xe3b41867,
+        0x1b80, 0xe3e71875,
+        0x1b80, 0xe3e71877,
+        0x1b80, 0x63431885,
+        0x1b80, 0x63431887,
+        0x1b80, 0x30ec1895,
+        0x1b80, 0x30ec1897,
+        0x1b80, 0x000118a5,
+        0x1b80, 0x000118a7,
+        0x1b80, 0x63c318b5,
+        0x1b80, 0x63c318b7,
+        0x1b80, 0x003018c5,
+        0x1b80, 0x003018c7,
+        0x1b80, 0x000018d5,
+        0x1b80, 0x000018d7,
+        0x1b80, 0x000218e5,
+        0x1b80, 0x000218e7,
+        0x1b80, 0x550118f5,
+        0x1b80, 0x550118f7,
+        0x1b80, 0x57041905,
+        0x1b80, 0x57041907,
+        0x1b80, 0x57001915,
+        0x1b80, 0x57001917,
+        0x1b80, 0x96001925,
+        0x1b80, 0x96001927,
+        0x1b80, 0x00301935,
+        0x1b80, 0x00301937,
+        0x1b80, 0x00071945,
+        0x1b80, 0x00071947,
+        0x1b80, 0x5be01955,
+        0x1b80, 0x5be01957,
+        0x1b80, 0x5a001965,
+        0x1b80, 0x5a001967,
+        0x1b80, 0x59001975,
+        0x1b80, 0x59001977,
+        0x1b80, 0x58001985,
+        0x1b80, 0x58001987,
+        0x1b80, 0x00041995,
+        0x1b80, 0x00041997,
+        0x1b80, 0x000219a5,
+        0x1b80, 0x000219a7,
+        0x1b80, 0x570819b5,
+        0x1b80, 0x570819b7,
+        0x1b80, 0x570019c5,
+        0x1b80, 0x570019c7,
+        0x1b80, 0x950019d5,
+        0x1b80, 0x950019d7,
+        0x1b80, 0x003019e5,
+        0x1b80, 0x003019e7,
+        0x1b80, 0x000719f5,
+        0x1b80, 0x000719f7,
+        0x1b80, 0x58011a05,
+        0x1b80, 0x58011a07,
+        0x1b80, 0x00041a15,
+        0x1b80, 0x00041a17,
+        0x1b80, 0x00021a25,
+        0x1b80, 0x00021a27,
+        0x1b80, 0x00301a35,
+        0x1b80, 0x00301a37,
+        0x1b80, 0x00001a45,
+        0x1b80, 0x00001a47,
+        0x1b80, 0x00021a55,
+        0x1b80, 0x00021a57,
+        0x1b80, 0x63051a65,
+        0x1b80, 0x63051a67,
+        0x1b80, 0x7b401a75,
+        0x1b80, 0x7b401a77,
+        0x1b80, 0x7a001a85,
+        0x1b80, 0x7a001a87,
+        0x1b80, 0x79001a95,
+        0x1b80, 0x79001a97,
+        0x1b80, 0x7f401aa5,
+        0x1b80, 0x7f401aa7,
+        0x1b80, 0x7e001ab5,
+        0x1b80, 0x7e001ab7,
+        0x1b80, 0x7d001ac5,
+        0x1b80, 0x7d001ac7,
+        0x1b80, 0x00011ad5,
+        0x1b80, 0x00011ad7,
+        0x1b80, 0x00041ae5,
+        0x1b80, 0x00041ae7,
+        0x1b80, 0x55011af5,
+        0x1b80, 0x55011af7,
+        0x1b80, 0x5c311b05,
+        0x1b80, 0x5c311b07,
+        0x1b80, 0x5f821b15,
+        0x1b80, 0x5f821b17,
+        0x1b80, 0x66051b25,
+        0x1b80, 0x66051b27,
+        0x1b80, 0x00061b35,
+        0x1b80, 0x00061b37,
+        0x1b80, 0x5d801b45,
+        0x1b80, 0x5d801b47,
+        0x1b80, 0x09001b55,
+        0x1b80, 0x09001b57,
+        0x1b80, 0x0a011b65,
+        0x1b80, 0x0a011b67,
+        0x1b80, 0x0b401b75,
+        0x1b80, 0x0b401b77,
+        0x1b80, 0x0d001b85,
+        0x1b80, 0x0d001b87,
+        0x1b80, 0x0f011b95,
+        0x1b80, 0x0f011b97,
+        0x1b80, 0x002a1ba5,
+        0x1b80, 0x002a1ba7,
+        0x1b80, 0x055a1bb5,
+        0x1b80, 0x055a1bb7,
+        0x1b80, 0x05db1bc5,
+        0x1b80, 0x05db1bc7,
+        0x1b80, 0xe3d21bd5,
+        0x1b80, 0xe3d21bd7,
+        0x1b80, 0xe3801be5,
+        0x1b80, 0xe3801be7,
+        0x1b80, 0x00061bf5,
+        0x1b80, 0x00061bf7,
+        0x1b80, 0x06da1c05,
+        0x1b80, 0x06da1c07,
+        0x1b80, 0x07db1c15,
+        0x1b80, 0x07db1c17,
+        0x1b80, 0xe3d21c25,
+        0x1b80, 0xe3d21c27,
+        0x1b80, 0xe3801c35,
+        0x1b80, 0xe3801c37,
+        0x1b80, 0xe3c91c45,
+        0x1b80, 0xe3c91c47,
+        0x1b80, 0x00021c55,
+        0x1b80, 0x00021c57,
+        0x1b80, 0xe3ce1c65,
+        0x1b80, 0xe3ce1c67,
+        0x1b80, 0x5d001c75,
+        0x1b80, 0x5d001c77,
+        0x1b80, 0x00041c85,
+        0x1b80, 0x00041c87,
+        0x1b80, 0x5fa21c95,
+        0x1b80, 0x5fa21c97,
+        0x1b80, 0x00011ca5,
+        0x1b80, 0x00011ca7,
+        0x1b80, 0x00041cb5,
+        0x1b80, 0x00041cb7,
+        0x1b80, 0xe2711cc5,
+        0x1b80, 0xe2711cc7,
+        0x1b80, 0xe2821cd5,
+        0x1b80, 0xe2821cd7,
+        0x1b80, 0xe28b1ce5,
+        0x1b80, 0xe28b1ce7,
+        0x1b80, 0xe29c1cf5,
+        0x1b80, 0xe29c1cf7,
+        0x1b80, 0x00051d05,
+        0x1b80, 0x00051d07,
+        0x1b80, 0xe2641d15,
+        0x1b80, 0xe2641d17,
+        0x1b80, 0xe2711d25,
+        0x1b80, 0xe2711d27,
+        0x1b80, 0xe28b1d35,
+        0x1b80, 0xe28b1d37,
+        0x1b80, 0xe29c1d45,
+        0x1b80, 0xe29c1d47,
+        0x1b80, 0x00061d55,
+        0x1b80, 0x00061d57,
+        0x1b80, 0xe2641d65,
+        0x1b80, 0xe2641d67,
+        0x1b80, 0xe2711d75,
+        0x1b80, 0xe2711d77,
+        0x1b80, 0xe2821d85,
+        0x1b80, 0xe2821d87,
+        0x1b80, 0xe28b1d95,
+        0x1b80, 0xe28b1d97,
+        0x1b80, 0x00011da5,
+        0x1b80, 0x00011da7,
+        0x1b80, 0xe2f41db5,
+        0x1b80, 0xe2f41db7,
+        0x1b80, 0x74081dc5,
+        0x1b80, 0x74081dc7,
+        0x1b80, 0xe33e1dd5,
+        0x1b80, 0xe33e1dd7,
+        0x1b80, 0xe3201de5,
+        0x1b80, 0xe3201de7,
+        0x1b80, 0xe35e1df5,
+        0x1b80, 0xe35e1df7,
+        0x1b80, 0xb9001e05,
+        0x1b80, 0xb9001e07,
+        0x1b80, 0x99001e15,
+        0x1b80, 0x99001e17,
+        0x1b80, 0x00061e25,
+        0x1b80, 0x00061e27,
+        0x1b80, 0x77001e35,
+        0x1b80, 0x77001e37,
+        0x1b80, 0x00041e45,
+        0x1b80, 0x00041e47,
+        0x1b80, 0x49041e55,
+        0x1b80, 0x49041e57,
+        0x1b80, 0x4bb01e65,
+        0x1b80, 0x4bb01e67,
+        0x1b80, 0x00061e75,
+        0x1b80, 0x00061e77,
+        0x1b80, 0x75041e85,
+        0x1b80, 0x75041e87,
+        0x1b80, 0x77081e95,
+        0x1b80, 0x77081e97,
+        0x1b80, 0x00071ea5,
+        0x1b80, 0x00071ea7,
+        0x1b80, 0x77101eb5,
+        0x1b80, 0x77101eb7,
+        0x1b80, 0x00041ec5,
+        0x1b80, 0x00041ec7,
+        0x1b80, 0x44801ed5,
+        0x1b80, 0x44801ed7,
+        0x1b80, 0x45ff1ee5,
+        0x1b80, 0x45ff1ee7,
+        0x1b80, 0x463f1ef5,
+        0x1b80, 0x463f1ef7,
+        0x1b80, 0x47311f05,
+        0x1b80, 0x47311f07,
+        0x1b80, 0x40081f15,
+        0x1b80, 0x40081f17,
+        0x1b80, 0xe2db1f25,
+        0x1b80, 0xe2db1f27,
+        0x1b80, 0x00011f35,
+        0x1b80, 0x00011f37,
+        0x1b80, 0xe2f41f45,
+        0x1b80, 0xe2f41f47,
+        0x1b80, 0x74081f55,
+        0x1b80, 0x74081f57,
+        0x1b80, 0xe34e1f65,
+        0x1b80, 0xe34e1f67,
+        0x1b80, 0xe3201f75,
+        0x1b80, 0xe3201f77,
+        0x1b80, 0xe3641f85,
+        0x1b80, 0xe3641f87,
+        0x1b80, 0xb9001f95,
+        0x1b80, 0xb9001f97,
+        0x1b80, 0x99001fa5,
+        0x1b80, 0x99001fa7,
+        0x1b80, 0x00061fb5,
+        0x1b80, 0x00061fb7,
+        0x1b80, 0x77001fc5,
+        0x1b80, 0x77001fc7,
+        0x1b80, 0x00051fd5,
+        0x1b80, 0x00051fd7,
+        0x1b80, 0x61041fe5,
+        0x1b80, 0x61041fe7,
+        0x1b80, 0x63b01ff5,
+        0x1b80, 0x63b01ff7,
+        0x1b80, 0x00062005,
+        0x1b80, 0x00062007,
+        0x1b80, 0x75082015,
+        0x1b80, 0x75082017,
+        0x1b80, 0x77082025,
+        0x1b80, 0x77082027,
+        0x1b80, 0x00072035,
+        0x1b80, 0x00072037,
+        0x1b80, 0x77202045,
+        0x1b80, 0x77202047,
+        0x1b80, 0x00052055,
+        0x1b80, 0x00052057,
+        0x1b80, 0x5c802065,
+        0x1b80, 0x5c802067,
+        0x1b80, 0x5dff2075,
+        0x1b80, 0x5dff2077,
+        0x1b80, 0x5e3f2085,
+        0x1b80, 0x5e3f2087,
+        0x1b80, 0x5f312095,
+        0x1b80, 0x5f312097,
+        0x1b80, 0x000420a5,
+        0x1b80, 0x000420a7,
+        0x1b80, 0x400a20b5,
+        0x1b80, 0x400a20b7,
+        0x1b80, 0xe2db20c5,
+        0x1b80, 0xe2db20c7,
+        0x1b80, 0x000120d5,
+        0x1b80, 0x000120d7,
+        0x1b80, 0xe2f420e5,
+        0x1b80, 0xe2f420e7,
+        0x1b80, 0x740820f5,
+        0x1b80, 0x740820f7,
+        0x1b80, 0xe33e2105,
+        0x1b80, 0xe33e2107,
+        0x1b80, 0xe3202115,
+        0x1b80, 0xe3202117,
+        0x1b80, 0xe35e2125,
+        0x1b80, 0xe35e2127,
+        0x1b80, 0xe36a2135,
+        0x1b80, 0xe36a2137,
+        0x1b80, 0xe2ad2145,
+        0x1b80, 0xe2ad2147,
+        0x1b80, 0x00012155,
+        0x1b80, 0x00012157,
+        0x1b80, 0xe2f42165,
+        0x1b80, 0xe2f42167,
+        0x1b80, 0x74082175,
+        0x1b80, 0x74082177,
+        0x1b80, 0xe34e2185,
+        0x1b80, 0xe34e2187,
+        0x1b80, 0xe3202195,
+        0x1b80, 0xe3202197,
+        0x1b80, 0xe36421a5,
+        0x1b80, 0xe36421a7,
+        0x1b80, 0xe36a21b5,
+        0x1b80, 0xe36a21b7,
+        0x1b80, 0xe2c321c5,
+        0x1b80, 0xe2c321c7,
+        0x1b80, 0x000121d5,
+        0x1b80, 0x000121d7,
+        0x1b80, 0xe30a21e5,
+        0x1b80, 0xe30a21e7,
+        0x1b80, 0x740021f5,
+        0x1b80, 0x740021f7,
+        0x1b80, 0xe33e2205,
+        0x1b80, 0xe33e2207,
+        0x1b80, 0xe32f2215,
+        0x1b80, 0xe32f2217,
+        0x1b80, 0xe35e2225,
+        0x1b80, 0xe35e2227,
+        0x1b80, 0xe36a2235,
+        0x1b80, 0xe36a2237,
+        0x1b80, 0xe2ad2245,
+        0x1b80, 0xe2ad2247,
         0x1b80, 0x00012255,
         0x1b80, 0x00012257,
-        0x1b80, 0x00052265,
-        0x1b80, 0x00052267,
-        0x1b80, 0x61042275,
-        0x1b80, 0x61042277,
-        0x1b80, 0x63b02285,
-        0x1b80, 0x63b02287,
-        0x1b80, 0x00062295,
-        0x1b80, 0x00062297,
-        0x1b80, 0x750822a5,
-        0x1b80, 0x750822a7,
-        0x1b80, 0x770822b5,
-        0x1b80, 0x770822b7,
-        0x1b80, 0x000522c5,
-        0x1b80, 0x000522c7,
-        0x1b80, 0x5c8022d5,
-        0x1b80, 0x5c8022d7,
-        0x1b80, 0x5dff22e5,
-        0x1b80, 0x5dff22e7,
-        0x1b80, 0x5e3f22f5,
-        0x1b80, 0x5e3f22f7,
-        0x1b80, 0x5f312305,
-        0x1b80, 0x5f312307,
-        0x1b80, 0x00042315,
-        0x1b80, 0x00042317,
-        0x1b80, 0x400a2325,
-        0x1b80, 0x400a2327,
-        0x1b80, 0xe23e2335,
-        0x1b80, 0xe23e2337,
-        0x1b80, 0x00042345,
-        0x1b80, 0x00042347,
-        0x1b80, 0x400c2355,
-        0x1b80, 0x400c2357,
-        0x1b80, 0x00062365,
-        0x1b80, 0x00062367,
-        0x1b80, 0x75002375,
-        0x1b80, 0x75002377,
-        0x1b80, 0x00052385,
-        0x1b80, 0x00052387,
-        0x1b80, 0x5c5b2395,
-        0x1b80, 0x5c5b2397,
-        0x1b80, 0x5f0023a5,
-        0x1b80, 0x5f0023a7,
-        0x1b80, 0x000423b5,
-        0x1b80, 0x000423b7,
-        0x1b80, 0x400823c5,
-        0x1b80, 0x400823c7,
-        0x1b80, 0x000123d5,
-        0x1b80, 0x000123d7,
-        0x1b80, 0x000723e5,
-        0x1b80, 0x000723e7,
-        0x1b80, 0x4c1223f5,
-        0x1b80, 0x4c1223f7,
-        0x1b80, 0x4e202405,
-        0x1b80, 0x4e202407,
-        0x1b80, 0x00052415,
-        0x1b80, 0x00052417,
-        0x1b80, 0x598f2425,
-        0x1b80, 0x598f2427,
-        0x1b80, 0x40022435,
-        0x1b80, 0x40022437,
-        0x1b80, 0x4c012445,
-        0x1b80, 0x4c012447,
-        0x1b80, 0x4c002455,
-        0x1b80, 0x4c002457,
-        0x1b80, 0xab002465,
-        0x1b80, 0xab002467,
-        0x1b80, 0x40032475,
-        0x1b80, 0x40032477,
-        0x1b80, 0x49802485,
-        0x1b80, 0x49802487,
-        0x1b80, 0x56c02495,
-        0x1b80, 0x56c02497,
-        0x1b80, 0x540224a5,
-        0x1b80, 0x540224a7,
-        0x1b80, 0x4c0124b5,
-        0x1b80, 0x4c0124b7,
-        0x1b80, 0x4c0024c5,
-        0x1b80, 0x4c0024c7,
-        0x1b80, 0xab0024d5,
-        0x1b80, 0xab0024d7,
-        0x1b80, 0x540024e5,
-        0x1b80, 0x540024e7,
-        0x1b80, 0x000724f5,
-        0x1b80, 0x000724f7,
-        0x1b80, 0x4c002505,
-        0x1b80, 0x4c002507,
-        0x1b80, 0x4e002515,
-        0x1b80, 0x4e002517,
-        0x1b80, 0x00052525,
-        0x1b80, 0x00052527,
-        0x1b80, 0x40042535,
-        0x1b80, 0x40042537,
-        0x1b80, 0x4c012545,
-        0x1b80, 0x4c012547,
-        0x1b80, 0x4c002555,
-        0x1b80, 0x4c002557,
-        0x1b80, 0x00012565,
-        0x1b80, 0x00012567,
-        0x1b80, 0x00042575,
-        0x1b80, 0x00042577,
-        0x1b80, 0x44802585,
-        0x1b80, 0x44802587,
-        0x1b80, 0x4b002595,
-        0x1b80, 0x4b002597,
-        0x1b80, 0x000525a5,
-        0x1b80, 0x000525a7,
-        0x1b80, 0x5c8025b5,
-        0x1b80, 0x5c8025b7,
-        0x1b80, 0x630025c5,
-        0x1b80, 0x630025c7,
-        0x1b80, 0x000725d5,
-        0x1b80, 0x000725d7,
-        0x1b80, 0x780c25e5,
-        0x1b80, 0x780c25e7,
-        0x1b80, 0x791925f5,
-        0x1b80, 0x791925f7,
-        0x1b80, 0x7a002605,
-        0x1b80, 0x7a002607,
-        0x1b80, 0x7b822615,
-        0x1b80, 0x7b822617,
-        0x1b80, 0x7b022625,
-        0x1b80, 0x7b022627,
-        0x1b80, 0x78142635,
-        0x1b80, 0x78142637,
-        0x1b80, 0x79ee2645,
-        0x1b80, 0x79ee2647,
-        0x1b80, 0x7a012655,
-        0x1b80, 0x7a012657,
-        0x1b80, 0x7b832665,
-        0x1b80, 0x7b832667,
-        0x1b80, 0x7b032675,
-        0x1b80, 0x7b032677,
-        0x1b80, 0x78282685,
-        0x1b80, 0x78282687,
-        0x1b80, 0x79b42695,
-        0x1b80, 0x79b42697,
-        0x1b80, 0x7a0026a5,
-        0x1b80, 0x7a0026a7,
-        0x1b80, 0x7b0026b5,
-        0x1b80, 0x7b0026b7,
-        0x1b80, 0x000126c5,
-        0x1b80, 0x000126c7,
-        0x1b80, 0x000426d5,
-        0x1b80, 0x000426d7,
-        0x1b80, 0x448026e5,
-        0x1b80, 0x448026e7,
+        0x1b80, 0xe30a2265,
+        0x1b80, 0xe30a2267,
+        0x1b80, 0x74002275,
+        0x1b80, 0x74002277,
+        0x1b80, 0xe34e2285,
+        0x1b80, 0xe34e2287,
+        0x1b80, 0xe32f2295,
+        0x1b80, 0xe32f2297,
+        0x1b80, 0xe36422a5,
+        0x1b80, 0xe36422a7,
+        0x1b80, 0xe36a22b5,
+        0x1b80, 0xe36a22b7,
+        0x1b80, 0xe2c322c5,
+        0x1b80, 0xe2c322c7,
+        0x1b80, 0x000122d5,
+        0x1b80, 0x000122d7,
+        0x1b80, 0x000422e5,
+        0x1b80, 0x000422e7,
+        0x1b80, 0x445b22f5,
+        0x1b80, 0x445b22f7,
+        0x1b80, 0x47b02305,
+        0x1b80, 0x47b02307,
+        0x1b80, 0x47302315,
+        0x1b80, 0x47302317,
+        0x1b80, 0x47002325,
+        0x1b80, 0x47002327,
+        0x1b80, 0x00062335,
+        0x1b80, 0x00062337,
+        0x1b80, 0x77082345,
+        0x1b80, 0x77082347,
+        0x1b80, 0x00042355,
+        0x1b80, 0x00042357,
+        0x1b80, 0x49402365,
+        0x1b80, 0x49402367,
+        0x1b80, 0x4bb02375,
+        0x1b80, 0x4bb02377,
+        0x1b80, 0x00072385,
+        0x1b80, 0x00072387,
+        0x1b80, 0x54402395,
+        0x1b80, 0x54402397,
+        0x1b80, 0x000423a5,
+        0x1b80, 0x000423a7,
+        0x1b80, 0x400823b5,
+        0x1b80, 0x400823b7,
+        0x1b80, 0x000123c5,
+        0x1b80, 0x000123c7,
+        0x1b80, 0x000523d5,
+        0x1b80, 0x000523d7,
+        0x1b80, 0x5c5b23e5,
+        0x1b80, 0x5c5b23e7,
+        0x1b80, 0x5fb023f5,
+        0x1b80, 0x5fb023f7,
+        0x1b80, 0x5f302405,
+        0x1b80, 0x5f302407,
+        0x1b80, 0x5f002415,
+        0x1b80, 0x5f002417,
+        0x1b80, 0x00062425,
+        0x1b80, 0x00062427,
+        0x1b80, 0x77082435,
+        0x1b80, 0x77082437,
+        0x1b80, 0x00052445,
+        0x1b80, 0x00052447,
+        0x1b80, 0x61402455,
+        0x1b80, 0x61402457,
+        0x1b80, 0x63b02465,
+        0x1b80, 0x63b02467,
+        0x1b80, 0x00072475,
+        0x1b80, 0x00072477,
+        0x1b80, 0x54402485,
+        0x1b80, 0x54402487,
+        0x1b80, 0x00042495,
+        0x1b80, 0x00042497,
+        0x1b80, 0x400824a5,
+        0x1b80, 0x400824a7,
+        0x1b80, 0x000124b5,
+        0x1b80, 0x000124b7,
+        0x1b80, 0xe2f424c5,
+        0x1b80, 0xe2f424c7,
+        0x1b80, 0x740824d5,
+        0x1b80, 0x740824d7,
+        0x1b80, 0xe33e24e5,
+        0x1b80, 0xe33e24e7,
+        0x1b80, 0x000424f5,
+        0x1b80, 0x000424f7,
+        0x1b80, 0x40082505,
+        0x1b80, 0x40082507,
+        0x1b80, 0x00012515,
+        0x1b80, 0x00012517,
+        0x1b80, 0xe2f42525,
+        0x1b80, 0xe2f42527,
+        0x1b80, 0x74082535,
+        0x1b80, 0x74082537,
+        0x1b80, 0xe34e2545,
+        0x1b80, 0xe34e2547,
+        0x1b80, 0x00042555,
+        0x1b80, 0x00042557,
+        0x1b80, 0x40082565,
+        0x1b80, 0x40082567,
+        0x1b80, 0x00012575,
+        0x1b80, 0x00012577,
+        0x1b80, 0xe30a2585,
+        0x1b80, 0xe30a2587,
+        0x1b80, 0x74002595,
+        0x1b80, 0x74002597,
+        0x1b80, 0xe33e25a5,
+        0x1b80, 0xe33e25a7,
+        0x1b80, 0x000425b5,
+        0x1b80, 0x000425b7,
+        0x1b80, 0x400825c5,
+        0x1b80, 0x400825c7,
+        0x1b80, 0x000125d5,
+        0x1b80, 0x000125d7,
+        0x1b80, 0xe30a25e5,
+        0x1b80, 0xe30a25e7,
+        0x1b80, 0x740025f5,
+        0x1b80, 0x740025f7,
+        0x1b80, 0xe34e2605,
+        0x1b80, 0xe34e2607,
+        0x1b80, 0x00042615,
+        0x1b80, 0x00042617,
+        0x1b80, 0x40082625,
+        0x1b80, 0x40082627,
+        0x1b80, 0x00012635,
+        0x1b80, 0x00012637,
+        0x1b80, 0x40ff2645,
+        0x1b80, 0x40ff2647,
+        0x1b80, 0x411f2655,
+        0x1b80, 0x411f2657,
+        0x1b80, 0x42002665,
+        0x1b80, 0x42002667,
+        0x1b80, 0x43002675,
+        0x1b80, 0x43002677,
+        0x1b80, 0x44ff2685,
+        0x1b80, 0x44ff2687,
+        0x1b80, 0x451f2695,
+        0x1b80, 0x451f2697,
+        0x1b80, 0x460026a5,
+        0x1b80, 0x460026a7,
+        0x1b80, 0x470026b5,
+        0x1b80, 0x470026b7,
+        0x1b80, 0x48ff26c5,
+        0x1b80, 0x48ff26c7,
+        0x1b80, 0x491f26d5,
+        0x1b80, 0x491f26d7,
+        0x1b80, 0x4a0026e5,
+        0x1b80, 0x4a0026e7,
         0x1b80, 0x4b0026f5,
         0x1b80, 0x4b0026f7,
-        0x1b80, 0x00052705,
-        0x1b80, 0x00052707,
-        0x1b80, 0x5c802715,
-        0x1b80, 0x5c802717,
-        0x1b80, 0x63002725,
-        0x1b80, 0x63002727,
-        0x1b80, 0x00072735,
-        0x1b80, 0x00072737,
-        0x1b80, 0x78102745,
-        0x1b80, 0x78102747,
-        0x1b80, 0x79132755,
-        0x1b80, 0x79132757,
-        0x1b80, 0x7a002765,
-        0x1b80, 0x7a002767,
-        0x1b80, 0x7b802775,
-        0x1b80, 0x7b802777,
-        0x1b80, 0x7b002785,
-        0x1b80, 0x7b002787,
-        0x1b80, 0x78db2795,
-        0x1b80, 0x78db2797,
-        0x1b80, 0x790027a5,
-        0x1b80, 0x790027a7,
-        0x1b80, 0x7a0027b5,
-        0x1b80, 0x7a0027b7,
-        0x1b80, 0x7b8127c5,
-        0x1b80, 0x7b8127c7,
-        0x1b80, 0x7b0127d5,
-        0x1b80, 0x7b0127d7,
-        0x1b80, 0x782827e5,
-        0x1b80, 0x782827e7,
-        0x1b80, 0x79b427f5,
-        0x1b80, 0x79b427f7,
-        0x1b80, 0x7a002805,
-        0x1b80, 0x7a002807,
-        0x1b80, 0x7b002815,
-        0x1b80, 0x7b002817,
-        0x1b80, 0x00012825,
-        0x1b80, 0x00012827,
-        0x1b80, 0x00072835,
-        0x1b80, 0x00072837,
-        0x1b80, 0x783e2845,
-        0x1b80, 0x783e2847,
-        0x1b80, 0x79f92855,
-        0x1b80, 0x79f92857,
-        0x1b80, 0x7a012865,
-        0x1b80, 0x7a012867,
-        0x1b80, 0x7b822875,
-        0x1b80, 0x7b822877,
-        0x1b80, 0x7b022885,
-        0x1b80, 0x7b022887,
-        0x1b80, 0x78a92895,
-        0x1b80, 0x78a92897,
-        0x1b80, 0x79ed28a5,
-        0x1b80, 0x79ed28a7,
-        0x1b80, 0x7b8328b5,
-        0x1b80, 0x7b8328b7,
-        0x1b80, 0x7b0328c5,
-        0x1b80, 0x7b0328c7,
-        0x1b80, 0x782828d5,
-        0x1b80, 0x782828d7,
-        0x1b80, 0x79b428e5,
-        0x1b80, 0x79b428e7,
-        0x1b80, 0x7a0028f5,
-        0x1b80, 0x7a0028f7,
-        0x1b80, 0x7b002905,
-        0x1b80, 0x7b002907,
-        0x1b80, 0x00012915,
-        0x1b80, 0x00012917,
-        0x1b80, 0x00072925,
-        0x1b80, 0x00072927,
-        0x1b80, 0x78ae2935,
-        0x1b80, 0x78ae2937,
-        0x1b80, 0x79fa2945,
-        0x1b80, 0x79fa2947,
-        0x1b80, 0x7a012955,
-        0x1b80, 0x7a012957,
-        0x1b80, 0x7b802965,
-        0x1b80, 0x7b802967,
-        0x1b80, 0x7b002975,
-        0x1b80, 0x7b002977,
-        0x1b80, 0x787a2985,
-        0x1b80, 0x787a2987,
-        0x1b80, 0x79f12995,
-        0x1b80, 0x79f12997,
-        0x1b80, 0x7b8129a5,
-        0x1b80, 0x7b8129a7,
-        0x1b80, 0x7b0129b5,
-        0x1b80, 0x7b0129b7,
-        0x1b80, 0x782829c5,
-        0x1b80, 0x782829c7,
-        0x1b80, 0x79b429d5,
-        0x1b80, 0x79b429d7,
-        0x1b80, 0x7a0029e5,
-        0x1b80, 0x7a0029e7,
-        0x1b80, 0x7b0029f5,
-        0x1b80, 0x7b0029f7,
-        0x1b80, 0x00012a05,
-        0x1b80, 0x00012a07,
-        0x1b80, 0x00072a15,
-        0x1b80, 0x00072a17,
-        0x1b80, 0x75002a25,
-        0x1b80, 0x75002a27,
-        0x1b80, 0x76022a35,
-        0x1b80, 0x76022a37,
-        0x1b80, 0x77152a45,
-        0x1b80, 0x77152a47,
-        0x1b80, 0x00062a55,
-        0x1b80, 0x00062a57,
-        0x1b80, 0x74002a65,
-        0x1b80, 0x74002a67,
-        0x1b80, 0x76002a75,
-        0x1b80, 0x76002a77,
-        0x1b80, 0x77002a85,
-        0x1b80, 0x77002a87,
-        0x1b80, 0x75102a95,
-        0x1b80, 0x75102a97,
-        0x1b80, 0x75002aa5,
-        0x1b80, 0x75002aa7,
-        0x1b80, 0xb3002ab5,
-        0x1b80, 0xb3002ab7,
-        0x1b80, 0x93002ac5,
-        0x1b80, 0x93002ac7,
-        0x1b80, 0x00072ad5,
-        0x1b80, 0x00072ad7,
-        0x1b80, 0x76002ae5,
-        0x1b80, 0x76002ae7,
-        0x1b80, 0x77002af5,
-        0x1b80, 0x77002af7,
-        0x1b80, 0x00012b05,
-        0x1b80, 0x00012b07,
-        0x1b80, 0x00072b15,
-        0x1b80, 0x00072b17,
-        0x1b80, 0x75002b25,
-        0x1b80, 0x75002b27,
-        0x1b80, 0x76022b35,
-        0x1b80, 0x76022b37,
-        0x1b80, 0x77252b45,
-        0x1b80, 0x77252b47,
-        0x1b80, 0x00062b55,
-        0x1b80, 0x00062b57,
-        0x1b80, 0x74002b65,
-        0x1b80, 0x74002b67,
-        0x1b80, 0x76002b75,
-        0x1b80, 0x76002b77,
-        0x1b80, 0x77012b85,
-        0x1b80, 0x77012b87,
-        0x1b80, 0x75102b95,
-        0x1b80, 0x75102b97,
-        0x1b80, 0x75002ba5,
-        0x1b80, 0x75002ba7,
-        0x1b80, 0xb3002bb5,
-        0x1b80, 0xb3002bb7,
-        0x1b80, 0x93002bc5,
-        0x1b80, 0x93002bc7,
-        0x1b80, 0x00072bd5,
-        0x1b80, 0x00072bd7,
-        0x1b80, 0x76002be5,
-        0x1b80, 0x76002be7,
-        0x1b80, 0x77002bf5,
-        0x1b80, 0x77002bf7,
-        0x1b80, 0x00012c05,
-        0x1b80, 0x00012c07,
-        0x1b80, 0x00042c15,
-        0x1b80, 0x00042c17,
-        0x1b80, 0x44802c25,
-        0x1b80, 0x44802c27,
-        0x1b80, 0x47302c35,
-        0x1b80, 0x47302c37,
-        0x1b80, 0x00062c45,
-        0x1b80, 0x00062c47,
-        0x1b80, 0x776c2c55,
-        0x1b80, 0x776c2c57,
-        0x1b80, 0x00012c65,
-        0x1b80, 0x00012c67,
-        0x1b80, 0x00052c75,
-        0x1b80, 0x00052c77,
-        0x1b80, 0x5c802c85,
-        0x1b80, 0x5c802c87,
-        0x1b80, 0x5f302c95,
-        0x1b80, 0x5f302c97,
-        0x1b80, 0x00062ca5,
-        0x1b80, 0x00062ca7,
-        0x1b80, 0x776d2cb5,
-        0x1b80, 0x776d2cb7,
-        0x1b80, 0x00012cc5,
-        0x1b80, 0x00012cc7,
-        0x1b80, 0xb9002cd5,
-        0x1b80, 0xb9002cd7,
-        0x1b80, 0x99002ce5,
-        0x1b80, 0x99002ce7,
-        0x1b80, 0x00062cf5,
-        0x1b80, 0x00062cf7,
-        0x1b80, 0x77002d05,
-        0x1b80, 0x77002d07,
-        0x1b80, 0x98052d15,
-        0x1b80, 0x98052d17,
-        0x1b80, 0x00042d25,
-        0x1b80, 0x00042d27,
-        0x1b80, 0x40082d35,
-        0x1b80, 0x40082d37,
-        0x1b80, 0x4a022d45,
-        0x1b80, 0x4a022d47,
-        0x1b80, 0x30192d55,
-        0x1b80, 0x30192d57,
-        0x1b80, 0x00012d65,
-        0x1b80, 0x00012d67,
-        0x1b80, 0x7b482d75,
-        0x1b80, 0x7b482d77,
-        0x1b80, 0x7a902d85,
-        0x1b80, 0x7a902d87,
-        0x1b80, 0x79002d95,
-        0x1b80, 0x79002d97,
-        0x1b80, 0x55032da5,
-        0x1b80, 0x55032da7,
-        0x1b80, 0x32e32db5,
-        0x1b80, 0x32e32db7,
-        0x1b80, 0x7b382dc5,
-        0x1b80, 0x7b382dc7,
-        0x1b80, 0x7a802dd5,
-        0x1b80, 0x7a802dd7,
-        0x1b80, 0x550b2de5,
-        0x1b80, 0x550b2de7,
-        0x1b80, 0x32e32df5,
-        0x1b80, 0x32e32df7,
-        0x1b80, 0x7b402e05,
-        0x1b80, 0x7b402e07,
-        0x1b80, 0x7a002e15,
-        0x1b80, 0x7a002e17,
-        0x1b80, 0x55132e25,
-        0x1b80, 0x55132e27,
-        0x1b80, 0x74012e35,
-        0x1b80, 0x74012e37,
-        0x1b80, 0x74002e45,
-        0x1b80, 0x74002e47,
-        0x1b80, 0x8e002e55,
-        0x1b80, 0x8e002e57,
-        0x1b80, 0x00012e65,
-        0x1b80, 0x00012e67,
-        0x1b80, 0x57022e75,
-        0x1b80, 0x57022e77,
-        0x1b80, 0x57002e85,
-        0x1b80, 0x57002e87,
-        0x1b80, 0x97002e95,
-        0x1b80, 0x97002e97,
-        0x1b80, 0x00012ea5,
-        0x1b80, 0x00012ea7,
-        0x1b80, 0x4f782eb5,
-        0x1b80, 0x4f782eb7,
-        0x1b80, 0x53882ec5,
-        0x1b80, 0x53882ec7,
-        0x1b80, 0xe2f72ed5,
-        0x1b80, 0xe2f72ed7,
-        0x1b80, 0x54802ee5,
-        0x1b80, 0x54802ee7,
-        0x1b80, 0x54002ef5,
-        0x1b80, 0x54002ef7,
-        0x1b80, 0x54812f05,
-        0x1b80, 0x54812f07,
-        0x1b80, 0x54002f15,
-        0x1b80, 0x54002f17,
-        0x1b80, 0x54822f25,
-        0x1b80, 0x54822f27,
-        0x1b80, 0x54002f35,
-        0x1b80, 0x54002f37,
-        0x1b80, 0xe3022f45,
-        0x1b80, 0xe3022f47,
-        0x1b80, 0xbf1d2f55,
-        0x1b80, 0xbf1d2f57,
-        0x1b80, 0x30192f65,
-        0x1b80, 0x30192f67,
-        0x1b80, 0xe2d72f75,
-        0x1b80, 0xe2d72f77,
-        0x1b80, 0xe2dc2f85,
-        0x1b80, 0xe2dc2f87,
-        0x1b80, 0xe2e02f95,
-        0x1b80, 0xe2e02f97,
-        0x1b80, 0xe2e72fa5,
-        0x1b80, 0xe2e72fa7,
-        0x1b80, 0xe3412fb5,
-        0x1b80, 0xe3412fb7,
-        0x1b80, 0x55132fc5,
-        0x1b80, 0x55132fc7,
-        0x1b80, 0xe2e32fd5,
-        0x1b80, 0xe2e32fd7,
-        0x1b80, 0x55152fe5,
-        0x1b80, 0x55152fe7,
-        0x1b80, 0xe2e72ff5,
-        0x1b80, 0xe2e72ff7,
-        0x1b80, 0xe3413005,
-        0x1b80, 0xe3413007,
-        0x1b80, 0x00013015,
-        0x1b80, 0x00013017,
-        0x1b80, 0x54bf3025,
-        0x1b80, 0x54bf3027,
-        0x1b80, 0x54c03035,
-        0x1b80, 0x54c03037,
-        0x1b80, 0x54a33045,
-        0x1b80, 0x54a33047,
-        0x1b80, 0x54c13055,
-        0x1b80, 0x54c13057,
-        0x1b80, 0x54a43065,
-        0x1b80, 0x54a43067,
-        0x1b80, 0x4c183075,
-        0x1b80, 0x4c183077,
-        0x1b80, 0xbf073085,
-        0x1b80, 0xbf073087,
-        0x1b80, 0x54c23095,
-        0x1b80, 0x54c23097,
-        0x1b80, 0x54a430a5,
-        0x1b80, 0x54a430a7,
-        0x1b80, 0xbf0430b5,
-        0x1b80, 0xbf0430b7,
-        0x1b80, 0x54c130c5,
-        0x1b80, 0x54c130c7,
-        0x1b80, 0x54a330d5,
-        0x1b80, 0x54a330d7,
-        0x1b80, 0xbf0130e5,
-        0x1b80, 0xbf0130e7,
-        0x1b80, 0xe34f30f5,
-        0x1b80, 0xe34f30f7,
-        0x1b80, 0x54df3105,
-        0x1b80, 0x54df3107,
-        0x1b80, 0x00013115,
-        0x1b80, 0x00013117,
-        0x1b80, 0x54bf3125,
-        0x1b80, 0x54bf3127,
-        0x1b80, 0x54e53135,
-        0x1b80, 0x54e53137,
-        0x1b80, 0x050a3145,
-        0x1b80, 0x050a3147,
-        0x1b80, 0x54df3155,
-        0x1b80, 0x54df3157,
-        0x1b80, 0x00013165,
-        0x1b80, 0x00013167,
-        0x1b80, 0x7f403175,
-        0x1b80, 0x7f403177,
-        0x1b80, 0x7e003185,
-        0x1b80, 0x7e003187,
-        0x1b80, 0x7d003195,
-        0x1b80, 0x7d003197,
-        0x1b80, 0x550131a5,
-        0x1b80, 0x550131a7,
-        0x1b80, 0x5c3131b5,
-        0x1b80, 0x5c3131b7,
-        0x1b80, 0xe2e331c5,
-        0x1b80, 0xe2e331c7,
-        0x1b80, 0xe2e731d5,
-        0x1b80, 0xe2e731d7,
-        0x1b80, 0x548031e5,
-        0x1b80, 0x548031e7,
-        0x1b80, 0x540031f5,
-        0x1b80, 0x540031f7,
-        0x1b80, 0x54813205,
-        0x1b80, 0x54813207,
-        0x1b80, 0x54003215,
-        0x1b80, 0x54003217,
-        0x1b80, 0x54823225,
-        0x1b80, 0x54823227,
-        0x1b80, 0x54003235,
-        0x1b80, 0x54003237,
-        0x1b80, 0xe3023245,
-        0x1b80, 0xe3023247,
-        0x1b80, 0xbfed3255,
-        0x1b80, 0xbfed3257,
-        0x1b80, 0x30193265,
-        0x1b80, 0x30193267,
-        0x1b80, 0x74023275,
-        0x1b80, 0x74023277,
-        0x1b80, 0x003f3285,
-        0x1b80, 0x003f3287,
-        0x1b80, 0x74003295,
-        0x1b80, 0x74003297,
-        0x1b80, 0x000232a5,
-        0x1b80, 0x000232a7,
-        0x1b80, 0x000132b5,
-        0x1b80, 0x000132b7,
-        0x1b80, 0x000632c5,
-        0x1b80, 0x000632c7,
-        0x1b80, 0x5a8032d5,
-        0x1b80, 0x5a8032d7,
-        0x1b80, 0x5a0032e5,
-        0x1b80, 0x5a0032e7,
-        0x1b80, 0x920032f5,
-        0x1b80, 0x920032f7,
-        0x1b80, 0x00013305,
-        0x1b80, 0x00013307,
-        0x1b80, 0x5b8f3315,
-        0x1b80, 0x5b8f3317,
-        0x1b80, 0x5b0f3325,
-        0x1b80, 0x5b0f3327,
-        0x1b80, 0x91003335,
-        0x1b80, 0x91003337,
-        0x1b80, 0x00013345,
-        0x1b80, 0x00013347,
-        0x1b80, 0x00063355,
-        0x1b80, 0x00063357,
-        0x1b80, 0x5d803365,
-        0x1b80, 0x5d803367,
-        0x1b80, 0x5e563375,
-        0x1b80, 0x5e563377,
-        0x1b80, 0x00043385,
-        0x1b80, 0x00043387,
-        0x1b80, 0x4d083395,
-        0x1b80, 0x4d083397,
-        0x1b80, 0x571033a5,
-        0x1b80, 0x571033a7,
-        0x1b80, 0x570033b5,
-        0x1b80, 0x570033b7,
-        0x1b80, 0x4d0033c5,
-        0x1b80, 0x4d0033c7,
-        0x1b80, 0x000633d5,
-        0x1b80, 0x000633d7,
-        0x1b80, 0x5d0033e5,
-        0x1b80, 0x5d0033e7,
-        0x1b80, 0x000433f5,
-        0x1b80, 0x000433f7,
-        0x1b80, 0x00013405,
-        0x1b80, 0x00013407,
-        0x1b80, 0x549f3415,
-        0x1b80, 0x549f3417,
-        0x1b80, 0x54ff3425,
-        0x1b80, 0x54ff3427,
-        0x1b80, 0x54003435,
-        0x1b80, 0x54003437,
-        0x1b80, 0x00013445,
-        0x1b80, 0x00013447,
-        0x1b80, 0x5c313455,
-        0x1b80, 0x5c313457,
-        0x1b80, 0x07143465,
-        0x1b80, 0x07143467,
-        0x1b80, 0x54003475,
-        0x1b80, 0x54003477,
-        0x1b80, 0x5c323485,
-        0x1b80, 0x5c323487,
-        0x1b80, 0x00013495,
-        0x1b80, 0x00013497,
-        0x1b80, 0x5c3234a5,
-        0x1b80, 0x5c3234a7,
-        0x1b80, 0x071434b5,
-        0x1b80, 0x071434b7,
-        0x1b80, 0x540034c5,
-        0x1b80, 0x540034c7,
-        0x1b80, 0x5c3134d5,
-        0x1b80, 0x5c3134d7,
-        0x1b80, 0x000134e5,
-        0x1b80, 0x000134e7,
-        0x1b80, 0x4c9834f5,
-        0x1b80, 0x4c9834f7,
-        0x1b80, 0x4c183505,
-        0x1b80, 0x4c183507,
-        0x1b80, 0x00013515,
-        0x1b80, 0x00013517,
-        0x1b80, 0x5c323525,
-        0x1b80, 0x5c323527,
-        0x1b80, 0x62043535,
-        0x1b80, 0x62043537,
-        0x1b80, 0x63033545,
-        0x1b80, 0x63033547,
-        0x1b80, 0x66073555,
-        0x1b80, 0x66073557,
-        0x1b80, 0x7b403565,
-        0x1b80, 0x7b403567,
-        0x1b80, 0x7a003575,
-        0x1b80, 0x7a003577,
-        0x1b80, 0x79003585,
-        0x1b80, 0x79003587,
-        0x1b80, 0x7f403595,
-        0x1b80, 0x7f403597,
-        0x1b80, 0x7e0035a5,
-        0x1b80, 0x7e0035a7,
-        0x1b80, 0x7d0035b5,
-        0x1b80, 0x7d0035b7,
-        0x1b80, 0x090135c5,
-        0x1b80, 0x090135c7,
-        0x1b80, 0x0c0135d5,
-        0x1b80, 0x0c0135d7,
-        0x1b80, 0x0ba635e5,
-        0x1b80, 0x0ba635e7,
-        0x1b80, 0x000135f5,
-        0x1b80, 0x000135f7,
+        0x1b80, 0x00012705,
+        0x1b80, 0x00012707,
+        0x1b80, 0x4cff2715,
+        0x1b80, 0x4cff2717,
+        0x1b80, 0x4d1f2725,
+        0x1b80, 0x4d1f2727,
+        0x1b80, 0x4e002735,
+        0x1b80, 0x4e002737,
+        0x1b80, 0x4f002745,
+        0x1b80, 0x4f002747,
+        0x1b80, 0x50ff2755,
+        0x1b80, 0x50ff2757,
+        0x1b80, 0x511f2765,
+        0x1b80, 0x511f2767,
+        0x1b80, 0x52002775,
+        0x1b80, 0x52002777,
+        0x1b80, 0x53002785,
+        0x1b80, 0x53002787,
+        0x1b80, 0x54ff2795,
+        0x1b80, 0x54ff2797,
+        0x1b80, 0x551f27a5,
+        0x1b80, 0x551f27a7,
+        0x1b80, 0x560027b5,
+        0x1b80, 0x560027b7,
+        0x1b80, 0x570027c5,
+        0x1b80, 0x570027c7,
+        0x1b80, 0x58ff27d5,
+        0x1b80, 0x58ff27d7,
+        0x1b80, 0x591f27e5,
+        0x1b80, 0x591f27e7,
+        0x1b80, 0x5a0027f5,
+        0x1b80, 0x5a0027f7,
+        0x1b80, 0x5b002805,
+        0x1b80, 0x5b002807,
+        0x1b80, 0x00012815,
+        0x1b80, 0x00012817,
+        0x1b80, 0x5cff2825,
+        0x1b80, 0x5cff2827,
+        0x1b80, 0x5d1f2835,
+        0x1b80, 0x5d1f2837,
+        0x1b80, 0x5e002845,
+        0x1b80, 0x5e002847,
+        0x1b80, 0x5f002855,
+        0x1b80, 0x5f002857,
+        0x1b80, 0x60ff2865,
+        0x1b80, 0x60ff2867,
+        0x1b80, 0x611f2875,
+        0x1b80, 0x611f2877,
+        0x1b80, 0x62002885,
+        0x1b80, 0x62002887,
+        0x1b80, 0x63002895,
+        0x1b80, 0x63002897,
+        0x1b80, 0x000128a5,
+        0x1b80, 0x000128a7,
+        0x1b80, 0x64ff28b5,
+        0x1b80, 0x64ff28b7,
+        0x1b80, 0x651f28c5,
+        0x1b80, 0x651f28c7,
+        0x1b80, 0x660028d5,
+        0x1b80, 0x660028d7,
+        0x1b80, 0x670028e5,
+        0x1b80, 0x670028e7,
+        0x1b80, 0x68ff28f5,
+        0x1b80, 0x68ff28f7,
+        0x1b80, 0x691f2905,
+        0x1b80, 0x691f2907,
+        0x1b80, 0x6a002915,
+        0x1b80, 0x6a002917,
+        0x1b80, 0x6b002925,
+        0x1b80, 0x6b002927,
+        0x1b80, 0x6cff2935,
+        0x1b80, 0x6cff2937,
+        0x1b80, 0x6d1f2945,
+        0x1b80, 0x6d1f2947,
+        0x1b80, 0x6e002955,
+        0x1b80, 0x6e002957,
+        0x1b80, 0x6f002965,
+        0x1b80, 0x6f002967,
+        0x1b80, 0x70ff2975,
+        0x1b80, 0x70ff2977,
+        0x1b80, 0x711f2985,
+        0x1b80, 0x711f2987,
+        0x1b80, 0x72002995,
+        0x1b80, 0x72002997,
+        0x1b80, 0x730029a5,
+        0x1b80, 0x730029a7,
+        0x1b80, 0x000129b5,
+        0x1b80, 0x000129b7,
+        0x1b80, 0x70ff29c5,
+        0x1b80, 0x70ff29c7,
+        0x1b80, 0x711f29d5,
+        0x1b80, 0x711f29d7,
+        0x1b80, 0x720029e5,
+        0x1b80, 0x720029e7,
+        0x1b80, 0x730029f5,
+        0x1b80, 0x730029f7,
+        0x1b80, 0x74ff2a05,
+        0x1b80, 0x74ff2a07,
+        0x1b80, 0x751f2a15,
+        0x1b80, 0x751f2a17,
+        0x1b80, 0x76002a25,
+        0x1b80, 0x76002a27,
+        0x1b80, 0x77002a35,
+        0x1b80, 0x77002a37,
+        0x1b80, 0x78ff2a45,
+        0x1b80, 0x78ff2a47,
+        0x1b80, 0x791f2a55,
+        0x1b80, 0x791f2a57,
+        0x1b80, 0x7a002a65,
+        0x1b80, 0x7a002a67,
+        0x1b80, 0x7b002a75,
+        0x1b80, 0x7b002a77,
+        0x1b80, 0x7cff2a85,
+        0x1b80, 0x7cff2a87,
+        0x1b80, 0x7d1f2a95,
+        0x1b80, 0x7d1f2a97,
+        0x1b80, 0x7e002aa5,
+        0x1b80, 0x7e002aa7,
+        0x1b80, 0x7f002ab5,
+        0x1b80, 0x7f002ab7,
+        0x1b80, 0x00012ac5,
+        0x1b80, 0x00012ac7,
+        0x1b80, 0x00042ad5,
+        0x1b80, 0x00042ad7,
+        0x1b80, 0x49042ae5,
+        0x1b80, 0x49042ae7,
+        0x1b80, 0x4bb02af5,
+        0x1b80, 0x4bb02af7,
+        0x1b80, 0x00062b05,
+        0x1b80, 0x00062b07,
+        0x1b80, 0x75042b15,
+        0x1b80, 0x75042b17,
+        0x1b80, 0x77082b25,
+        0x1b80, 0x77082b27,
+        0x1b80, 0x00042b35,
+        0x1b80, 0x00042b37,
+        0x1b80, 0x44802b45,
+        0x1b80, 0x44802b47,
+        0x1b80, 0x45ff2b55,
+        0x1b80, 0x45ff2b57,
+        0x1b80, 0x463f2b65,
+        0x1b80, 0x463f2b67,
+        0x1b80, 0x47312b75,
+        0x1b80, 0x47312b77,
+        0x1b80, 0x40082b85,
+        0x1b80, 0x40082b87,
+        0x1b80, 0xe2db2b95,
+        0x1b80, 0xe2db2b97,
+        0x1b80, 0x00042ba5,
+        0x1b80, 0x00042ba7,
+        0x1b80, 0x400c2bb5,
+        0x1b80, 0x400c2bb7,
+        0x1b80, 0x00062bc5,
+        0x1b80, 0x00062bc7,
+        0x1b80, 0x75002bd5,
+        0x1b80, 0x75002bd7,
+        0x1b80, 0x00042be5,
+        0x1b80, 0x00042be7,
+        0x1b80, 0x445b2bf5,
+        0x1b80, 0x445b2bf7,
+        0x1b80, 0x47002c05,
+        0x1b80, 0x47002c07,
+        0x1b80, 0x40082c15,
+        0x1b80, 0x40082c17,
+        0x1b80, 0x00012c25,
+        0x1b80, 0x00012c27,
+        0x1b80, 0x00052c35,
+        0x1b80, 0x00052c37,
+        0x1b80, 0x61042c45,
+        0x1b80, 0x61042c47,
+        0x1b80, 0x63b02c55,
+        0x1b80, 0x63b02c57,
+        0x1b80, 0x00062c65,
+        0x1b80, 0x00062c67,
+        0x1b80, 0x75082c75,
+        0x1b80, 0x75082c77,
+        0x1b80, 0x77082c85,
+        0x1b80, 0x77082c87,
+        0x1b80, 0x00052c95,
+        0x1b80, 0x00052c97,
+        0x1b80, 0x5c802ca5,
+        0x1b80, 0x5c802ca7,
+        0x1b80, 0x5dff2cb5,
+        0x1b80, 0x5dff2cb7,
+        0x1b80, 0x5e3f2cc5,
+        0x1b80, 0x5e3f2cc7,
+        0x1b80, 0x5f312cd5,
+        0x1b80, 0x5f312cd7,
+        0x1b80, 0x00042ce5,
+        0x1b80, 0x00042ce7,
+        0x1b80, 0x400a2cf5,
+        0x1b80, 0x400a2cf7,
+        0x1b80, 0xe2db2d05,
+        0x1b80, 0xe2db2d07,
+        0x1b80, 0x00042d15,
+        0x1b80, 0x00042d17,
+        0x1b80, 0x400c2d25,
+        0x1b80, 0x400c2d27,
+        0x1b80, 0x00062d35,
+        0x1b80, 0x00062d37,
+        0x1b80, 0x75002d45,
+        0x1b80, 0x75002d47,
+        0x1b80, 0x00052d55,
+        0x1b80, 0x00052d57,
+        0x1b80, 0x5c5b2d65,
+        0x1b80, 0x5c5b2d67,
+        0x1b80, 0x5f002d75,
+        0x1b80, 0x5f002d77,
+        0x1b80, 0x00042d85,
+        0x1b80, 0x00042d87,
+        0x1b80, 0x40082d95,
+        0x1b80, 0x40082d97,
+        0x1b80, 0x00012da5,
+        0x1b80, 0x00012da7,
+        0x1b80, 0x00072db5,
+        0x1b80, 0x00072db7,
+        0x1b80, 0x4c122dc5,
+        0x1b80, 0x4c122dc7,
+        0x1b80, 0x4e202dd5,
+        0x1b80, 0x4e202dd7,
+        0x1b80, 0x00052de5,
+        0x1b80, 0x00052de7,
+        0x1b80, 0x598f2df5,
+        0x1b80, 0x598f2df7,
+        0x1b80, 0x40022e05,
+        0x1b80, 0x40022e07,
+        0x1b80, 0x4c012e15,
+        0x1b80, 0x4c012e17,
+        0x1b80, 0x4c002e25,
+        0x1b80, 0x4c002e27,
+        0x1b80, 0xab002e35,
+        0x1b80, 0xab002e37,
+        0x1b80, 0x40032e45,
+        0x1b80, 0x40032e47,
+        0x1b80, 0x49802e55,
+        0x1b80, 0x49802e57,
+        0x1b80, 0x56c02e65,
+        0x1b80, 0x56c02e67,
+        0x1b80, 0x54022e75,
+        0x1b80, 0x54022e77,
+        0x1b80, 0x4c012e85,
+        0x1b80, 0x4c012e87,
+        0x1b80, 0x4c002e95,
+        0x1b80, 0x4c002e97,
+        0x1b80, 0xab002ea5,
+        0x1b80, 0xab002ea7,
+        0x1b80, 0x54002eb5,
+        0x1b80, 0x54002eb7,
+        0x1b80, 0x00072ec5,
+        0x1b80, 0x00072ec7,
+        0x1b80, 0x4c002ed5,
+        0x1b80, 0x4c002ed7,
+        0x1b80, 0x4e002ee5,
+        0x1b80, 0x4e002ee7,
+        0x1b80, 0x00052ef5,
+        0x1b80, 0x00052ef7,
+        0x1b80, 0x40042f05,
+        0x1b80, 0x40042f07,
+        0x1b80, 0x4c012f15,
+        0x1b80, 0x4c012f17,
+        0x1b80, 0x4c002f25,
+        0x1b80, 0x4c002f27,
+        0x1b80, 0x00012f35,
+        0x1b80, 0x00012f37,
+        0x1b80, 0x00042f45,
+        0x1b80, 0x00042f47,
+        0x1b80, 0x44802f55,
+        0x1b80, 0x44802f57,
+        0x1b80, 0x4b002f65,
+        0x1b80, 0x4b002f67,
+        0x1b80, 0x00052f75,
+        0x1b80, 0x00052f77,
+        0x1b80, 0x5c802f85,
+        0x1b80, 0x5c802f87,
+        0x1b80, 0x63002f95,
+        0x1b80, 0x63002f97,
+        0x1b80, 0x00072fa5,
+        0x1b80, 0x00072fa7,
+        0x1b80, 0x780c2fb5,
+        0x1b80, 0x780c2fb7,
+        0x1b80, 0x79192fc5,
+        0x1b80, 0x79192fc7,
+        0x1b80, 0x7a002fd5,
+        0x1b80, 0x7a002fd7,
+        0x1b80, 0x7b822fe5,
+        0x1b80, 0x7b822fe7,
+        0x1b80, 0x7b022ff5,
+        0x1b80, 0x7b022ff7,
+        0x1b80, 0x78143005,
+        0x1b80, 0x78143007,
+        0x1b80, 0x79ee3015,
+        0x1b80, 0x79ee3017,
+        0x1b80, 0x7a013025,
+        0x1b80, 0x7a013027,
+        0x1b80, 0x7b833035,
+        0x1b80, 0x7b833037,
+        0x1b80, 0x7b033045,
+        0x1b80, 0x7b033047,
+        0x1b80, 0x78283055,
+        0x1b80, 0x78283057,
+        0x1b80, 0x79b43065,
+        0x1b80, 0x79b43067,
+        0x1b80, 0x7a003075,
+        0x1b80, 0x7a003077,
+        0x1b80, 0x7b003085,
+        0x1b80, 0x7b003087,
+        0x1b80, 0x00013095,
+        0x1b80, 0x00013097,
+        0x1b80, 0x000430a5,
+        0x1b80, 0x000430a7,
+        0x1b80, 0x448030b5,
+        0x1b80, 0x448030b7,
+        0x1b80, 0x4b0030c5,
+        0x1b80, 0x4b0030c7,
+        0x1b80, 0x000530d5,
+        0x1b80, 0x000530d7,
+        0x1b80, 0x5c8030e5,
+        0x1b80, 0x5c8030e7,
+        0x1b80, 0x630030f5,
+        0x1b80, 0x630030f7,
+        0x1b80, 0x00073105,
+        0x1b80, 0x00073107,
+        0x1b80, 0x78103115,
+        0x1b80, 0x78103117,
+        0x1b80, 0x79133125,
+        0x1b80, 0x79133127,
+        0x1b80, 0x7a003135,
+        0x1b80, 0x7a003137,
+        0x1b80, 0x7b803145,
+        0x1b80, 0x7b803147,
+        0x1b80, 0x7b003155,
+        0x1b80, 0x7b003157,
+        0x1b80, 0x78db3165,
+        0x1b80, 0x78db3167,
+        0x1b80, 0x79003175,
+        0x1b80, 0x79003177,
+        0x1b80, 0x7a003185,
+        0x1b80, 0x7a003187,
+        0x1b80, 0x7b813195,
+        0x1b80, 0x7b813197,
+        0x1b80, 0x7b0131a5,
+        0x1b80, 0x7b0131a7,
+        0x1b80, 0x782831b5,
+        0x1b80, 0x782831b7,
+        0x1b80, 0x79b431c5,
+        0x1b80, 0x79b431c7,
+        0x1b80, 0x7a0031d5,
+        0x1b80, 0x7a0031d7,
+        0x1b80, 0x7b0031e5,
+        0x1b80, 0x7b0031e7,
+        0x1b80, 0x000131f5,
+        0x1b80, 0x000131f7,
+        0x1b80, 0x00073205,
+        0x1b80, 0x00073207,
+        0x1b80, 0x783e3215,
+        0x1b80, 0x783e3217,
+        0x1b80, 0x79f93225,
+        0x1b80, 0x79f93227,
+        0x1b80, 0x7a013235,
+        0x1b80, 0x7a013237,
+        0x1b80, 0x7b823245,
+        0x1b80, 0x7b823247,
+        0x1b80, 0x7b023255,
+        0x1b80, 0x7b023257,
+        0x1b80, 0x78a93265,
+        0x1b80, 0x78a93267,
+        0x1b80, 0x79ed3275,
+        0x1b80, 0x79ed3277,
+        0x1b80, 0x7b833285,
+        0x1b80, 0x7b833287,
+        0x1b80, 0x7b033295,
+        0x1b80, 0x7b033297,
+        0x1b80, 0x782832a5,
+        0x1b80, 0x782832a7,
+        0x1b80, 0x79b432b5,
+        0x1b80, 0x79b432b7,
+        0x1b80, 0x7a0032c5,
+        0x1b80, 0x7a0032c7,
+        0x1b80, 0x7b0032d5,
+        0x1b80, 0x7b0032d7,
+        0x1b80, 0x000132e5,
+        0x1b80, 0x000132e7,
+        0x1b80, 0x000732f5,
+        0x1b80, 0x000732f7,
+        0x1b80, 0x78ae3305,
+        0x1b80, 0x78ae3307,
+        0x1b80, 0x79fa3315,
+        0x1b80, 0x79fa3317,
+        0x1b80, 0x7a013325,
+        0x1b80, 0x7a013327,
+        0x1b80, 0x7b803335,
+        0x1b80, 0x7b803337,
+        0x1b80, 0x7b003345,
+        0x1b80, 0x7b003347,
+        0x1b80, 0x787a3355,
+        0x1b80, 0x787a3357,
+        0x1b80, 0x79f13365,
+        0x1b80, 0x79f13367,
+        0x1b80, 0x7b813375,
+        0x1b80, 0x7b813377,
+        0x1b80, 0x7b013385,
+        0x1b80, 0x7b013387,
+        0x1b80, 0x78283395,
+        0x1b80, 0x78283397,
+        0x1b80, 0x79b433a5,
+        0x1b80, 0x79b433a7,
+        0x1b80, 0x7a0033b5,
+        0x1b80, 0x7a0033b7,
+        0x1b80, 0x7b0033c5,
+        0x1b80, 0x7b0033c7,
+        0x1b80, 0x000133d5,
+        0x1b80, 0x000133d7,
+        0x1b80, 0x000733e5,
+        0x1b80, 0x000733e7,
+        0x1b80, 0x750033f5,
+        0x1b80, 0x750033f7,
+        0x1b80, 0x76023405,
+        0x1b80, 0x76023407,
+        0x1b80, 0x77153415,
+        0x1b80, 0x77153417,
+        0x1b80, 0x00063425,
+        0x1b80, 0x00063427,
+        0x1b80, 0x74003435,
+        0x1b80, 0x74003437,
+        0x1b80, 0x76003445,
+        0x1b80, 0x76003447,
+        0x1b80, 0x77003455,
+        0x1b80, 0x77003457,
+        0x1b80, 0x75103465,
+        0x1b80, 0x75103467,
+        0x1b80, 0x75003475,
+        0x1b80, 0x75003477,
+        0x1b80, 0xb3003485,
+        0x1b80, 0xb3003487,
+        0x1b80, 0x93003495,
+        0x1b80, 0x93003497,
+        0x1b80, 0x000734a5,
+        0x1b80, 0x000734a7,
+        0x1b80, 0x760034b5,
+        0x1b80, 0x760034b7,
+        0x1b80, 0x770034c5,
+        0x1b80, 0x770034c7,
+        0x1b80, 0x000134d5,
+        0x1b80, 0x000134d7,
+        0x1b80, 0x000734e5,
+        0x1b80, 0x000734e7,
+        0x1b80, 0x750034f5,
+        0x1b80, 0x750034f7,
+        0x1b80, 0x76023505,
+        0x1b80, 0x76023507,
+        0x1b80, 0x77253515,
+        0x1b80, 0x77253517,
+        0x1b80, 0x00063525,
+        0x1b80, 0x00063527,
+        0x1b80, 0x74003535,
+        0x1b80, 0x74003537,
+        0x1b80, 0x76003545,
+        0x1b80, 0x76003547,
+        0x1b80, 0x77013555,
+        0x1b80, 0x77013557,
+        0x1b80, 0x75103565,
+        0x1b80, 0x75103567,
+        0x1b80, 0x75003575,
+        0x1b80, 0x75003577,
+        0x1b80, 0xb3003585,
+        0x1b80, 0xb3003587,
+        0x1b80, 0x93003595,
+        0x1b80, 0x93003597,
+        0x1b80, 0x000735a5,
+        0x1b80, 0x000735a7,
+        0x1b80, 0x760035b5,
+        0x1b80, 0x760035b7,
+        0x1b80, 0x770035c5,
+        0x1b80, 0x770035c7,
+        0x1b80, 0x000135d5,
+        0x1b80, 0x000135d7,
+        0x1b80, 0x000435e5,
+        0x1b80, 0x000435e7,
+        0x1b80, 0x448035f5,
+        0x1b80, 0x448035f7,
+        0x1b80, 0x47303605,
+        0x1b80, 0x47303607,
+        0x1b80, 0x00063615,
+        0x1b80, 0x00063617,
+        0x1b80, 0x776c3625,
+        0x1b80, 0x776c3627,
+        0x1b80, 0x00013635,
+        0x1b80, 0x00013637,
+        0x1b80, 0x00053645,
+        0x1b80, 0x00053647,
+        0x1b80, 0x5c803655,
+        0x1b80, 0x5c803657,
+        0x1b80, 0x5f303665,
+        0x1b80, 0x5f303667,
+        0x1b80, 0x00063675,
+        0x1b80, 0x00063677,
+        0x1b80, 0x776d3685,
+        0x1b80, 0x776d3687,
+        0x1b80, 0x00013695,
+        0x1b80, 0x00013697,
+        0x1b80, 0xb90036a5,
+        0x1b80, 0xb90036a7,
+        0x1b80, 0x990036b5,
+        0x1b80, 0x990036b7,
+        0x1b80, 0x000636c5,
+        0x1b80, 0x000636c7,
+        0x1b80, 0x770036d5,
+        0x1b80, 0x770036d7,
+        0x1b80, 0x980536e5,
+        0x1b80, 0x980536e7,
+        0x1b80, 0x000436f5,
+        0x1b80, 0x000436f7,
+        0x1b80, 0x40083705,
+        0x1b80, 0x40083707,
+        0x1b80, 0x4a023715,
+        0x1b80, 0x4a023717,
+        0x1b80, 0x30193725,
+        0x1b80, 0x30193727,
+        0x1b80, 0x00013735,
+        0x1b80, 0x00013737,
+        0x1b80, 0x7b483745,
+        0x1b80, 0x7b483747,
+        0x1b80, 0x7a903755,
+        0x1b80, 0x7a903757,
+        0x1b80, 0x79003765,
+        0x1b80, 0x79003767,
+        0x1b80, 0x55033775,
+        0x1b80, 0x55033777,
+        0x1b80, 0x33803785,
+        0x1b80, 0x33803787,
+        0x1b80, 0x7b383795,
+        0x1b80, 0x7b383797,
+        0x1b80, 0x7a8037a5,
+        0x1b80, 0x7a8037a7,
+        0x1b80, 0x550b37b5,
+        0x1b80, 0x550b37b7,
+        0x1b80, 0x338037c5,
+        0x1b80, 0x338037c7,
+        0x1b80, 0x7b4037d5,
+        0x1b80, 0x7b4037d7,
+        0x1b80, 0x7a0037e5,
+        0x1b80, 0x7a0037e7,
+        0x1b80, 0x551337f5,
+        0x1b80, 0x551337f7,
+        0x1b80, 0x74013805,
+        0x1b80, 0x74013807,
+        0x1b80, 0x74003815,
+        0x1b80, 0x74003817,
+        0x1b80, 0x8e003825,
+        0x1b80, 0x8e003827,
+        0x1b80, 0x00013835,
+        0x1b80, 0x00013837,
+        0x1b80, 0x57023845,
+        0x1b80, 0x57023847,
+        0x1b80, 0x57003855,
+        0x1b80, 0x57003857,
+        0x1b80, 0x97003865,
+        0x1b80, 0x97003867,
+        0x1b80, 0x00013875,
+        0x1b80, 0x00013877,
+        0x1b80, 0x4f783885,
+        0x1b80, 0x4f783887,
+        0x1b80, 0x53883895,
+        0x1b80, 0x53883897,
+        0x1b80, 0xe39438a5,
+        0x1b80, 0xe39438a7,
+        0x1b80, 0x548038b5,
+        0x1b80, 0x548038b7,
+        0x1b80, 0x540038c5,
+        0x1b80, 0x540038c7,
+        0x1b80, 0x548138d5,
+        0x1b80, 0x548138d7,
+        0x1b80, 0x540038e5,
+        0x1b80, 0x540038e7,
+        0x1b80, 0x548238f5,
+        0x1b80, 0x548238f7,
+        0x1b80, 0x54003905,
+        0x1b80, 0x54003907,
+        0x1b80, 0xe39f3915,
+        0x1b80, 0xe39f3917,
+        0x1b80, 0xbf1d3925,
+        0x1b80, 0xbf1d3927,
+        0x1b80, 0x30193935,
+        0x1b80, 0x30193937,
+        0x1b80, 0xe3743945,
+        0x1b80, 0xe3743947,
+        0x1b80, 0xe3793955,
+        0x1b80, 0xe3793957,
+        0x1b80, 0xe37d3965,
+        0x1b80, 0xe37d3967,
+        0x1b80, 0xe3843975,
+        0x1b80, 0xe3843977,
+        0x1b80, 0xe3de3985,
+        0x1b80, 0xe3de3987,
+        0x1b80, 0x55133995,
+        0x1b80, 0x55133997,
+        0x1b80, 0xe38039a5,
+        0x1b80, 0xe38039a7,
+        0x1b80, 0x551539b5,
+        0x1b80, 0x551539b7,
+        0x1b80, 0xe38439c5,
+        0x1b80, 0xe38439c7,
+        0x1b80, 0xe3de39d5,
+        0x1b80, 0xe3de39d7,
+        0x1b80, 0x000139e5,
+        0x1b80, 0x000139e7,
+        0x1b80, 0x54bf39f5,
+        0x1b80, 0x54bf39f7,
+        0x1b80, 0x54c03a05,
+        0x1b80, 0x54c03a07,
+        0x1b80, 0x54a33a15,
+        0x1b80, 0x54a33a17,
+        0x1b80, 0x54c13a25,
+        0x1b80, 0x54c13a27,
+        0x1b80, 0x54a43a35,
+        0x1b80, 0x54a43a37,
+        0x1b80, 0x4c183a45,
+        0x1b80, 0x4c183a47,
+        0x1b80, 0xbf073a55,
+        0x1b80, 0xbf073a57,
+        0x1b80, 0x54c23a65,
+        0x1b80, 0x54c23a67,
+        0x1b80, 0x54a43a75,
+        0x1b80, 0x54a43a77,
+        0x1b80, 0xbf043a85,
+        0x1b80, 0xbf043a87,
+        0x1b80, 0x54c13a95,
+        0x1b80, 0x54c13a97,
+        0x1b80, 0x54a33aa5,
+        0x1b80, 0x54a33aa7,
+        0x1b80, 0xbf013ab5,
+        0x1b80, 0xbf013ab7,
+        0x1b80, 0xe3ec3ac5,
+        0x1b80, 0xe3ec3ac7,
+        0x1b80, 0x54df3ad5,
+        0x1b80, 0x54df3ad7,
+        0x1b80, 0x00013ae5,
+        0x1b80, 0x00013ae7,
+        0x1b80, 0x54bf3af5,
+        0x1b80, 0x54bf3af7,
+        0x1b80, 0x54e53b05,
+        0x1b80, 0x54e53b07,
+        0x1b80, 0x050a3b15,
+        0x1b80, 0x050a3b17,
+        0x1b80, 0x54df3b25,
+        0x1b80, 0x54df3b27,
+        0x1b80, 0x00013b35,
+        0x1b80, 0x00013b37,
+        0x1b80, 0x7f403b45,
+        0x1b80, 0x7f403b47,
+        0x1b80, 0x7e003b55,
+        0x1b80, 0x7e003b57,
+        0x1b80, 0x7d003b65,
+        0x1b80, 0x7d003b67,
+        0x1b80, 0x55013b75,
+        0x1b80, 0x55013b77,
+        0x1b80, 0x5c313b85,
+        0x1b80, 0x5c313b87,
+        0x1b80, 0xe3803b95,
+        0x1b80, 0xe3803b97,
+        0x1b80, 0xe3843ba5,
+        0x1b80, 0xe3843ba7,
+        0x1b80, 0x54803bb5,
+        0x1b80, 0x54803bb7,
+        0x1b80, 0x54003bc5,
+        0x1b80, 0x54003bc7,
+        0x1b80, 0x54813bd5,
+        0x1b80, 0x54813bd7,
+        0x1b80, 0x54003be5,
+        0x1b80, 0x54003be7,
+        0x1b80, 0x54823bf5,
+        0x1b80, 0x54823bf7,
+        0x1b80, 0x54003c05,
+        0x1b80, 0x54003c07,
+        0x1b80, 0xe39f3c15,
+        0x1b80, 0xe39f3c17,
+        0x1b80, 0xbfed3c25,
+        0x1b80, 0xbfed3c27,
+        0x1b80, 0x30193c35,
+        0x1b80, 0x30193c37,
+        0x1b80, 0x74023c45,
+        0x1b80, 0x74023c47,
+        0x1b80, 0x003f3c55,
+        0x1b80, 0x003f3c57,
+        0x1b80, 0x74003c65,
+        0x1b80, 0x74003c67,
+        0x1b80, 0x00023c75,
+        0x1b80, 0x00023c77,
+        0x1b80, 0x00013c85,
+        0x1b80, 0x00013c87,
+        0x1b80, 0x00063c95,
+        0x1b80, 0x00063c97,
+        0x1b80, 0x5a803ca5,
+        0x1b80, 0x5a803ca7,
+        0x1b80, 0x5a003cb5,
+        0x1b80, 0x5a003cb7,
+        0x1b80, 0x92003cc5,
+        0x1b80, 0x92003cc7,
+        0x1b80, 0x00013cd5,
+        0x1b80, 0x00013cd7,
+        0x1b80, 0x5b8f3ce5,
+        0x1b80, 0x5b8f3ce7,
+        0x1b80, 0x5b0f3cf5,
+        0x1b80, 0x5b0f3cf7,
+        0x1b80, 0x91003d05,
+        0x1b80, 0x91003d07,
+        0x1b80, 0x00013d15,
+        0x1b80, 0x00013d17,
+        0x1b80, 0x00063d25,
+        0x1b80, 0x00063d27,
+        0x1b80, 0x5d803d35,
+        0x1b80, 0x5d803d37,
+        0x1b80, 0x5e563d45,
+        0x1b80, 0x5e563d47,
+        0x1b80, 0x00043d55,
+        0x1b80, 0x00043d57,
+        0x1b80, 0x4d083d65,
+        0x1b80, 0x4d083d67,
+        0x1b80, 0x57103d75,
+        0x1b80, 0x57103d77,
+        0x1b80, 0x57003d85,
+        0x1b80, 0x57003d87,
+        0x1b80, 0x4d003d95,
+        0x1b80, 0x4d003d97,
+        0x1b80, 0x00063da5,
+        0x1b80, 0x00063da7,
+        0x1b80, 0x5d003db5,
+        0x1b80, 0x5d003db7,
+        0x1b80, 0x00043dc5,
+        0x1b80, 0x00043dc7,
+        0x1b80, 0x00013dd5,
+        0x1b80, 0x00013dd7,
+        0x1b80, 0x549f3de5,
+        0x1b80, 0x549f3de7,
+        0x1b80, 0x54ff3df5,
+        0x1b80, 0x54ff3df7,
+        0x1b80, 0x54003e05,
+        0x1b80, 0x54003e07,
+        0x1b80, 0x00013e15,
+        0x1b80, 0x00013e17,
+        0x1b80, 0x5c313e25,
+        0x1b80, 0x5c313e27,
+        0x1b80, 0x07143e35,
+        0x1b80, 0x07143e37,
+        0x1b80, 0x54003e45,
+        0x1b80, 0x54003e47,
+        0x1b80, 0x5c323e55,
+        0x1b80, 0x5c323e57,
+        0x1b80, 0x00013e65,
+        0x1b80, 0x00013e67,
+        0x1b80, 0x5c323e75,
+        0x1b80, 0x5c323e77,
+        0x1b80, 0x07143e85,
+        0x1b80, 0x07143e87,
+        0x1b80, 0x54003e95,
+        0x1b80, 0x54003e97,
+        0x1b80, 0x5c313ea5,
+        0x1b80, 0x5c313ea7,
+        0x1b80, 0x00013eb5,
+        0x1b80, 0x00013eb7,
+        0x1b80, 0x4c983ec5,
+        0x1b80, 0x4c983ec7,
+        0x1b80, 0x4c183ed5,
+        0x1b80, 0x4c183ed7,
+        0x1b80, 0x00013ee5,
+        0x1b80, 0x00013ee7,
+        0x1b80, 0x5c323ef5,
+        0x1b80, 0x5c323ef7,
+        0x1b80, 0x62043f05,
+        0x1b80, 0x62043f07,
+        0x1b80, 0x63033f15,
+        0x1b80, 0x63033f17,
+        0x1b80, 0x66073f25,
+        0x1b80, 0x66073f27,
+        0x1b80, 0x7b403f35,
+        0x1b80, 0x7b403f37,
+        0x1b80, 0x7a003f45,
+        0x1b80, 0x7a003f47,
+        0x1b80, 0x79003f55,
+        0x1b80, 0x79003f57,
+        0x1b80, 0x7f403f65,
+        0x1b80, 0x7f403f67,
+        0x1b80, 0x7e003f75,
+        0x1b80, 0x7e003f77,
+        0x1b80, 0x7d003f85,
+        0x1b80, 0x7d003f87,
+        0x1b80, 0x09013f95,
+        0x1b80, 0x09013f97,
+        0x1b80, 0x0c013fa5,
+        0x1b80, 0x0c013fa7,
+        0x1b80, 0x0ba63fb5,
+        0x1b80, 0x0ba63fb7,
+        0x1b80, 0x00013fc5,
+        0x1b80, 0x00013fc7,
         0x1b80, 0x00000006,
         0x1b80, 0x00000002,
 };
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h
index 06e207dd8e5f..80c06c4f8184 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h
@@ -12,6 +12,9 @@ extern const struct rtw_table rtw8822c_bb_pg_type0_tbl;
 extern const struct rtw_table rtw8822c_rf_a_tbl;
 extern const struct rtw_table rtw8822c_rf_b_tbl;
 extern const struct rtw_table rtw8822c_txpwr_lmt_type0_tbl;
+extern const struct rtw_table rtw8822c_dpk_afe_no_dpk_tbl;
+extern const struct rtw_table rtw8822c_dpk_afe_is_dpk_tbl;
+extern const struct rtw_table rtw8822c_dpk_mac_bb_tbl;
 extern const struct rtw_table rtw8822c_array_mp_cal_init_tbl;
 
 #endif
diff --git a/drivers/net/wireless/realtek/rtw88/rx.c b/drivers/net/wireless/realtek/rtw88/rx.c
index 4d837f0c6d5f..48b9ed49b79a 100644
--- a/drivers/net/wireless/realtek/rtw88/rx.c
+++ b/drivers/net/wireless/realtek/rtw88/rx.c
@@ -90,6 +90,7 @@ void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,
                            u8 *phy_status)
 {
         struct ieee80211_hw *hw = rtwdev->hw;
+        u8 path;
 
         memset(rx_status, 0, sizeof(*rx_status));
         rx_status->freq = hw->conf.chandef.chan->center_freq;
@@ -146,6 +147,10 @@ void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,
                 rx_status->bw = RATE_INFO_BW_20;
 
         rx_status->signal = pkt_stat->signal_power;
+        for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
+                rx_status->chains |= BIT(path);
+                rx_status->chain_signal[path] = pkt_stat->rx_power[path];
+        }
 
         rtw_rx_addr_match(rtwdev, pkt_stat, hdr);
 }