Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec12f457 authored by Luciano Coelho's avatar Luciano Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: refactor iwl_mvm_query_wakeup_reasons() 



Refactor the iwl_mvm_query_wakeup_reasons() function to split the part
that gets the firmware status from the part that sets up the WoWLAN
status.  This will allow netdetect to reuse the code.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 3acc952b

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

+47 −26
Original line number Diff line number Diff line
@@ -1490,9 +1490,8 @@ static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm, 
	return true;

}



/* releases the MVM mutex */

static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm,

					 struct ieee80211_vif *vif)

static struct iwl_wowlan_status *

iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif)

{

	u32 base = mvm->error_event_table;

	struct error_table_start {
@@ -1504,19 +1503,15 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
		.id = WOWLAN_GET_STATUSES,

		.flags = CMD_WANT_SKB,

	};

	struct iwl_wowlan_status_data status;

	struct iwl_wowlan_status *fw_status;

	int ret, len, status_size, i;

	bool keep;

	struct ieee80211_sta *ap_sta;

	struct iwl_mvm_sta *mvm_ap_sta;

	struct iwl_wowlan_status *status, *fw_status;

	int ret, len, status_size;



	iwl_trans_read_mem_bytes(mvm->trans, base,

				 &err_info, sizeof(err_info));



	if (err_info.valid) {

		IWL_INFO(mvm, "error table is valid (%d)\n",

			 err_info.valid);

		IWL_INFO(mvm, "error table is valid (%d) with error (%d)\n",

			 err_info.valid, err_info.error_id);

		if (err_info.error_id == RF_KILL_INDICATOR_FOR_WOWLAN) {

			struct cfg80211_wowlan_wakeup wakeup = {

				.rfkill_release = true,
@@ -1524,7 +1519,7 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
			ieee80211_report_wowlan_wakeup(vif, &wakeup,

						       GFP_KERNEL);

		}

		goto out_unlock;

		return ERR_PTR(-EIO);

	}



	/* only for tracing for now */
@@ -1535,22 +1530,53 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
	ret = iwl_mvm_send_cmd(mvm, &cmd);

	if (ret) {

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

		goto out_unlock;

		return ERR_PTR(ret);

	}



	/* RF-kill already asserted again... */

	if (!cmd.resp_pkt)

		goto out_unlock;

	if (!cmd.resp_pkt) {

		ret = -ERFKILL;

		goto out_free_resp;

	}



	status_size = sizeof(*fw_status);



	len = iwl_rx_packet_payload_len(cmd.resp_pkt);

	if (len < status_size) {

		IWL_ERR(mvm, "Invalid WoWLAN status response!\n");

		ret = -EIO;

		goto out_free_resp;

	}



	fw_status = (void *)cmd.resp_pkt->data;

	status = (void *)cmd.resp_pkt->data;

	if (len != (status_size +

		    ALIGN(le32_to_cpu(status->wake_packet_bufsize), 4))) {

		IWL_ERR(mvm, "Invalid WoWLAN status response!\n");

		ret = -EIO;

		goto out_free_resp;

	}



	fw_status = kmemdup(status, len, GFP_KERNEL);



out_free_resp:

	iwl_free_resp(&cmd);

	return ret ? ERR_PTR(ret) : fw_status;

}



/* releases the MVM mutex */

static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm,

					 struct ieee80211_vif *vif)

{

	struct iwl_wowlan_status_data status;

	struct iwl_wowlan_status *fw_status;

	int i;

	bool keep;

	struct ieee80211_sta *ap_sta;

	struct iwl_mvm_sta *mvm_ap_sta;



	fw_status = iwl_mvm_get_wakeup_status(mvm, vif);

	if (IS_ERR_OR_NULL(fw_status))

		goto out_unlock;



	status.pattern_number = le16_to_cpu(fw_status->pattern_number);

	for (i = 0; i < 8; i++)
@@ -1563,17 +1589,12 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
		le32_to_cpu(fw_status->wake_packet_bufsize);

	status.wake_packet = fw_status->wake_packet;



	if (len != status_size + ALIGN(status.wake_packet_bufsize, 4)) {

		IWL_ERR(mvm, "Invalid WoWLAN status response!\n");

		goto out_free_resp;

	}



	/* still at hard-coded place 0 for D3 image */

	ap_sta = rcu_dereference_protected(

			mvm->fw_id_to_mac_id[0],

			lockdep_is_held(&mvm->mutex));

	if (IS_ERR_OR_NULL(ap_sta))

		goto out_free_resp;

		goto out_free;



	mvm_ap_sta = (struct iwl_mvm_sta *)ap_sta->drv_priv;

	for (i = 0; i < IWL_MAX_TID_COUNT; i++) {
@@ -1590,11 +1611,11 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 


	keep = iwl_mvm_setup_connection_keep(mvm, vif, fw_status);



	iwl_free_resp(&cmd);

	kfree(fw_status);

	return keep;



 out_free_resp:

	iwl_free_resp(&cmd);

out_free:

	kfree(fw_status);

out_unlock:

	mutex_unlock(&mvm->mutex);

	return false;