Commit 731d5aa9 authored by Haim Dreyfuss's avatar Haim Dreyfuss Committed by Gregory Greenman
Browse files

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: default avatarHaim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20220906161827.87c82482229a.I70456c38ed8f7beb7d62dd618f58e7dc0a7d33b2@changeid


Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
parent fab6f490

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

+0 −22
Original line number Diff line number Diff line
@@ -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 */

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,6 @@ struct iwl_mvm { 
	struct list_head resp_pasn_list;



	struct {

		u8 d0i3_resp;

		u8 range_resp;

	} cmd_ver;

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+0 −7
Original line number Diff line number Diff line
@@ -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);