Commit 5c157941 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: mvm: introduce iwl_wowlan_get_status_cmd 



We need to pass the station id to teach the firmware on which
station id we want to get the status.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210621103449.45218d913d07.I61a086936508230d86b454636945ceb0b9ea09fd@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 80e67119

drivers/net/wireless/intel/iwlwifi/fw/api/d3.h

+4 −0
Original line number Diff line number Diff line
@@ -496,6 +496,10 @@ struct iwl_wowlan_kek_kck_material_cmd_v4 { 
	__le32  bigtk_cipher;

} __packed; /* KEK_KCK_MATERIAL_API_S_VER_4 */



struct iwl_wowlan_get_status_cmd {

	__le32  sta_id;

} __packed; /* WOWLAN_GET_STATUSES_CMD_API_S_VER_1 */



#define RF_KILL_INDICATOR_FOR_WOWLAN	0x87



enum iwl_wowlan_rekey_status {

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

+24 −7
Original line number Diff line number Diff line
@@ -1612,15 +1612,27 @@ iwl_mvm_parse_wowlan_status_common(v6) 
iwl_mvm_parse_wowlan_status_common(v7)

iwl_mvm_parse_wowlan_status_common(v9)



struct iwl_wowlan_status *iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm)

static struct iwl_wowlan_status *

iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)

{

	struct iwl_wowlan_status *status;

	struct iwl_wowlan_get_status_cmd get_status_cmd = {

		.sta_id = cpu_to_le32(sta_id),

	};

	struct iwl_host_cmd cmd = {

		.id = WOWLAN_GET_STATUSES,

		.flags = CMD_WANT_SKB,

		.data = { &get_status_cmd, },

		.len = { sizeof(get_status_cmd), },

	};

	int ret, len;

	u8 notif_ver;

	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, LONG_GROUP,

					   WOWLAN_GET_STATUSES,

					   IWL_FW_CMD_VER_UNKNOWN);



	if (cmd_ver == IWL_FW_CMD_VER_UNKNOWN)

		cmd.len[0] = 0;



	lockdep_assert_held(&mvm->mutex);
@@ -1708,32 +1720,37 @@ struct iwl_wowlan_status *iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm) 
}



static struct iwl_wowlan_status *

iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm)

iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, u8 sta_id)

{

	int ret;

	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, LONG_GROUP,

					   OFFLOADS_QUERY_CMD,

					   IWL_FW_CMD_VER_UNKNOWN);

	__le32 station_id = cpu_to_le32(sta_id);

	u32 cmd_size = cmd_ver != IWL_FW_CMD_VER_UNKNOWN ? sizeof(station_id) : 0;



	if (!mvm->net_detect) {

		/* only for tracing for now */

		int ret = iwl_mvm_send_cmd_pdu(mvm, OFFLOADS_QUERY_CMD, 0,

					       0, NULL);

					       cmd_size, &station_id);

		if (ret)

			IWL_ERR(mvm, "failed to query offload statistics (%d)\n", ret);

	}



	return iwl_mvm_send_wowlan_get_status(mvm);

	return iwl_mvm_send_wowlan_get_status(mvm, sta_id);

}



/* releases the MVM mutex */

static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm,

					 struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_wowlan_status_data status;

	struct iwl_wowlan_status *fw_status;

	int i;

	bool keep;

	struct iwl_mvm_sta *mvm_ap_sta;



	fw_status = iwl_mvm_get_wakeup_status(mvm);

	fw_status = iwl_mvm_get_wakeup_status(mvm, mvmvif->ap_sta_id);

	if (IS_ERR_OR_NULL(fw_status))

		goto out_unlock;
@@ -1911,7 +1928,7 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm, 
	u32 reasons = 0;

	int i, n_matches, ret;



	fw_status = iwl_mvm_get_wakeup_status(mvm);

	fw_status = iwl_mvm_get_wakeup_status(mvm, IWL_MVM_INVALID_STA);

	if (!IS_ERR_OR_NULL(fw_status)) {

		reasons = le32_to_cpu(fw_status->wakeup_reasons);

		kfree(fw_status);

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

+0 −1
Original line number Diff line number Diff line
@@ -1775,7 +1775,6 @@ void iwl_mvm_ipv6_addr_change(struct ieee80211_hw *hw, 
void iwl_mvm_set_default_unicast_key(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif, int idx);

extern const struct file_operations iwl_dbgfs_d3_test_ops;

struct iwl_wowlan_status *iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm);

#ifdef CONFIG_PM

void iwl_mvm_set_last_nonqos_seq(struct iwl_mvm *mvm,

				 struct ieee80211_vif *vif);