Merge tag 'wireless-drivers-2019-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for 5.4

Third set of fixes for 5.4. Most of them are for iwlwifi but important
fixes also for rtlwifi and mt76, the overflow fix for rtlwifi being
most important.

iwlwifi

* fix merge damage on earlier patch

* various fixes to device id handling

* fix scan config command handling which caused firmware asserts

rtlwifi

* fix overflow on P2P IE handling

* don't deliver too small frames to mac80211

mt76

* disable PCIE_ASPM

* fix buffer DMA unmap on certain cases
====================

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

16 files changed, 305 insertions, 139 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
index 39c64850cb6f..c0750ced5ac2 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
@@ -520,7 +520,7 @@ struct iwl_scan_dwell {
 } __packed;
 
 /**
- * struct iwl_scan_config
+ * struct iwl_scan_config_v1
  * @flags:                      enum scan_config_flags
  * @tx_chains:                  valid_tx antenna - ANT_* definitions
  * @rx_chains:                  valid_rx antenna - ANT_* definitions
@@ -552,7 +552,7 @@ struct iwl_scan_config_v1 {
 #define SCAN_LB_LMAC_IDX 0
 #define SCAN_HB_LMAC_IDX 1
 
-struct iwl_scan_config {
+struct iwl_scan_config_v2 {
         __le32 flags;
         __le32 tx_chains;
         __le32 rx_chains;
@@ -564,6 +564,24 @@ struct iwl_scan_config {
         u8 bcast_sta_id;
         u8 channel_flags;
         u8 channel_array[];
+} __packed; /* SCAN_CONFIG_DB_CMD_API_S_2 */
+
+/**
+ * struct iwl_scan_config
+ * @enable_cam_mode: whether to enable CAM mode.
+ * @enable_promiscouos_mode: whether to enable promiscouos mode
+ * @bcast_sta_id: the index of the station in the fw
+ * @reserved: reserved
+ * @tx_chains: valid_tx antenna - ANT_* definitions
+ * @rx_chains: valid_rx antenna - ANT_* definitions
+ */
+struct iwl_scan_config {
+        u8 enable_cam_mode;
+        u8 enable_promiscouos_mode;
+        u8 bcast_sta_id;
+        u8 reserved;
+        __le32 tx_chains;
+        __le32 rx_chains;
 } __packed; /* SCAN_CONFIG_DB_CMD_API_S_3 */
 
 /**
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
index 423cc0cf8e78..0d5bc4ce5c07 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@ -288,6 +288,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t;
  *      STA_CONTEXT_DOT11AX_API_S
  * @IWL_UCODE_TLV_CAPA_SAR_TABLE_VER: This ucode supports different sar
  *      version tables.
+ * @IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG: This ucode supports v3 of
+ *  SCAN_CONFIG_DB_CMD_API_S.
  *
  * @NUM_IWL_UCODE_TLV_API: number of bits used
  */
@@ -321,6 +323,7 @@ enum iwl_ucode_tlv_api {
         IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE   = (__force iwl_ucode_tlv_api_t)53,
         IWL_UCODE_TLV_API_FTM_RTT_ACCURACY      = (__force iwl_ucode_tlv_api_t)54,
         IWL_UCODE_TLV_API_SAR_TABLE_VER         = (__force iwl_ucode_tlv_api_t)55,
+        IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG   = (__force iwl_ucode_tlv_api_t)56,
         IWL_UCODE_TLV_API_ADWELL_HB_DEF_N_AP    = (__force iwl_ucode_tlv_api_t)57,
         IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER     = (__force iwl_ucode_tlv_api_t)58,
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
index cb4c5514a556..695bbaa86273 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -279,6 +279,7 @@
  *         Indicates MAC is entering a power-saving sleep power-down.
  *         Not a good time to access device-internal resources.
  */
+#define CSR_GP_CNTRL_REG_FLAG_INIT_DONE              (0x00000004)
 #define CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP         (0x00000010)
 #define CSR_GP_CNTRL_REG_FLAG_XTAL_ON                (0x00000400)
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
index f47e0f97acf8..23c25a7665f2 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
@@ -449,6 +449,11 @@ enum {
 #define PERSISTENCE_BIT                 BIT(12)
 #define PREG_WFPM_ACCESS                BIT(12)
 
+#define HPM_HIPM_GEN_CFG                        0xA03458
+#define HPM_HIPM_GEN_CFG_CR_PG_EN               BIT(0)
+#define HPM_HIPM_GEN_CFG_CR_SLP_EN              BIT(1)
+#define HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE        BIT(10)
+
 #define UREG_DOORBELL_TO_ISR6           0xA05C04
 #define UREG_DOORBELL_TO_ISR6_NMI_BIT   BIT(0)
 #define UREG_DOORBELL_TO_ISR6_SUSPEND   BIT(18)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 843d00bf2bd5..5ca50f39a023 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1405,6 +1405,12 @@ static inline bool iwl_mvm_is_scan_ext_chan_supported(struct iwl_mvm *mvm)
                           IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER);
 }
 
