wifi: iwlwifi: mvm: don't check D0I3 version

This code is dead, even old FW versions don't use it.
The IWL_D0I3_RESET_REQUIRE flag will be sent by the FW via a notification,
instead of command, the notification handler will be introduced later
in the series.

Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20220906161827.87c82482229a.I70456c38ed8f7beb7d62dd618f58e7dc0a7d33b2@changeid
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index aeb0015b73d2b3ea1a7e82cf7f64a1c8c756557d..518755b756b499deac3489693eeb779832acdba3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -2551,7 +2551,6 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
                        .id = D0I3_END_CMD,
                        .flags = CMD_WANT_SKB | CMD_SEND_IN_D3,
                };
-               int len;
 
                ret = iwl_mvm_send_cmd(mvm, &cmd);
                if (ret < 0) {
@@ -2559,27 +2558,6 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
                                ret);
                        goto err;
                }
-               switch (mvm->cmd_ver.d0i3_resp) {
-               case 0:
-                       break;
-               case 1:
-                       len = iwl_rx_packet_payload_len(cmd.resp_pkt);
-                       if (len != sizeof(u32)) {
-                               IWL_ERR(mvm,
-                                       "Error with D0I3_END_CMD response size (%d)\n",
-                                       len);
-                               goto err;
-                       }
-                       if (IWL_D0I3_RESET_REQUIRE &
-                           le32_to_cpu(*(__le32 *)cmd.resp_pkt->data)) {
-                               iwl_write32(mvm->trans, CSR_RESET,
-                                           CSR_RESET_REG_FLAG_FORCE_NMI);
-                               iwl_free_resp(&cmd);
-                       }
-                       break;
-               default:
-                       WARN_ON(1);
-               }
        }
 
        /* after the successful handshake, we're out of D3 */

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index bf35e130c87652c8f92889200343f8eb7765f7b1..ea128066eea6fdd3246ff5cf9d056608173b1ba2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1079,7 +1079,6 @@ struct iwl_mvm {
        struct list_head resp_pasn_list;
 
        struct {
-               u8 d0i3_resp;
                u8 range_resp;
        } cmd_ver;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index db43c8a83a319a9822a08fe91290779bbc2b0bae..7ed4f5a0abc3f67665acb43b217245748fb82f70 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -1188,13 +1188,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 
        INIT_DELAYED_WORK(&mvm->cs_tx_unblock_dwork, iwl_mvm_tx_unblock_dwork);
 
-       mvm->cmd_ver.d0i3_resp =
-               iwl_fw_lookup_notif_ver(mvm->fw, LEGACY_GROUP, D0I3_END_CMD,
-                                       0);
-       /* we only support version 1 */
-       if (WARN_ON_ONCE(mvm->cmd_ver.d0i3_resp > 1))
-               goto out_free;
-
        mvm->cmd_ver.range_resp =
                iwl_fw_lookup_notif_ver(mvm->fw, LOCATION_GROUP,
                                        TOF_RANGE_RESPONSE_NOTIF, 5);