Commit 4d08c0b3 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: mvm: handle BA session teardown in RF-kill 



When entering RF-kill, mac80211 tears down BA sessions, but
due to RF-kill the commands aren't sent to the device. As a
result, there can be frames pending on the reorder buffer or
perhaps even received while doing so, leading to warnings.

Avoid the warnings by doing the BA session teardown normally
even in RF-kill, which also requires queue sync.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240513132416.0762cd80fb3d.I43c5877f3b546159b2db4f36d6d956b333c41cf0@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 08b16d1b

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

+1 −1
Original line number Diff line number Diff line
@@ -6385,7 +6385,7 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm, 
		.len[0] = sizeof(cmd),

		.data[1] = data,

		.len[1] = size,

		.flags = sync ? 0 : CMD_ASYNC,

		.flags = CMD_SEND_IN_RFKILL | (sync ? 0 : CMD_ASYNC),

	};

	int ret;

drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c

+2 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,8 @@ static int iwl_mvm_mld_update_sta_baids(struct iwl_mvm *mvm, 


		cmd.modify.tid = cpu_to_le32(data->tid);



		ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, sizeof(cmd), &cmd);

		ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, CMD_SEND_IN_RFKILL,

					   sizeof(cmd), &cmd);

		data->sta_mask = new_sta_mask;

		if (ret)

			return ret;

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

+8 −4
Original line number Diff line number Diff line
@@ -2848,7 +2848,12 @@ static int iwl_mvm_fw_baid_op_cmd(struct iwl_mvm *mvm, 
		.action = start ? cpu_to_le32(IWL_RX_BAID_ACTION_ADD) :

				  cpu_to_le32(IWL_RX_BAID_ACTION_REMOVE),

	};

	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, RX_BAID_ALLOCATION_CONFIG_CMD);

	struct iwl_host_cmd hcmd = {

		.id = WIDE_ID(DATA_PATH_GROUP, RX_BAID_ALLOCATION_CONFIG_CMD),

		.flags = CMD_SEND_IN_RFKILL,

		.len[0] = sizeof(cmd),

		.data[0] = &cmd,

	};

	int ret;



	BUILD_BUG_ON(sizeof(struct iwl_rx_baid_cfg_resp) != sizeof(baid));
@@ -2860,7 +2865,7 @@ static int iwl_mvm_fw_baid_op_cmd(struct iwl_mvm *mvm, 
		cmd.alloc.ssn = cpu_to_le16(ssn);

		cmd.alloc.win_size = cpu_to_le16(buf_size);

		baid = -EIO;

	} else if (iwl_fw_lookup_cmd_ver(mvm->fw, cmd_id, 1) == 1) {

	} else if (iwl_fw_lookup_cmd_ver(mvm->fw, hcmd.id, 1) == 1) {

		cmd.remove_v1.baid = cpu_to_le32(baid);

		BUILD_BUG_ON(sizeof(cmd.remove_v1) > sizeof(cmd.remove));

	} else {
@@ -2869,8 +2874,7 @@ static int iwl_mvm_fw_baid_op_cmd(struct iwl_mvm *mvm, 
		cmd.remove.tid = cpu_to_le32(tid);

	}



	ret = iwl_mvm_send_cmd_pdu_status(mvm, cmd_id, sizeof(cmd),

					  &cmd, &baid);

	ret = iwl_mvm_send_cmd_status(mvm, &hcmd, &baid);

	if (ret)

		return ret;