+static inline bool iwl_mvm_is_reduced_config_scan_supported(struct iwl_mvm *mvm)
+{
+        return fw_has_api(&mvm->fw->ucode_capa,
+                          IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG);
+}
+
 static inline bool iwl_mvm_has_new_rx_stats_api(struct iwl_mvm *mvm)
 {
         return fw_has_api(&mvm->fw->ucode_capa,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index f6b3045badbd..fcafa22ec6ce 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1137,11 +1137,11 @@ static void iwl_mvm_fill_scan_config_v1(struct iwl_mvm *mvm, void *config,
         iwl_mvm_fill_channels(mvm, cfg->channel_array, max_channels);
 }
 
-static void iwl_mvm_fill_scan_config(struct iwl_mvm *mvm, void *config,
-                                     u32 flags, u8 channel_flags,
-                                     u32 max_channels)
+static void iwl_mvm_fill_scan_config_v2(struct iwl_mvm *mvm, void *config,
+                                        u32 flags, u8 channel_flags,
+                                        u32 max_channels)
 {
-        struct iwl_scan_config *cfg = config;
+        struct iwl_scan_config_v2 *cfg = config;
 
         cfg->flags = cpu_to_le32(flags);
         cfg->tx_chains = cpu_to_le32(iwl_mvm_get_valid_tx_ant(mvm));
@@ -1185,7 +1185,7 @@ static void iwl_mvm_fill_scan_config(struct iwl_mvm *mvm, void *config,
         iwl_mvm_fill_channels(mvm, cfg->channel_array, max_channels);
 }
 
-int iwl_mvm_config_scan(struct iwl_mvm *mvm)
+static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)
 {
         void *cfg;
         int ret, cmd_size;
@@ -1217,7 +1217,7 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)
         }
 
         if (iwl_mvm_cdb_scan_api(mvm))
-                cmd_size = sizeof(struct iwl_scan_config);
+                cmd_size = sizeof(struct iwl_scan_config_v2);
         else
                 cmd_size = sizeof(struct iwl_scan_config_v1);
         cmd_size += num_channels;
@@ -1254,8 +1254,8 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)
                         flags |= (iwl_mvm_is_scan_fragmented(hb_type)) ?
                                  SCAN_CONFIG_FLAG_SET_LMAC2_FRAGMENTED :
                                  SCAN_CONFIG_FLAG_CLEAR_LMAC2_FRAGMENTED;
-                iwl_mvm_fill_scan_config(mvm, cfg, flags, channel_flags,
-                                         num_channels);
+                iwl_mvm_fill_scan_config_v2(mvm, cfg, flags, channel_flags,
+                                            num_channels);
         } else {
                 iwl_mvm_fill_scan_config_v1(mvm, cfg, flags, channel_flags,
                                             num_channels);
@@ -1277,6 +1277,30 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)
         return ret;
 }
 
+int iwl_mvm_config_scan(struct iwl_mvm *mvm)
+{
+        struct iwl_scan_config cfg;
+        struct iwl_host_cmd cmd = {
+                .id = iwl_cmd_id(SCAN_CFG_CMD, IWL_ALWAYS_LONG_GROUP, 0),
+                .len[0] = sizeof(cfg),
+                .data[0] = &cfg,
+                .dataflags[0] = IWL_HCMD_DFL_NOCOPY,
+        };
+
+        if (!iwl_mvm_is_reduced_config_scan_supported(mvm))
+                return iwl_mvm_legacy_config_scan(mvm);
+
+        memset(&cfg, 0, sizeof(cfg));
+
+        cfg.bcast_sta_id = mvm->aux_sta.sta_id;
+        cfg.tx_chains = cpu_to_le32(iwl_mvm_get_valid_tx_ant(mvm));
+        cfg.rx_chains = cpu_to_le32(iwl_mvm_scan_rx_ant(mvm));
+
+        IWL_DEBUG_SCAN(mvm, "Sending UMAC scan config\n");
+
+        return iwl_mvm_send_cmd(mvm, &cmd);
+}
+
 static int iwl_mvm_scan_uid_by_status(struct iwl_mvm *mvm, int status)
 {
         int i;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 0bedba4c61f2..b3768d5d852a 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -1482,6 +1482,13 @@ static void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,
                                             mvm_sta->sta_id, i);
                         txq_id = iwl_mvm_tvqm_enable_txq(mvm, mvm_sta->sta_id,
                                                          i, wdg);
+                        /*
+                         * on failures, just set it to IWL_MVM_INVALID_QUEUE
+                         * to try again later, we have no other good way of
+                         * failing here
+                         */
+                        if (txq_id < 0)
+                                txq_id = IWL_MVM_INVALID_QUEUE;
                         tid_data->txq_id = txq_id;
 
                         /*
@@ -1950,30 +1957,73 @@ void iwl_mvm_dealloc_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta)
         sta->sta_id = IWL_MVM_INVALID_STA;
 }
 
-static void iwl_mvm_enable_aux_snif_queue(struct iwl_mvm *mvm, u16 *queue,
+static void iwl_mvm_enable_aux_snif_queue(struct iwl_mvm *mvm, u16 queue,
                                           u8 sta_id, u8 fifo)
 {
         unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ?
                 mvm->trans->trans_cfg->base_params->wd_timeout :
                 IWL_WATCHDOG_DISABLED;
+        struct iwl_trans_txq_scd_cfg cfg = {
+                .fifo = fifo,
+                .sta_id = sta_id,
+                .tid = IWL_MAX_TID_COUNT,
+                .aggregate = false,
+                .frame_limit = IWL_FRAME_LIMIT,
+        };
+
+        WARN_ON(iwl_mvm_has_new_tx_api(mvm));
+
+        iwl_mvm_enable_txq(mvm, NULL, queue, 0, &cfg, wdg_timeout);
+}
+
+static int iwl_mvm_enable_aux_snif_queue_tvqm(struct iwl_mvm *mvm, u8 sta_id)
+{
+        unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ?
+                mvm->trans->trans_cfg->base_params->wd_timeout :
+                IWL_WATCHDOG_DISABLED;
+
+        WARN_ON(!iwl_mvm_has_new_tx_api(mvm));
+
+        return iwl_mvm_tvqm_enable_txq(mvm, sta_id, IWL_MAX_TID_COUNT,
+                                       wdg_timeout);
+}
 
+static int iwl_mvm_add_int_sta_with_queue(struct iwl_mvm *mvm, int macidx,
+                                          int maccolor,
+                                          struct iwl_mvm_int_sta *sta,
+                                          u16 *queue, int fifo)
+{
+        int ret;
+
+        /* Map queue to fifo - needs to happen before adding station */
+        if (!iwl_mvm_has_new_tx_api(mvm))
+                iwl_mvm_enable_aux_snif_queue(mvm, *queue, sta->sta_id, fifo);
+
+        ret = iwl_mvm_add_int_sta_common(mvm, sta, NULL, macidx, maccolor);
+        if (ret) {
+                if (!iwl_mvm_has_new_tx_api(mvm))
+                        iwl_mvm_disable_txq(mvm, NULL, *queue,
+                                            IWL_MAX_TID_COUNT, 0);
+                return ret;
+        }
+
+        /*
+         * For 22000 firmware and on we cannot add queue to a station unknown
+         * to firmware so enable queue here - after the station was added
+         */
         if (iwl_mvm_has_new_tx_api(mvm)) {
-                int tvqm_queue =
-                        iwl_mvm_tvqm_enable_txq(mvm, sta_id,
-                                                IWL_MAX_TID_COUNT,
-                                                wdg_timeout);
-                *queue = tvqm_queue;
-        } else {
-                struct iwl_trans_txq_scd_cfg cfg = {
-                        .fifo = fifo,
-                        .sta_id = sta_id,
-                        .tid = IWL_MAX_TID_COUNT,
-                        .aggregate = false,
-                        .frame_limit = IWL_FRAME_LIMIT,
-                };
+                int txq;
 
-                iwl_mvm_enable_txq(mvm, NULL, *queue, 0, &cfg, wdg_timeout);
+                txq = iwl_mvm_enable_aux_snif_queue_tvqm(mvm, sta->sta_id);
+                if (txq < 0) {
+                        iwl_mvm_rm_sta_common(mvm, sta->sta_id);
+                        return txq;
+                }
+
+                *queue = txq;
         }
+
+        return 0;
 }
 
 int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm)
@@ -1989,59 +2039,26 @@ int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm)
         if (ret)
                 return ret;
 
-        /* Map Aux queue to fifo - needs to happen before adding Aux station */
-        if (!iwl_mvm_has_new_tx_api(mvm))
-                iwl_mvm_enable_aux_snif_queue(mvm, &mvm->aux_queue,
-                                              mvm->aux_sta.sta_id,
-                                              IWL_MVM_TX_FIFO_MCAST);
-
-        ret = iwl_mvm_add_int_sta_common(mvm, &mvm->aux_sta, NULL,
-                                         MAC_INDEX_AUX, 0);
+        ret = iwl_mvm_add_int_sta_with_queue(mvm, MAC_INDEX_AUX, 0,
+                                             &mvm->aux_sta, &mvm->aux_queue,
+                                             IWL_MVM_TX_FIFO_MCAST);
         if (ret) {
                 iwl_mvm_dealloc_int_sta(mvm, &mvm->aux_sta);
                 return ret;
         }
 
-        /*
-         * For 22000 firmware and on we cannot add queue to a station unknown
-         * to firmware so enable queue here - after the station was added
-         */
-        if (iwl_mvm_has_new_tx_api(mvm))
-                iwl_mvm_enable_aux_snif_queue(mvm, &mvm->aux_queue,
-                                              mvm->aux_sta.sta_id,
-                                              IWL_MVM_TX_FIFO_MCAST);
-
         return 0;
 }
 
 int iwl_mvm_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 {
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-        int ret;
 
         lockdep_assert_held(&mvm->mutex);
 
-        /* Map snif queue to fifo - must happen before adding snif station */
-        if (!iwl_mvm_has_new_tx_api(mvm))
-                iwl_mvm_enable_aux_snif_queue(mvm, &mvm->snif_queue,
-                                              mvm->snif_sta.sta_id,
+        return iwl_mvm_add_int_sta_with_queue(mvm, mvmvif->id, mvmvif->color,
+                                              &mvm->snif_sta, &mvm->snif_queue,
                                               IWL_MVM_TX_FIFO_BE);
-
-        ret = iwl_mvm_add_int_sta_common(mvm, &mvm->snif_sta, vif->addr,
-                                         mvmvif->id, 0);
-        if (ret)
-                return ret;
-
-        /*
-         * For 22000 firmware and on we cannot add queue to a station unknown
-         * to firmware so enable queue here - after the station was added
-         */
-        if (iwl_mvm_has_new_tx_api(mvm))
-                iwl_mvm_enable_aux_snif_queue(mvm, &mvm->snif_queue,
-                                              mvm->snif_sta.sta_id,
-                                              IWL_MVM_TX_FIFO_BE);
-
-        return 0;
 }
 
 int iwl_mvm_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
@@ -2133,6 +2150,10 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                 queue = iwl_mvm_tvqm_enable_txq(mvm, bsta->sta_id,
                                                 IWL_MAX_TID_COUNT,
                                                 wdg_timeout);
+                if (queue < 0) {
+                        iwl_mvm_rm_sta_common(mvm, bsta->sta_id);
+                        return queue;
+                }
 
                 if (vif->type == NL80211_IFTYPE_AP ||
                     vif->type == NL80211_IFTYPE_ADHOC)
@@ -2307,10 +2328,8 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         }
         ret = iwl_mvm_add_int_sta_common(mvm, msta, maddr,
                                          mvmvif->id, mvmvif->color);
-        if (ret) {
-                iwl_mvm_dealloc_int_sta(mvm, msta);
-                return ret;
-        }
+        if (ret)
+                goto err;
 
         /*
          * Enable cab queue after the ADD_STA command is sent.
@@ -2323,6 +2342,10 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                 int queue = iwl_mvm_tvqm_enable_txq(mvm, msta->sta_id,
                                                     0,
                                                     timeout);
+                if (queue < 0) {
+                        ret = queue;
+                        goto err;
+                }
                 mvmvif->cab_queue = queue;
         } else if (!fw_has_api(&mvm->fw->ucode_capa,
                                IWL_UCODE_TLV_API_STA_TYPE))
@@ -2330,6 +2353,9 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                                    timeout);
 
         return 0;
+err:
+        iwl_mvm_dealloc_int_sta(mvm, msta);
+        return ret;
 }
 
 static int __iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, u8 sta_id,
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 6f4bb7ce71a5..040cec17d3ad 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -573,20 +573,20 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x2526, 0x0034, iwl9560_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x0038, iwl9560_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x003C, iwl9560_2ac_160_cfg)},
-        {IWL_PCI_DEVICE(0x2526, 0x0060, iwl9460_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2526, 0x0064, iwl9460_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2526, 0x00A0, iwl9460_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2526, 0x00A4, iwl9460_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x2526, 0x0060, iwl9461_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x2526, 0x0064, iwl9461_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x2526, 0x00A0, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x2526, 0x00A4, iwl9462_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x0210, iwl9260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x0214, iwl9260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x0230, iwl9560_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x0234, iwl9560_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x0238, iwl9560_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x023C, iwl9560_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2526, 0x0260, iwl9460_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x2526, 0x0260, iwl9461_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x0264, iwl9461_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2526, 0x02A0, iwl9460_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2526, 0x02A4, iwl9460_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x2526, 0x02A0, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x2526, 0x02A4, iwl9462_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x1010, iwl9260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x1030, iwl9560_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x1210, iwl9260_2ac_cfg)},
@@ -603,7 +603,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x2526, 0x401C, iwl9260_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x4030, iwl9560_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x4034, iwl9560_2ac_160_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9462_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x4234, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x42A4, iwl9462_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x6010, iwl9260_2ac_160_cfg)},
@@ -618,60 +618,61 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x271B, 0x0210, iwl9160_2ac_cfg)},
         {IWL_PCI_DEVICE(0x271B, 0x0214, iwl9260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x271C, 0x0214, iwl9260_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_160_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x00A4, iwl9462_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x0230, iwl9560_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x0234, iwl9560_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x0238, iwl9560_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x023C, iwl9560_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x0260, iwl9461_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x0264, iwl9461_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x02A0, iwl9462_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x02A4, iwl9462_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x1010, iwl9260_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x1030, iwl9560_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x1210, iwl9260_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x1552, iwl9560_killer_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_160_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_160_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg)},
-        {IWL_PCI_DEVICE(0x2720, 0x4034, iwl9560_2ac_160_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x40A4, iwl9462_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x4234, iwl9560_2ac_cfg_soc)},
-        {IWL_PCI_DEVICE(0x2720, 0x42A4, iwl9462_2ac_cfg_soc)},
-
-        {IWL_PCI_DEVICE(0x30DC, 0x0030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0034, iwl9560_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0038, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x003C, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0060, iwl9461_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0064, iwl9461_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x00A0, iwl9462_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x00A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0230, iwl9560_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0234, iwl9560_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0238, iwl9560_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x023C, iwl9560_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0260, iwl9461_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x0264, iwl9461_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x02A0, iwl9462_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x02A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x1030, iwl9560_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x1551, killer1550s_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x1552, killer1550i_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x2030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x2034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x4030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x4034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x40A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x4234, iwl9560_2ac_cfg_qu_b0_jf_b0)},
-        {IWL_PCI_DEVICE(0x30DC, 0x42A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},
+
+        {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x00A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x0230, iwl9560_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x0234, iwl9560_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x0238, iwl9560_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x023C, iwl9560_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x0260, iwl9461_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x0264, iwl9461_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x02A0, iwl9462_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x02A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x1030, iwl9560_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x1551, killer1550s_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x1552, killer1550i_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x4034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x40A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x4234, iwl9560_2ac_cfg_qu_b0_jf_b0)},
+        {IWL_PCI_DEVICE(0x2720, 0x42A4, iwl9462_2ac_cfg_qu_b0_jf_b0)},
+
+        {IWL_PCI_DEVICE(0x30DC, 0x0030, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0034, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0038, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x003C, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0060, iwl9460_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0064, iwl9461_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x00A0, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x00A4, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0230, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0234, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0238, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x023C, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0260, iwl9461_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x0264, iwl9461_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x02A0, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x02A4, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x1010, iwl9260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x30DC, 0x1030, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x1210, iwl9260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x30DC, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x1552, iwl9560_killer_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x2030, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x2034, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x4030, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x4034, iwl9560_2ac_160_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x40A4, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x4234, iwl9560_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x30DC, 0x42A4, iwl9462_2ac_cfg_soc)},
 
         {IWL_PCI_DEVICE(0x31DC, 0x0030, iwl9560_2ac_160_cfg_shared_clk)},
         {IWL_PCI_DEVICE(0x31DC, 0x0034, iwl9560_2ac_cfg_shared_clk)},
@@ -1067,11 +1068,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 }
         } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) ==
                    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
-                   ((cfg != &iwl_ax200_cfg_cc &&
-                     cfg != &killer1650x_2ax_cfg &&
-                     cfg != &killer1650w_2ax_cfg &&
-                     cfg != &iwl_ax201_cfg_quz_hr) ||
-                    iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {
+                   iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {
                 u32 hw_status;
 
                 hw_status = iwl_read_prph(iwl_trans, UMAG_GEN_HW_STATUS);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index df8455f14e4d..ca3bb4d65b00 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -57,6 +57,24 @@
 #include "internal.h"
 #include "fw/dbg.h"
 
+static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)
+{
+        iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,
+                          HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);
+        udelay(20);
+        iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,
+                          HPM_HIPM_GEN_CFG_CR_PG_EN |
+                          HPM_HIPM_GEN_CFG_CR_SLP_EN);
+        udelay(20);
+        iwl_clear_bits_prph(trans, HPM_HIPM_GEN_CFG,
+                            HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);
+
+        iwl_trans_sw_reset(trans);
+        iwl_clear_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+
+        return 0;
+}
+
 /*
  * Start up NIC's basic functionality after it has been reset
  * (e.g. after platform boot, or shutdown via iwl_pcie_apm_stop())
@@ -92,6 +110,13 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans)
 
         iwl_pcie_apm_config(trans);
 
+        if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_22000 &&
+            trans->cfg->integrated) {
+                ret = iwl_pcie_gen2_force_power_gating(trans);
+                if (ret)
+                        return ret;
+        }
+
         ret = iwl_finish_nic_init(trans, trans->trans_cfg);
         if (ret)
                 return ret;
diff --git a/drivers/net/wireless/mediatek/mt76/Makefile b/drivers/net/wireless/mediatek/mt76/Makefile
index 4d03596e891f..d7a1ddc9e407 100644
--- a/drivers/net/wireless/mediatek/mt76/Makefile
+++ b/drivers/net/wireless/mediatek/mt76/Makefile
@@ -8,6 +8,8 @@ mt76-y := \
         mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \
         tx.o agg-rx.o mcu.o
 
+mt76-$(CONFIG_PCI) += pci.o
+
 mt76-usb-y := usb.o usb_trace.o
 
 CFLAGS_trace.o := -I$(src)
diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index c747eb24581c..8f69d00bd940 100644
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -53,8 +53,10 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,
         u32 ctrl;
         int i, idx = -1;
 
-        if (txwi)
+        if (txwi) {
                 q->entry[q->head].txwi = DMA_DUMMY_DATA;
+                q->entry[q->head].skip_buf0 = true;
+        }
 
         for (i = 0; i < nbufs; i += 2, buf += 2) {
                 u32 buf0 = buf[0].addr, buf1 = 0;
@@ -97,7 +99,7 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,
         __le32 __ctrl = READ_ONCE(q->desc[idx].ctrl);
         u32 ctrl = le32_to_cpu(__ctrl);
 
-        if (!e->txwi || !e->skb) {
+        if (!e->skip_buf0) {
                 __le32 addr = READ_ONCE(q->desc[idx].buf0);
                 u32 len = FIELD_GET(MT_DMA_CTL_SD_LEN0, ctrl);
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 570c159515a0..8aec7ccf2d79 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -93,8 +93,9 @@ struct mt76_queue_entry {
                 struct urb *urb;
         };
         enum mt76_txq_id qid;
-        bool schedule;
-        bool done;
+        bool skip_buf0:1;
+        bool schedule:1;
+        bool done:1;
 };
 
 struct mt76_queue_regs {
@@ -578,6 +579,7 @@ bool __mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
 #define mt76_poll_msec(dev, ...) __mt76_poll_msec(&((dev)->mt76), __VA_ARGS__)
 
 void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs);
+void mt76_pci_disable_aspm(struct pci_dev *pdev);
 
 static inline u16 mt76_chip(struct mt76_dev *dev)
 {
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
index 73c3104f8858..cf611d1b817c 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
@@ -81,6 +81,8 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         /* RG_SSUSB_CDR_BR_PE1D = 0x3 */
         mt76_rmw_field(dev, 0x15c58, 0x3 << 6, 0x3);
 
+        mt76_pci_disable_aspm(pdev);
+
         return 0;
 
 error:
diff --git a/drivers/net/wireless/mediatek/mt76/pci.c b/drivers/net/wireless/mediatek/mt76/pci.c
new file mode 100644
index 000000000000..04c5a692bc85
--- /dev/null
+++ b/drivers/net/wireless/mediatek/mt76/pci.c
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: ISC
+/*
+ * Copyright (C) 2019 Lorenzo Bianconi <lorenzo@kernel.org>
+ */
+
+#include <linux/pci.h>
+
+void mt76_pci_disable_aspm(struct pci_dev *pdev)
+{
+        struct pci_dev *parent = pdev->bus->self;
+        u16 aspm_conf, parent_aspm_conf = 0;
+
+        pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &aspm_conf);
+        aspm_conf &= PCI_EXP_LNKCTL_ASPMC;
+        if (parent) {
+                pcie_capability_read_word(parent, PCI_EXP_LNKCTL,
+                                          &parent_aspm_conf);
+                parent_aspm_conf &= PCI_EXP_LNKCTL_ASPMC;
+        }
+
+        if (!aspm_conf && (!parent || !parent_aspm_conf)) {
+                /* aspm already disabled */
+                return;
+        }
+
+        dev_info(&pdev->dev, "disabling ASPM %s %s\n",
+                 (aspm_conf & PCI_EXP_LNKCTL_ASPM_L0S) ? "L0s" : "",
+                 (aspm_conf & PCI_EXP_LNKCTL_ASPM_L1) ? "L1" : "");
+
+        if (IS_ENABLED(CONFIG_PCIEASPM)) {
+                int err;
+
+                err = pci_disable_link_state(pdev, aspm_conf);
+                if (!err)
+                        return;
+        }
+
+        /* both device and parent should have the same ASPM setting.
+         * disable ASPM in downstream component first and then upstream.
+         */
+        pcie_capability_clear_word(pdev, PCI_EXP_LNKCTL, aspm_conf);
+        if (parent)
+                pcie_capability_clear_word(parent, PCI_EXP_LNKCTL,
+                                           aspm_conf);
+}
+EXPORT_SYMBOL_GPL(mt76_pci_disable_aspm);
diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index 6087ec7a90a6..f88d26535978 100644
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -822,7 +822,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                 hdr = rtl_get_hdr(skb);
                 fc = rtl_get_fc(skb);
 
-                if (!stats.crc && !stats.hwerror) {
+                if (!stats.crc && !stats.hwerror && (skb->len > FCS_LEN)) {
                         memcpy(IEEE80211_SKB_RXCB(skb), &rx_status,
                                sizeof(rx_status));
 
@@ -859,6 +859,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                                 _rtl_pci_rx_to_mac80211(hw, skb, rx_status);
                         }
                 } else {
+                        /* drop packets with errors or those too short */
                         dev_kfree_skb_any(skb);
                 }
 new_trx_end:
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c
index 70f04c2f5b17..fff8dda14023 100644
--- a/drivers/net/wireless/realtek/rtlwifi/ps.c
+++ b/drivers/net/wireless/realtek/rtlwifi/ps.c
@@ -754,6 +754,9 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data,
                                 return;
                         } else {
                                 noa_num = (noa_len - 2) / 13;
+                                if (noa_num > P2P_MAX_NOA_NUM)
+                                        noa_num = P2P_MAX_NOA_NUM;
+
                         }
                         noa_index = ie[3];
                         if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==
@@ -848,6 +851,9 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
                                 return;
                         } else {
                                 noa_num = (noa_len - 2) / 13;
+                                if (noa_num > P2P_MAX_NOA_NUM)
+                                        noa_num = P2P_MAX_NOA_NUM;
+
                         }
                         noa_index = ie[3];
                         if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==